Codex fix for frame_aware_sched

Signed-off-by: Dai Li <daili12@huawei.com>

OAT.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2021 Huawei Device Co., Ltd.
-
+<!-- Copyright (c) 2022 Huawei Device Co., Ltd.
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at

common/include/frame_info_const.h

@@ -37,8 +37,6 @@ enum class FrameEvent {
     EVENT_SEND_COMMANDS_START,
     EVENT_END_FRAME,
     EVENT_SET_PARAM,
-    EVENT_RTG_ENABLE,
-    EVENT_BUFFER_COUNT,
     UNKNOWN,
 };
 

frameworks/core/frame_aware_collector/src/frame_msg_mgr.cpp

@@ -30,6 +30,7 @@ FrameMsgMgr::~FrameMsgMgr()
 {
     if (rmeScene != nullptr) {
         delete rmeScene;
+        rmeScene = nullptr;
     }
 }
 

frameworks/core/frame_aware_collector/src/rme_scene_sched.cpp

@@ -25,6 +25,7 @@ RmeSceneSched::~RmeSceneSched()
 {
     if (rmeCoreSched != nullptr) {
         delete rmeCoreSched;
+        rmeCoreSched = nullptr;
     }
 }
 

frameworks/core/frame_aware_policy/include/app_info.h

@@ -54,6 +54,6 @@ private:
     int m_rtGrp;
     AppState m_appState;
 };
-} // RME
-} // OHOS
+} // namespace RME
+} // namespace OHOS
 #endif

frameworks/core/frame_aware_policy/include/rtg_msg_mgr.h

@@ -37,6 +37,6 @@ public:
     void FpsChanged();
     void FocusChanged(const int pid, bool isFocus); // for multiwindow
 };
-} // RME
-} // OHOS
+} // namespace RME
+} // namespace OHOS
 #endif

frameworks/core/frame_aware_policy/src/rtg_msg_mgr.cpp

@@ -96,7 +96,9 @@ void RtgMsgMgr::FpsChanged()
 
 void RtgMsgMgr::FocusChanged(const int pid, bool isFocus)
 {
+    (void)pid;
+    (void)isFocus;
     RME_LOGI("[FocusChanged]: need to change prio for rtggrp");
 }
-} // RME
-} // OHOS
+} // namespace RME
+} // namespace OHOS

interfaces/innerkits/frameintf/rtg_interface.cpp

@@ -104,7 +104,7 @@ int CreateNewRtgGrp(int prioType, int rtNum)
     if (fd < 0) {
         return fd;
     }
-    memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data));
+    (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;
     }
@@ -131,7 +131,7 @@ int AddThreadToRtg(int tid, int grpId, int prioType)
         RME_LOGE("open node failed.");
         return fd;
     }
-    memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data));
+    (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.grp_id = grpId;
@@ -150,7 +150,7 @@ int AddThreadsToRtg(vector<int> tids, int grpId, int prioType)
     if (fd < 0) {
         return fd;
     }
-    memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data));
+    (void)memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data));
     int num = tids.size();
     if (num > MAX_TID_NUM) {
         return -1;
@@ -186,7 +186,7 @@ int RemoveRtgThread(int tid)
     if (fd < 0) {
         return fd;
     }
-    memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data));
+    (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;
@@ -208,7 +208,7 @@ int ClearRtgGrp(int GrpId)
     if (fd < 0) {
         return fd;
     }
-    memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data));
+    (void)memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data));
     grp_data.rtg_cmd = CMD_CLEAR_RTG_GRP;
     grp_data.grp_id = GrpId;
     ret = ioctl(fd, CMD_ID_SET_RTG, &grp_data);
@@ -229,7 +229,7 @@ int DestroyRtgGrp(int GrpId)
     if (fd < 0) {
         return fd;
     }
-    memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data));
+    (void)memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data));
     grp_data.rtg_cmd = CMD_DESTROY_RTG_GRP;
     grp_data.grp_id = GrpId;
     ret = ioctl(fd, CMD_ID_SET_RTG, &grp_data);
@@ -390,7 +390,7 @@ int ListRtgGroup(vector<int> *rs)
     if (!rs) {
         return -1;
     }
-    memset_s(&rtg_info, sizeof(struct rtg_info), 0, sizeof(struct rtg_info));
+    (void)memset_s(&rtg_info, sizeof(struct rtg_info), 0, sizeof(struct rtg_info));
     ret = ioctl(fd, CMD_ID_LIST_RTG, &rtg_info);
     if (ret < 0) {
         RME_LOGE("list rtg group failed, errno = %{public}d (%{public}s)", errno, strerror(errno));
@@ -416,7 +416,7 @@ int ListRtgThread(int grpId, vector<int> *rs)
     if (!rs) {
         return -1;
     }
-    memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data));
+    (void)memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data));
     grp_data.grp_id = grpId;
     ret = ioctl(fd, CMD_ID_LIST_RTG_THREAD, &grp_data);
     if (ret < 0) {
@@ -444,7 +444,7 @@ int SearchRtgForTid(int tid)
         RME_LOGI("Search tid err: invalid tid.");
         return -1;
     }
-    memset_s(&search_data, sizeof(struct proc_state_data), 0, sizeof(struct proc_state_data));
+    (void)memset_s(&search_data, sizeof(struct proc_state_data), 0, sizeof(struct proc_state_data));
     search_data.state_param = tid;
     ret = ioctl(fd, CMD_ID_SEARCH_RTG, &search_data);
     if (ret < 0) {

test/unittest/phone/rtg_interface_test.cpp

@@ -72,8 +72,8 @@ void RtgInterfaceTest::TearDown()
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceCreateAndDestroy, TestSize.Level1)
 {
-    int ret = 0;
-    int grpId = 0;
+    int ret;
+    int grpId;
     grpId = CreateNewRtgGrp(NORMAL_TASK, 0);
     EXPECT_GT(grpId, 0);
     ret = DestroyRtgGrp(grpId);
@@ -87,7 +87,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceCreateAndDestroy, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceDestroyErrorGroup, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     ret = DestroyRtgGrp(-1);
     EXPECT_NE(ret, 0);
 }
@@ -99,8 +99,8 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceDestroyErrorGroup, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceAddRtg, TestSize.Level1)
 {
-    int ret = 0;
-    int grpId = 0;
+    int ret;
+    int grpId;
     int pid = getpid();
     grpId = CreateNewRtgGrp(VIP, 0);
     EXPECT_GT(grpId, 0);
@@ -117,8 +117,8 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceAddRtg, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceAddErrorThread, TestSize.Level1)
 {
-    int ret = 0;
-    int grpId = 0;
+    int ret;
+    int grpId;
     grpId = CreateNewRtgGrp(VIP, 0);
     EXPECT_GT(grpId, 0);
     ret = AddThreadToRtg(-1, grpId);
@@ -134,7 +134,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceAddErrorThread, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceAddErrorGroup, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     int pid = getpid();
     ret = AddThreadToRtg(pid, -1);
     EXPECT_NE(ret, 0);
@@ -147,8 +147,8 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceAddErrorGroup, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceAddRtgs, TestSize.Level1)
 {
-    int ret = 0;
-    int grpId = 0;
+    int ret;
+    int grpId;
     int pid = getpid();
     vector<int> pids = {};
     pids.push_back(pid);
@@ -167,8 +167,8 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceAddRtgs, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceClearRtg, TestSize.Level1)
 {
-    int ret = 0;
-    int grpId = 0;
+    int ret;
+    int grpId;
     int pid = getpid();
     grpId = CreateNewRtgGrp(VIP, 0);
     EXPECT_GT(grpId, 0);
@@ -187,7 +187,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceClearRtg, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceClearErrorGroup, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     ret = ClearRtgGrp(-1);
     EXPECT_NE(ret, 0);
 }
@@ -199,8 +199,8 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceClearErrorGroup, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceBeginFrameFreq, TestSize.Level1)
 {
-    int ret = 0;
-    int grpId = 0;
+    int ret;
+    int grpId;
     grpId = CreateNewRtgGrp(VIP, 0);
     EXPECT_GT(grpId, 0);
     ret = BeginFrameFreq(grpId, 0);
@@ -216,7 +216,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceBeginFrameFreq, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceBeginFrameFreqWithErrorGrp, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     ret = BeginFrameFreq(-1, 0);
     EXPECT_NE(ret, 0);
 }
@@ -228,8 +228,8 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceBeginFrameFreqWithErrorGrp, TestSize.Leve
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceEndFrameFreq, TestSize.Level1)
 {
-    int ret = 0;
-    int grpId = 0;
+    int ret;
+    int grpId;
     grpId = CreateNewRtgGrp(VIP, 0);
     EXPECT_GT(grpId, 0);
     ret = EndFrameFreq(grpId);
@@ -245,7 +245,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceEndFrameFreq, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceEndFrameFreqWithErrorGrp, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     ret = EndFrameFreq(-1);
     EXPECT_NE(ret, 0);
 }
@@ -257,8 +257,8 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceEndFrameFreqWithErrorGrp, TestSize.Level1
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceEndScene, TestSize.Level1)
 {
-    int ret = 0;
-    int grpId = 0;
+    int ret;
+    int grpId;
     grpId = CreateNewRtgGrp(VIP, 0);
     EXPECT_GT(grpId, 0);
     ret = EndScene(grpId);
@@ -274,7 +274,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceEndScene, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceEndSceneWithErrorGrp, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     ret = EndScene(-1);
     EXPECT_NE(ret, 0);
 }
@@ -286,8 +286,8 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceEndSceneWithErrorGrp, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceSetMinUtil, TestSize.Level1)
 {
-    int ret = 0;
-    int grpId = 0;
+    int ret;
+    int grpId;
     grpId = CreateNewRtgGrp(VIP, 0);
     EXPECT_GT(grpId, 0);
     ret = SetMinUtil(grpId, 0);
@@ -303,7 +303,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceSetMinUtil, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceSetMinUtilWithErrorGrp, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     ret = SetMinUtil(-1, 0);
     EXPECT_NE(ret, 0);
 }
@@ -315,8 +315,8 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceSetMinUtilWithErrorGrp, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceSetMargin, TestSize.Level1)
 {
-    int ret = 0;
-    int grpId = 0;
+    int ret;
+    int grpId;
     grpId = CreateNewRtgGrp(VIP, 0);
     EXPECT_GT(grpId, 0);
     ret = SetMargin(grpId, 0);
@@ -332,7 +332,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceSetMargin, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceSetMarginWithErrorGrp, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     ret = SetMargin(-1, 0);
     EXPECT_NE(ret, 0);
 }
@@ -344,8 +344,8 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceSetMarginWithErrorGrp, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceListRtgThread, TestSize.Level1)
 {
-    int ret = 0;
-    int grpId = 0;
+    int ret;
+    int grpId;
     vector<int> rs;
     grpId = CreateNewRtgGrp(VIP, 0);
     EXPECT_GT(grpId, 0);
@@ -362,8 +362,8 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceListRtgThread, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceListRtgThreadWithNullRes, TestSize.Level1)
 {
-    int ret = 0;
-    int grpId = 0;
+    int ret;
+    int grpId;
     grpId = CreateNewRtgGrp(VIP, 0);
     EXPECT_GT(grpId, 0);
     ret = ListRtgThread(grpId, nullptr);
@@ -379,7 +379,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceListRtgThreadWithNullRes, TestSize.Level1
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceListRtgThreadWithErrorGrp, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     vector<int> rs;
     ret = ListRtgThread(-1, &rs);
     EXPECT_NE(ret, 0);
@@ -392,7 +392,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceListRtgThreadWithErrorGrp, TestSize.Level
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceListRtgGroup, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     vector<int> rs;
     ret = ListRtgGroup(&rs);
     EXPECT_EQ(ret, 0);
@@ -405,7 +405,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceListRtgGroup, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceListRtgGroupWithNullRes, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     ret = ListRtgGroup(nullptr);
     EXPECT_NE(ret, 0);
 }
@@ -417,8 +417,8 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceListRtgGroupWithNullRes, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceSetAttr, TestSize.Level1)
 {
-    int ret = 0;
-    int grpId = 0;
+    int ret;
+    int grpId;
     grpId = CreateNewRtgGrp(VIP, 0);
     EXPECT_GT(grpId, 0);
     ret = SetFrameRateAndPrioType(grpId, 60, VIP);
@@ -434,8 +434,8 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceSetAttr, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceSetErrorAttr, TestSize.Level1)
 {
-    int ret = 0;
-    int grpId = 0;
+    int ret;
+    int grpId;
     grpId = CreateNewRtgGrp(VIP, 0);
     EXPECT_GT(grpId, 0);
     ret = SetFrameRateAndPrioType(grpId, 90, -1);
@@ -451,7 +451,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceSetErrorAttr, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceSetMaxVips, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     ret = SetMaxVipRtgs(2);
     EXPECT_EQ(ret, 0);
 }
@@ -463,7 +463,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceSetMaxVips, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceSetErrorMaxVips, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     ret = SetMaxVipRtgs(0);
     EXPECT_NE(ret, 0);
 }
@@ -475,7 +475,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceSetErrorMaxVips, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceSetLargeMaxVips, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     ret = SetMaxVipRtgs(50000);
     EXPECT_NE(ret, 0);
 }
@@ -487,7 +487,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceSetLargeMaxVips, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceAddMultipleThreads, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     int pid[3];
     vector<int> threads;
     int grpId;
@@ -515,7 +515,7 @@ HWTEST_F(RtgInterfaceTest, RtgInterfaceAddMultipleThreads, TestSize.Level1)
  */
 HWTEST_F(RtgInterfaceTest, RtgInterfaceAddMultipleThreadsOutOfLimit, TestSize.Level1)
 {
-    int ret = 0;
+    int ret;
     int pid[8];
     vector<int> threads;
     int grpId;