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 1/2] 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 2/2] --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