From 9d8ae985f68ed5b593c62d7819bc74c87a358e11 Mon Sep 17 00:00:00 2001 From: mengyiping <1091773127@qq.com> Date: Wed, 4 Sep 2024 10:56:59 +0800 Subject: [PATCH 01/10] bugfix Signed-off-by: mengyiping <1091773127@qq.com> --- common/include/rtg_interface.h | 11 ++-- .../innerkits/frameintf/rtg_interface.cpp | 57 +++++++++++++++++-- 2 files changed, 59 insertions(+), 9 deletions(-) diff --git a/common/include/rtg_interface.h b/common/include/rtg_interface.h index 71c472b..1f88c90 100644 --- a/common/include/rtg_interface.h +++ b/common/include/rtg_interface.h @@ -49,7 +49,9 @@ enum grp_ctrl_cmd { CMD_ADD_RTG_THREAD, CMD_REMOVE_RTG_THREAD, CMD_CLEAR_RTG_GRP, - CMD_DESTROY_RTG_GRP + CMD_DESTROY_RTG_GRP, + CMD_ADD_SELF_RENDER_RTG_THREAD, + CMD_REMOVE_SELF_RENDER_RTG_THREAD, }; struct rtg_grp_data { @@ -86,9 +88,10 @@ enum rtg_sched_cmdid { extern "C" { int EnableRtg(bool flag); - int AddThreadToRtg(int tid, int grpId, int prioType = 0); - int AddThreadsToRtg(vector tids, int grpId, int prioType = 0); - int RemoveRtgThread(int tid); + int AddThreadToRtg(int tid, int grpId, int prioType = 0, bool isSelfRender = false); + int AddThreadsToRtg(vector tids, int grpId, int prioType = 0, bool isSelfRender = false); + int RemoveRtgThread(int tid, bool isSelfRender = false); + int RemoveRtgThreads(vector tids, bool isSelfRender = false); int DestroyRtgGrp(int grpId); int SetFrameRateAndPrioType(int rtgId, int rate, int rtgType); int BeginFrameFreq(int stateParam); diff --git a/interfaces/innerkits/frameintf/rtg_interface.cpp b/interfaces/innerkits/frameintf/rtg_interface.cpp index 804183e..1fa8143 100644 --- a/interfaces/innerkits/frameintf/rtg_interface.cpp +++ b/interfaces/innerkits/frameintf/rtg_interface.cpp @@ -108,7 +108,7 @@ int EnableRtg(bool flag) return 0; }; -int AddThreadToRtg(int tid, int grpId, int prioType) +int AddThreadToRtg(int tid, int grpId, int prioType, bool isSelfRender) { if (g_fd < 0) { return g_fd; @@ -119,8 +119,13 @@ int AddThreadToRtg(int tid, int grpId, int prioType) grp_data.tid_num = 1; grp_data.tids[0] = tid; grp_data.grp_id = grpId; - grp_data.rtg_cmd = CMD_ADD_RTG_THREAD; + grp_data.prio_type = prioType; + if (isSelfRender) { + grp_data.rtg_cmd = CMD_ADD_SELF_RENDER_RTG_THREAD; + } else { + grp_data.rtg_cmd = CMD_ADD_RTG_THREAD; + } ret = ioctl(g_fd, CMD_ID_SET_RTG, &grp_data); if (ret != 0) { RME_LOGE("add thread to rtg failed, grpId = %{public}d, ret = %{public}d, errno = %{public}d (%{public}s)", @@ -148,8 +153,13 @@ int AddThreadsToRtg(vector tids, int grpId, int prioType) } grp_data.tid_num = num; grp_data.grp_id = grpId; - grp_data.rtg_cmd = CMD_ADD_RTG_THREAD; + grp_data.prio_type = prioType; + if (isSelfRender) { + grp_data.rtg_cmd = CMD_ADD_SELF_RENDER_RTG_THREAD; + } else { + grp_data.rtg_cmd = CMD_ADD_RTG_THREAD; + } for (int i = 0; i < num; i++) { if (tids[i] < 0) { return -1; @@ -169,7 +179,7 @@ int AddThreadsToRtg(vector tids, int grpId, int prioType) return ret; }; -int RemoveRtgThread(int tid) +int RemoveRtgThread(int tid, isSelfRender) { if (g_fd < 0) { return g_fd; @@ -179,7 +189,11 @@ int RemoveRtgThread(int tid) (void)memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data)); grp_data.tid_num = 1; grp_data.tids[0] = tid; - grp_data.rtg_cmd = CMD_REMOVE_RTG_THREAD; + if (isSelfRender) { + grp_data.rtg_cmd = CMD_REMOVE_SELF_RENDER_RTG_THREAD; + } else { + grp_data.rtg_cmd = CMD_REMOVE_RTG_THREAD; + } ret = ioctl(g_fd, CMD_ID_SET_RTG, &grp_data); if (ret != 0) { RME_LOGE("remove grp failed, ret = %{public}d, errno = %{public}d (%{public}s)", ret, errno, strerror(errno)); @@ -189,6 +203,39 @@ int RemoveRtgThread(int tid) return ret; }; +int RemoveRtgThreads(vector tids, bool isSelfRender) +{ + struct rtg_grp_data grp_data; + int ret; + if (g_fd < 0) { + return g_fd; + } + (void)memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data)); + int num = static_cast(tids.size()); + if (num > MAX_TID_NUM) { + return -1; + } + grp_data.tid_num = num; + if (isSelfRender) { + grp_data.rtg_cmd = CMD_REMOVE_SELF_RENDER_RTG_THREAD; + } else { + grp_data.rtg_cmd = CMD_REMOVE_RTG_THREAD; + } + for (int i = 0; i < num; i++) { + if (tids[i] < 0) { + return -1; + } + grp_data.tids[i] = tids[i]; + } + ret = ioctl(g_fd, CMD_ID_SET_RTG, &grp_data); + if (ret < 0) { + RME_LOGE("remove grp threads failed, errno = %{public}d (%{public}s)", errno, strerror(errno)); + } else { + RME_LOGI("remove grp threads success, get rtg id %{public}d.", ret); + } + return ret; +} + int DestroyRtgGrp(int grpId) { if (g_fd < 0) { -- Gitee From c0652695b32ec99b2ec364e0ec40ac849bf6ad9d Mon Sep 17 00:00:00 2001 From: mengyiping <1091773127@qq.com> Date: Wed, 4 Sep 2024 11:23:55 +0800 Subject: [PATCH 02/10] --amend Signed-off-by: mengyiping <1091773127@qq.com> --- interfaces/innerkits/frameintf/BUILD.gn | 1 - interfaces/innerkits/frameintf/rtg_interface.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/interfaces/innerkits/frameintf/BUILD.gn b/interfaces/innerkits/frameintf/BUILD.gn index 4fab553..7d3e688 100644 --- a/interfaces/innerkits/frameintf/BUILD.gn +++ b/interfaces/innerkits/frameintf/BUILD.gn @@ -86,7 +86,6 @@ ohos_shared_library("frame_ui_intf") { "hitrace:hitrace_meter", ] - innerapi_tags = [ "platformsdk" ] subsystem_name = "resourceschedule" part_name = "frame_aware_sched" } diff --git a/interfaces/innerkits/frameintf/rtg_interface.cpp b/interfaces/innerkits/frameintf/rtg_interface.cpp index 1fa8143..0cbfef3 100644 --- a/interfaces/innerkits/frameintf/rtg_interface.cpp +++ b/interfaces/innerkits/frameintf/rtg_interface.cpp @@ -139,7 +139,7 @@ int AddThreadToRtg(int tid, int grpId, int prioType, bool isSelfRender) return ret; } -int AddThreadsToRtg(vector tids, int grpId, int prioType) +int AddThreadsToRtg(vector tids, int grpId, int prioType, bool isSelfRender) { struct rtg_grp_data grp_data; int ret; -- Gitee From 19ce4891bf1f81bffb74434695a78f37914cb3ef Mon Sep 17 00:00:00 2001 From: mengyiping <1091773127@qq.com> Date: Wed, 4 Sep 2024 13:34:07 +0800 Subject: [PATCH 03/10] --amend Signed-off-by: mengyiping <1091773127@qq.com> --- interfaces/innerkits/frameintf/rtg_interface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/frameintf/rtg_interface.cpp b/interfaces/innerkits/frameintf/rtg_interface.cpp index 0cbfef3..e5090a6 100644 --- a/interfaces/innerkits/frameintf/rtg_interface.cpp +++ b/interfaces/innerkits/frameintf/rtg_interface.cpp @@ -179,7 +179,7 @@ int AddThreadsToRtg(vector tids, int grpId, int prioType, bool isSelfRender return ret; }; -int RemoveRtgThread(int tid, isSelfRender) +int RemoveRtgThread(int tid, bool isSelfRender) { if (g_fd < 0) { return g_fd; -- Gitee From f38524cdc16ac3fcc2e218a9afb8b034f76c906e Mon Sep 17 00:00:00 2001 From: mengyiping <1091773127@qq.com> Date: Thu, 5 Sep 2024 03:02:08 +0000 Subject: [PATCH 04/10] update interfaces/innerkits/frameintf/BUILD.gn. Signed-off-by: mengyiping <1091773127@qq.com> --- interfaces/innerkits/frameintf/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/interfaces/innerkits/frameintf/BUILD.gn b/interfaces/innerkits/frameintf/BUILD.gn index 7d3e688..4fab553 100644 --- a/interfaces/innerkits/frameintf/BUILD.gn +++ b/interfaces/innerkits/frameintf/BUILD.gn @@ -86,6 +86,7 @@ ohos_shared_library("frame_ui_intf") { "hitrace:hitrace_meter", ] + innerapi_tags = [ "platformsdk" ] subsystem_name = "resourceschedule" part_name = "frame_aware_sched" } -- Gitee From 5bb0b1301f22ead87c323e65c4d2f44de90f444e Mon Sep 17 00:00:00 2001 From: mengyiping <1091773127@qq.com> Date: Thu, 5 Sep 2024 07:58:26 +0000 Subject: [PATCH 05/10] update common/include/rtg_interface.h. Signed-off-by: mengyiping <1091773127@qq.com> --- common/include/rtg_interface.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/common/include/rtg_interface.h b/common/include/rtg_interface.h index 1f88c90..68779f0 100644 --- a/common/include/rtg_interface.h +++ b/common/include/rtg_interface.h @@ -49,9 +49,7 @@ enum grp_ctrl_cmd { CMD_ADD_RTG_THREAD, CMD_REMOVE_RTG_THREAD, CMD_CLEAR_RTG_GRP, - CMD_DESTROY_RTG_GRP, - CMD_ADD_SELF_RENDER_RTG_THREAD, - CMD_REMOVE_SELF_RENDER_RTG_THREAD, + CMD_DESTROY_RTG_GRP }; struct rtg_grp_data { @@ -88,10 +86,10 @@ enum rtg_sched_cmdid { extern "C" { int EnableRtg(bool flag); - int AddThreadToRtg(int tid, int grpId, int prioType = 0, bool isSelfRender = false); - int AddThreadsToRtg(vector tids, int grpId, int prioType = 0, bool isSelfRender = false); - int RemoveRtgThread(int tid, bool isSelfRender = false); - int RemoveRtgThreads(vector tids, bool isSelfRender = false); + int AddThreadToRtg(int tid, int grpId, int prioType = 0, bool isRender = false); + int AddThreadsToRtg(vector tids, int grpId, int prioType = 0, bool isRender = false); + int RemoveRtgThread(int tid, bool isRender = false); + int RemoveRtgThreads(vector tids, bool isRender = false); int DestroyRtgGrp(int grpId); int SetFrameRateAndPrioType(int rtgId, int rate, int rtgType); int BeginFrameFreq(int stateParam); -- Gitee From c6a7cd69dcfdfd16a13b48c74741d18b9d16423e Mon Sep 17 00:00:00 2001 From: mengyiping <1091773127@qq.com> Date: Thu, 5 Sep 2024 08:05:00 +0000 Subject: [PATCH 06/10] update interfaces/innerkits/frameintf/rtg_interface.cpp. Signed-off-by: mengyiping <1091773127@qq.com> --- .../innerkits/frameintf/rtg_interface.cpp | 35 +++++-------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/interfaces/innerkits/frameintf/rtg_interface.cpp b/interfaces/innerkits/frameintf/rtg_interface.cpp index e5090a6..24e9078 100644 --- a/interfaces/innerkits/frameintf/rtg_interface.cpp +++ b/interfaces/innerkits/frameintf/rtg_interface.cpp @@ -108,7 +108,7 @@ int EnableRtg(bool flag) return 0; }; -int AddThreadToRtg(int tid, int grpId, int prioType, bool isSelfRender) +int AddThreadToRtg(int tid, int grpId, int prioType, [[maybe_unused]] bool isRender) { if (g_fd < 0) { return g_fd; @@ -119,14 +119,8 @@ int AddThreadToRtg(int tid, int grpId, int prioType, bool isSelfRender) grp_data.tid_num = 1; grp_data.tids[0] = tid; grp_data.grp_id = grpId; - + grp_data.rtg_cmd = CMD_ADD_RTG_THREAD; grp_data.prio_type = prioType; - if (isSelfRender) { - grp_data.rtg_cmd = CMD_ADD_SELF_RENDER_RTG_THREAD; - } else { - grp_data.rtg_cmd = CMD_ADD_RTG_THREAD; - } - ret = ioctl(g_fd, CMD_ID_SET_RTG, &grp_data); if (ret != 0) { RME_LOGE("add thread to rtg failed, grpId = %{public}d, ret = %{public}d, errno = %{public}d (%{public}s)", grpId, @@ -139,7 +133,7 @@ int AddThreadToRtg(int tid, int grpId, int prioType, bool isSelfRender) return ret; } -int AddThreadsToRtg(vector tids, int grpId, int prioType, bool isSelfRender) +int AddThreadsToRtg(vector tids, int grpId, int prioType, bool isRender) { struct rtg_grp_data grp_data; int ret; @@ -153,13 +147,8 @@ int AddThreadsToRtg(vector tids, int grpId, int prioType, bool isSelfRender } grp_data.tid_num = num; grp_data.grp_id = grpId; - + grp_data.rtg_cmd = CMD_ADD_RTG_THREAD; grp_data.prio_type = prioType; - if (isSelfRender) { - grp_data.rtg_cmd = CMD_ADD_SELF_RENDER_RTG_THREAD; - } else { - grp_data.rtg_cmd = CMD_ADD_RTG_THREAD; - } for (int i = 0; i < num; i++) { if (tids[i] < 0) { return -1; @@ -179,7 +168,7 @@ int AddThreadsToRtg(vector tids, int grpId, int prioType, bool isSelfRender return ret; }; -int RemoveRtgThread(int tid, bool isSelfRender) +int RemoveRtgThread(int tid, [[maybe_unused]] bool isRender) { if (g_fd < 0) { return g_fd; @@ -189,11 +178,7 @@ int RemoveRtgThread(int tid, bool isSelfRender) (void)memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data)); grp_data.tid_num = 1; grp_data.tids[0] = tid; - if (isSelfRender) { - grp_data.rtg_cmd = CMD_REMOVE_SELF_RENDER_RTG_THREAD; - } else { - grp_data.rtg_cmd = CMD_REMOVE_RTG_THREAD; - } + grp_data.rtg_cmd = CMD_REMOVE_RTG_THREAD; ret = ioctl(g_fd, CMD_ID_SET_RTG, &grp_data); if (ret != 0) { RME_LOGE("remove grp failed, ret = %{public}d, errno = %{public}d (%{public}s)", ret, errno, strerror(errno)); @@ -203,7 +188,7 @@ int RemoveRtgThread(int tid, bool isSelfRender) return ret; }; -int RemoveRtgThreads(vector tids, bool isSelfRender) +int RemoveRtgThreads(vector tids, [[maybe_unused]] bool isSelfRender) { struct rtg_grp_data grp_data; int ret; @@ -216,11 +201,7 @@ int RemoveRtgThreads(vector tids, bool isSelfRender) return -1; } grp_data.tid_num = num; - if (isSelfRender) { - grp_data.rtg_cmd = CMD_REMOVE_SELF_RENDER_RTG_THREAD; - } else { - grp_data.rtg_cmd = CMD_REMOVE_RTG_THREAD; - } + grp_data.rtg_cmd = CMD_REMOVE_RTG_THREAD; for (int i = 0; i < num; i++) { if (tids[i] < 0) { return -1; -- Gitee From 0d320c7dcbeaa1048e1aca7a8d483ba6226b7ece Mon Sep 17 00:00:00 2001 From: mengyiping <1091773127@qq.com> Date: Thu, 5 Sep 2024 08:06:25 +0000 Subject: [PATCH 07/10] update interfaces/innerkits/frameintf/rtg_interface.cpp. Signed-off-by: mengyiping <1091773127@qq.com> --- interfaces/innerkits/frameintf/rtg_interface.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/interfaces/innerkits/frameintf/rtg_interface.cpp b/interfaces/innerkits/frameintf/rtg_interface.cpp index 24e9078..b16809d 100644 --- a/interfaces/innerkits/frameintf/rtg_interface.cpp +++ b/interfaces/innerkits/frameintf/rtg_interface.cpp @@ -121,6 +121,7 @@ int AddThreadToRtg(int tid, int grpId, int prioType, [[maybe_unused]] bool isRen grp_data.grp_id = grpId; grp_data.rtg_cmd = CMD_ADD_RTG_THREAD; grp_data.prio_type = prioType; + ret = ioctl(g_fd, CMD_ID_SET_RTG, &grp_data); if (ret != 0) { RME_LOGE("add thread to rtg failed, grpId = %{public}d, ret = %{public}d, errno = %{public}d (%{public}s)", grpId, -- Gitee From 4489696dacd8be301b46077d75239427b08fb919 Mon Sep 17 00:00:00 2001 From: mengyiping <1091773127@qq.com> Date: Thu, 5 Sep 2024 08:07:45 +0000 Subject: [PATCH 08/10] update interfaces/innerkits/frameintf/rtg_interface.cpp. Signed-off-by: mengyiping <1091773127@qq.com> --- interfaces/innerkits/frameintf/rtg_interface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/frameintf/rtg_interface.cpp b/interfaces/innerkits/frameintf/rtg_interface.cpp index b16809d..914bb54 100644 --- a/interfaces/innerkits/frameintf/rtg_interface.cpp +++ b/interfaces/innerkits/frameintf/rtg_interface.cpp @@ -189,7 +189,7 @@ int RemoveRtgThread(int tid, [[maybe_unused]] bool isRender) return ret; }; -int RemoveRtgThreads(vector tids, [[maybe_unused]] bool isSelfRender) +int RemoveRtgThreads(vector tids, [[maybe_unused]] bool isRender) { struct rtg_grp_data grp_data; int ret; -- Gitee From 3de572306303fdd556f66a14ec9cf0a1c9f1b854 Mon Sep 17 00:00:00 2001 From: mengyiping <1091773127@qq.com> Date: Thu, 5 Sep 2024 09:17:29 +0000 Subject: [PATCH 09/10] update interfaces/innerkits/frameintf/rtg_interface.cpp. Signed-off-by: mengyiping <1091773127@qq.com> --- interfaces/innerkits/frameintf/rtg_interface.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interfaces/innerkits/frameintf/rtg_interface.cpp b/interfaces/innerkits/frameintf/rtg_interface.cpp index 914bb54..d35684d 100644 --- a/interfaces/innerkits/frameintf/rtg_interface.cpp +++ b/interfaces/innerkits/frameintf/rtg_interface.cpp @@ -108,7 +108,7 @@ int EnableRtg(bool flag) return 0; }; -int AddThreadToRtg(int tid, int grpId, int prioType, [[maybe_unused]] bool isRender) +int AddThreadToRtg(int tid, int grpId, int prioType, [[maybe_unused]] bool isBlue) { if (g_fd < 0) { return g_fd; @@ -134,7 +134,7 @@ int AddThreadToRtg(int tid, int grpId, int prioType, [[maybe_unused]] bool isRen return ret; } -int AddThreadsToRtg(vector tids, int grpId, int prioType, bool isRender) +int AddThreadsToRtg(vector tids, int grpId, int prioType, [[maybe_unused]] bool isBlue) { struct rtg_grp_data grp_data; int ret; @@ -169,7 +169,7 @@ int AddThreadsToRtg(vector tids, int grpId, int prioType, bool isRender) return ret; }; -int RemoveRtgThread(int tid, [[maybe_unused]] bool isRender) +int RemoveRtgThread(int tid, [[maybe_unused]] bool isBlue) { if (g_fd < 0) { return g_fd; @@ -189,7 +189,7 @@ int RemoveRtgThread(int tid, [[maybe_unused]] bool isRender) return ret; }; -int RemoveRtgThreads(vector tids, [[maybe_unused]] bool isRender) +int RemoveRtgThreads(vector tids, [[maybe_unused]] bool isBlue) { struct rtg_grp_data grp_data; int ret; -- Gitee From 7bac38b288e648b40104c24bbc0ae6a5cde518a8 Mon Sep 17 00:00:00 2001 From: mengyiping <1091773127@qq.com> Date: Thu, 5 Sep 2024 09:18:35 +0000 Subject: [PATCH 10/10] update common/include/rtg_interface.h. Signed-off-by: mengyiping <1091773127@qq.com> --- common/include/rtg_interface.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/include/rtg_interface.h b/common/include/rtg_interface.h index 68779f0..1d52022 100644 --- a/common/include/rtg_interface.h +++ b/common/include/rtg_interface.h @@ -86,10 +86,10 @@ enum rtg_sched_cmdid { extern "C" { int EnableRtg(bool flag); - int AddThreadToRtg(int tid, int grpId, int prioType = 0, bool isRender = false); - int AddThreadsToRtg(vector tids, int grpId, int prioType = 0, bool isRender = false); - int RemoveRtgThread(int tid, bool isRender = false); - int RemoveRtgThreads(vector tids, bool isRender = false); + int AddThreadToRtg(int tid, int grpId, int prioType = 0, bool isBlue = false); + int AddThreadsToRtg(vector tids, int grpId, int prioType = 0, bool isBlue = false); + int RemoveRtgThread(int tid, bool isBlue = false); + int RemoveRtgThreads(vector tids, bool isBlue = false); int DestroyRtgGrp(int grpId); int SetFrameRateAndPrioType(int rtgId, int rate, int rtgType); int BeginFrameFreq(int stateParam); -- Gitee