diff --git a/common/include/rtg_interface.h b/common/include/rtg_interface.h index dce9a3a882a323711936386c0754af15e57e80bc..94f2a4eddbe60df54a375dfb1b6d1ecbfa3c4b2b 100644 --- a/common/include/rtg_interface.h +++ b/common/include/rtg_interface.h @@ -86,7 +86,6 @@ enum rtg_sched_cmdid { extern "C" { int EnableRtg(bool flag); - int CreateNewRtgGrp(int prioType = 0, int rtNum = 0); // Return GrpId if success int AddThreadToRtg(int tid, int grpId, int prioType = 0); int AddThreadsToRtg(vector tids, int grpId, int prioType = 0); int RemoveRtgThread(int tid); diff --git a/frameworks/core/frame_aware_policy/include/intellisense_server.h b/frameworks/core/frame_aware_policy/include/intellisense_server.h index 7b34b8f75a2705b259db230f4be592f9c8e880bb..ad4222a1fcc492063cb3dddca319c51353f60936 100644 --- a/frameworks/core/frame_aware_policy/include/intellisense_server.h +++ b/frameworks/core/frame_aware_policy/include/intellisense_server.h @@ -52,6 +52,7 @@ private: void AuthForeground(int uid); void AuthBackground(int uid); int TryCreateRtgForApp(AppInfo *app); + int CreateNewRtgGrp(int prioType = 0, int rtNum = 0); inline CgroupPolicy CheckCgroupState(const CgroupPolicy cgroup); std::list::iterator GetRecordOfPid(int pid); std::list m_historyApp = {}; diff --git a/frameworks/core/frame_aware_policy/src/intellisense_server.cpp b/frameworks/core/frame_aware_policy/src/intellisense_server.cpp index 6ca24c269c19920de2c0ff43b88522d1d3aaeb81..197e5cba0e149f99327574f92a4723fe8b80fed9 100644 --- a/frameworks/core/frame_aware_policy/src/intellisense_server.cpp +++ b/frameworks/core/frame_aware_policy/src/intellisense_server.cpp @@ -14,13 +14,17 @@ */ #include "intellisense_server.h" +#include +#include #include #include #include #include +#include #include +#include +#include #include -#include #include "qos_common.h" #include "para_config.h" #include "rtg_interface.h" @@ -32,6 +36,8 @@ namespace { static std::string configFilePath = "/system/etc/frame_aware_sched/hwrme.xml"; // need To check the exact file path. constexpr int WEB_BASE_UID = 1000001; constexpr int WEB_END_UID = 1099999; + const char RTG_SCHED_IPC_MAGIC = 0xAB; + constexpr int RTG_TYPE_MAX = 3; } using namespace std; using namespace QosCommon; @@ -39,6 +45,9 @@ using namespace QosCommon; DEFINE_RMELOG_INTELLISENSE("ueaServer-IntelliSenseServer"); IMPLEMENT_SINGLE_INSTANCE(IntelliSenseServer); +#define CMD_ID_SET_RTG \ + _IOWR(RTG_SCHED_IPC_MAGIC, SET_RTG, struct rtg_str_data) + void IntelliSenseServer::Init() { if (!ReadXml()) { @@ -349,5 +358,32 @@ void IntelliSenseServer::AuthBackground(int uid) } } +int IntelliSenseServer::CreateNewRtgGrp(int prioType, int rtNum) +{ + struct rtg_grp_data grp_data; + int ret; + char fileName[] = "/proc/self/sched_rtg_ctrl"; + int fd = open(fileName, O_RDWR); + if (fd < 0) { + RME_LOGE("Open file /proc/self/sched_rth_ctrl, errno = %{public}d", errno); + return fd; + } + (void)memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data)); + if ((prioType > 0) && (prioType < RTG_TYPE_MAX)) { + grp_data.prio_type = prioType; + } + if (rtNum > 0) { + grp_data.rt_cnt = rtNum; + } + grp_data.rtg_cmd = CMD_CREATE_RTG_GRP; + ret = ioctl(fd, CMD_ID_SET_RTG, &grp_data); + if (ret < 0) { + RME_LOGE("create rtg grp failed, errno = %{public}d (%{public}s)", errno, strerror(errno)); + } else { + RME_LOGI("create rtg grp success, get rtg id %{public}d.", ret); + } + close(fd); + return ret; +} } // namespace RME } // namesapce OHOS diff --git a/interfaces/innerkits/frameintf/frame_msg_intf.cpp b/interfaces/innerkits/frameintf/frame_msg_intf.cpp index d4e2b1ad82b96c039edce933ad7152648ee3aaec..0f2d5008eebfbaf6f22b4b61b8383ced7728c5ba 100644 --- a/interfaces/innerkits/frameintf/frame_msg_intf.cpp +++ b/interfaces/innerkits/frameintf/frame_msg_intf.cpp @@ -123,6 +123,11 @@ void FrameMsgIntf::ReportCgroupChange(const int pid, const int uid, const int ol }); } +void FrameMsgIntf::ReportSlideEvent(const int pid, const int uid, const int64_t status) +{ + return; +} + void FrameMsgIntf::Stop() { std::lock_guard autoLock(frameMsgIntfMutex_); diff --git a/interfaces/innerkits/frameintf/frame_msg_intf.h b/interfaces/innerkits/frameintf/frame_msg_intf.h index 199f2508b62531a09b2a1d44e707fde7368eeb40..0e320ae9def37b70d0af5570541a7c9db148b839 100644 --- a/interfaces/innerkits/frameintf/frame_msg_intf.h +++ b/interfaces/innerkits/frameintf/frame_msg_intf.h @@ -32,6 +32,7 @@ public: void ReportCgroupChange(const int pid, const int uid, const int oldGroup, const int newGroup); void ReportWindowFocus(const int pid, const int uid, const int isFocus); void ReportRenderThread(const int pid, const int uid, const int renderTid); + void ReportSlideEvent(const int pid, const int uid, const int64_t status); void Stop(); protected: FrameMsgIntf() = default; diff --git a/interfaces/innerkits/frameintf/rtg_interface.cpp b/interfaces/innerkits/frameintf/rtg_interface.cpp index 3f78d20262ffad5bfb61ff27965f7c5175a06d5b..be10382ac318b4cd900bee1ffa3e2918d3d7af02 100644 --- a/interfaces/innerkits/frameintf/rtg_interface.cpp +++ b/interfaces/innerkits/frameintf/rtg_interface.cpp @@ -30,7 +30,6 @@ namespace RME { namespace { constexpr size_t MAX_LENGTH = 100; constexpr size_t MAX_STR_LEN = 100; - constexpr int RTG_TYPE_MAX = 3; } DEFINE_RMELOG_INTELLISENSE("rtg_interface"); @@ -105,31 +104,6 @@ int EnableRtg(bool flag) return 0; }; -int CreateNewRtgGrp(int prioType, int rtNum) -{ - struct rtg_grp_data grp_data; - int ret; - if (g_fd < 0) { - RME_LOGE("Open file /proc/self/sched_rtg_ctrl, errno = %{public}d", errno); - return g_fd; - } - (void)memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data)); - if ((prioType > 0) && (prioType < RTG_TYPE_MAX)) { - grp_data.prio_type = prioType; - } - if (rtNum > 0) { - grp_data.rt_cnt = rtNum; - } - grp_data.rtg_cmd = CMD_CREATE_RTG_GRP; - ret = ioctl(g_fd, CMD_ID_SET_RTG, &grp_data); - if (ret < 0) { - RME_LOGE("create rtg grp failed, errno = %{public}d (%{public}s)", errno, strerror(errno)); - } else { - RME_LOGI("create rtg grp success, get rtg id %{public}d.", ret); - } - return ret; -} - int AddThreadToRtg(int tid, int grpId, int prioType) { if (g_fd < 0) { diff --git a/test/BUILD.gn b/test/BUILD.gn index 2de4d12d4a1d69e9996ddcdaa1b7dcdda5df118c..5caf2003508505c48b38a5664e9e9be493b7329c 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -63,7 +63,10 @@ ohos_unittest("rtg_interface_test") { sources = [ "unittest/phone/rtg_interface_test.cpp" ] - include_dirs = [ "../common/include" ] + include_dirs = [ + "../common/include", + "../frameworks/core/frame_aware_policy/include", + ] deps = frame_aware_sched_deps diff --git a/test/unittest/phone/rtg_interface_test.cpp b/test/unittest/phone/rtg_interface_test.cpp index 71e917c854ba8b2974adb25c36d8f83ebfcde825..1a5137823df64ee2b4de1753588745311fac72c0 100644 --- a/test/unittest/phone/rtg_interface_test.cpp +++ b/test/unittest/phone/rtg_interface_test.cpp @@ -17,6 +17,7 @@ #define private public #define protected public +#include "intellisense_server.h" #include "rtg_interface.h" #undef private #undef protected @@ -74,7 +75,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceCreateAndDestroy, TestSize.Level1) { int ret; int grpId; - grpId = CreateNewRtgGrp(NORMAL_TASK, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(NORMAL_TASK, 0); EXPECT_GT(grpId, 0); ret = DestroyRtgGrp(grpId); EXPECT_EQ(ret, 0); @@ -102,7 +103,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceAddRtg, TestSize.Level1) int ret; int grpId; int pid = getpid(); - grpId = CreateNewRtgGrp(VIP, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(VIP, 0); EXPECT_GT(grpId, 0); ret = AddThreadToRtg(pid, grpId); EXPECT_EQ(ret, 0); @@ -119,7 +120,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceAddErrorThread, TestSize.Level1) { int ret; int grpId; - grpId = CreateNewRtgGrp(VIP, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(VIP, 0); EXPECT_GT(grpId, 0); ret = AddThreadToRtg(-1, grpId); EXPECT_NE(ret, 0); @@ -152,7 +153,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceAddRtgs, TestSize.Level1) int pid = getpid(); vector pids = {}; pids.push_back(pid); - grpId = CreateNewRtgGrp(VIP, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(VIP, 0); EXPECT_GT(grpId, 0); ret = AddThreadsToRtg(pids, grpId); EXPECT_EQ(ret, 0); @@ -170,7 +171,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceClearRtg, TestSize.Level1) int ret; int grpId; int pid = getpid(); - grpId = CreateNewRtgGrp(VIP, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(VIP, 0); EXPECT_GT(grpId, 0); ret = AddThreadToRtg(pid, grpId); EXPECT_EQ(ret, 0); @@ -201,7 +202,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceBeginFrameFreq, TestSize.Level1) { int ret; int grpId; - grpId = CreateNewRtgGrp(VIP, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(VIP, 0); EXPECT_GT(grpId, 0); ret = BeginFrameFreq(grpId, 0); EXPECT_EQ(ret, 0); @@ -230,7 +231,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceEndFrameFreq, TestSize.Level1) { int ret; int grpId; - grpId = CreateNewRtgGrp(VIP, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(VIP, 0); EXPECT_GT(grpId, 0); ret = EndFrameFreq(grpId); EXPECT_EQ(ret, 0); @@ -259,7 +260,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceEndScene, TestSize.Level1) { int ret; int grpId; - grpId = CreateNewRtgGrp(VIP, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(VIP, 0); EXPECT_GT(grpId, 0); ret = EndScene(grpId); EXPECT_EQ(ret, 0); @@ -288,7 +289,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceSetMinUtil, TestSize.Level1) { int ret; int grpId; - grpId = CreateNewRtgGrp(VIP, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(VIP, 0); EXPECT_GT(grpId, 0); ret = SetMinUtil(grpId, 0); EXPECT_EQ(ret, 0); @@ -317,7 +318,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceSetMargin, TestSize.Level1) { int ret; int grpId; - grpId = CreateNewRtgGrp(VIP, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(VIP, 0); EXPECT_GT(grpId, 0); ret = SetMargin(grpId, 0); EXPECT_EQ(ret, 0); @@ -347,7 +348,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceListRtgThread, TestSize.Level1) int ret; int grpId; vector rs; - grpId = CreateNewRtgGrp(VIP, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(VIP, 0); EXPECT_GT(grpId, 0); ret = ListRtgThread(grpId, &rs); EXPECT_EQ(ret, 0); @@ -364,7 +365,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceListRtgThreadWithNullRes, TestSize.Level1 { int ret; int grpId; - grpId = CreateNewRtgGrp(VIP, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(VIP, 0); EXPECT_GT(grpId, 0); ret = ListRtgThread(grpId, nullptr); EXPECT_NE(ret, 0); @@ -419,7 +420,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceSetAttr, TestSize.Level1) { int ret; int grpId; - grpId = CreateNewRtgGrp(VIP, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(VIP, 0); EXPECT_GT(grpId, 0); ret = SetFrameRateAndPrioType(grpId, 60, VIP); EXPECT_EQ(ret, 0); @@ -436,7 +437,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceSetErrorAttr, TestSize.Level1) { int ret; int grpId; - grpId = CreateNewRtgGrp(VIP, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(VIP, 0); EXPECT_GT(grpId, 0); ret = SetFrameRateAndPrioType(grpId, 90, -1); EXPECT_NE(ret, 0); @@ -500,7 +501,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceAddMultipleThreads, TestSize.Level1) } threads.push_back(pid[i]); } - grpId = CreateNewRtgGrp(NORMAL_TASK, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(NORMAL_TASK, 0); EXPECT_GT(grpId, 0); ret = AddThreadsToRtg(threads, grpId); EXPECT_EQ(ret, 0); @@ -528,7 +529,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceAddMultipleThreadsOutOfLimit, TestSize.Le } threads.push_back(pid[i]); } - grpId = CreateNewRtgGrp(NORMAL_TASK, 0); + grpId = IntelliSenseServer::GetInstance().CreateNewRtgGrp(NORMAL_TASK, 0); EXPECT_GT(grpId, 0); ret = AddThreadsToRtg(threads, grpId); EXPECT_NE(ret, 0);