commit c4497ea9ab3b5fbdaf58129379aa11bf4eba90d8
author Xiang Wang <xwxw@google.com> Fri Feb 10 17:19:37 2023 -0800
committer Michael Bestas <mkbestas@lineageos.org> Sat May 18 08:57:27 2024 +0300
tree 851b9f5cc389124969018f5447dcd7f19f27d5ee
parent 2ffc1b610dbee4277b4b39a28127e24d0e4e7168

power-libperfmgr: Remove mTidRefCountMap

mTidSessionListMap alone can be used to check the ref count.

Bug: b/268744922
Test: n/a
Change-Id: Ic7a3aa32560790683e402253e9e04eadb288e1f7

power-libperfmgr/aidl/PowerSessionManager.cpp

diff --git a/power-libperfmgr/aidl/PowerSessionManager.cpp b/power-libperfmgr/aidl/PowerSessionManager.cpp
index f4b2f91..d697c6a 100644
--- a/power-libperfmgr/aidl/PowerSessionManager.cpp
+++ b/power-libperfmgr/aidl/PowerSessionManager.cpp
@@ -122,37 +122,23 @@
 void PowerSessionManager::addThreadsFromPowerSession(PowerHintSession *session) {
     std::lock_guard<std::mutex> guard(mLock);
     for (auto t : session->getTidList()) {
-        mTidSessionListMap[t].insert(session);
-        if (mTidRefCountMap.find(t) == mTidRefCountMap.end()) {
+        if (mTidSessionListMap[t].empty()) {
             if (!SetTaskProfiles(t, {"ResetUclampGrp"})) {
                 ALOGW("Failed to set ResetUclampGrp task profile for tid:%d", t);
-            } else {
-                mTidRefCountMap[t] = 1;
             }
-            continue;
         }
-        if (mTidRefCountMap[t] <= 0) {
-            ALOGE("Error! Unexpected zero/negative RefCount:%d for tid:%d", mTidRefCountMap[t], t);
-            continue;
-        }
-        mTidRefCountMap[t]++;
+        mTidSessionListMap[t].insert(session);
     }
 }
 
 void PowerSessionManager::removeThreadsFromPowerSession(PowerHintSession *session) {
     std::lock_guard<std::mutex> guard(mLock);
     for (auto t : session->getTidList()) {
-        if (mTidRefCountMap.find(t) == mTidRefCountMap.end()) {
-            ALOGE("Unexpected Error! Failed to look up tid:%d in TidRefCountMap", t);
-            continue;
-        }
         mTidSessionListMap[t].erase(session);
-        mTidRefCountMap[t]--;
-        if (mTidRefCountMap[t] <= 0) {
+        if (mTidSessionListMap[t].empty()) {
             if (!SetTaskProfiles(t, {"NoResetUclampGrp"})) {
                 ALOGW("Failed to set NoResetUclampGrp task profile for tid:%d", t);
             }
-            mTidRefCountMap.erase(t);
         }
     }
 }

power-libperfmgr/aidl/PowerSessionManager.h

diff --git a/power-libperfmgr/aidl/PowerSessionManager.h b/power-libperfmgr/aidl/PowerSessionManager.h
index 4246053..1c2733a 100644
--- a/power-libperfmgr/aidl/PowerSessionManager.h
+++ b/power-libperfmgr/aidl/PowerSessionManager.h
@@ -70,7 +70,6 @@
     const std::string kDisableBoostHintName;
 
     std::unordered_set<PowerHintSession *> mSessions;  // protected by mLock
-    std::unordered_map<int, int> mTidRefCountMap;      // protected by mLock
     std::unordered_map<int, std::unordered_set<PowerHintSession *>> mTidSessionListMap;
     bool mActive;  // protected by mLock
     /**