commit 84d9f9fc08dc8b75ecd0155a955ea93dd3fdccb7
author Chenbo Feng <fengc@google.com> Fri Apr 12 15:31:02 2019 -0700
committer Maciej Żenczykowski <maze@google.com> Wed Apr 17 20:02:05 2019 +0000
tree 4b9691a38dd55c9e6a39047db5f03503ca7bc3e0
parent e456935d918bfd7646586e70b8b0602d2566fb72

Improve the locking design inside TrafficController

Rename the mOwnerMatchMutex lock to mMutex and use it to protect all
data structures in TrafficController that could be accessed
concurrently. Add necessary annotations to the data structures needing
protection to catch unsafe access at compile time.

Test: netd_unit_test, netd_integration_test
Bug: 130334320
Change-Id: I847ce518df8626f647e1d80468e4daf4604872f2

server/TrafficControllerTest.cpp

diff --git a/server/TrafficControllerTest.cpp b/server/TrafficControllerTest.cpp
index e2a1327..bb56d97 100644
--- a/server/TrafficControllerTest.cpp
+++ b/server/TrafficControllerTest.cpp
@@ -70,7 +70,7 @@
     BpfMap<uint32_t, uint8_t> mFakeUidPermissionMap;
 
     void SetUp() {
-        std::lock_guard ownerGuard(mTc.mOwnerMatchMutex);
+        std::lock_guard guard(mTc.mMutex);
         SKIP_IF_BPF_NOT_SUPPORTED;
         ASSERT_EQ(0, setrlimitForTest());
 
@@ -249,13 +249,17 @@
     }
 
     void expectPrivilegedUserSet(const std::vector<uid_t>& appUids) {
+        std::lock_guard guard(mTc.mMutex);
         EXPECT_EQ(appUids.size(), mTc.mPrivilegedUser.size());
         for (uid_t uid : appUids) {
             EXPECT_NE(mTc.mPrivilegedUser.end(), mTc.mPrivilegedUser.find(uid));
         }
     }
 
-    void expectPrivilegedUserSetEmpty() { EXPECT_TRUE(mTc.mPrivilegedUser.empty()); }
+    void expectPrivilegedUserSetEmpty() {
+        std::lock_guard guard(mTc.mMutex);
+        EXPECT_TRUE(mTc.mPrivilegedUser.empty());
+    }
 
     void addPrivilegedUid(uid_t uid) {
         std::vector privilegedUid = {uid};