commit cd74d78173b9ccd60c14906a22ddbf723647b4f8
author Fan Xu <fanxu@google.com> Mon Nov 26 13:51:25 2018 -0800
committer Fan Xu <fanxu@google.com> Mon Dec 03 11:27:22 2018 -0800
tree c5bdfd43fade9e2f313065a6d8871c584b1454fa
parent a7422fe2e0afc5bce205db37460061e0ad7e3fb4

Change mClientList to std::set mClientSet

Change-Id: I34af8a96916032630c05ea3b4e9987a6e09d6f51
Fix: 119819092
Test: BufferHubBuffer_test (passed)

services/bufferhub/BufferHubService.cpp

diff --git a/services/bufferhub/BufferHubService.cpp b/services/bufferhub/BufferHubService.cpp
index 409f2ea..81bd142 100644
--- a/services/bufferhub/BufferHubService.cpp
+++ b/services/bufferhub/BufferHubService.cpp
@@ -44,8 +44,8 @@
 
     sp<BufferClient> client = BufferClient::create(this, node);
     // Add it to list for bookkeeping and dumpsys.
-    std::lock_guard<std::mutex> lock(mClientListMutex);
-    mClientList.push_back(client);
+    std::lock_guard<std::mutex> lock(mClientSetMutex);
+    mClientSet.emplace(client);
 
     _hidl_cb(/*bufferClient=*/client, /*status=*/BufferHubStatus::NO_ERROR);
     return Void();
@@ -86,8 +86,8 @@
 
     sp<BufferClient> client = new BufferClient(*originClient);
 
-    std::lock_guard<std::mutex> lock(mClientListMutex);
-    mClientList.push_back(client);
+    std::lock_guard<std::mutex> lock(mClientSetMutex);
+    mClientSet.emplace(client);
     _hidl_cb(/*bufferClient=*/client, /*status=*/BufferHubStatus::NO_ERROR);
     return Void();
 }
@@ -114,10 +114,10 @@
 void BufferHubService::onClientClosed(const BufferClient* client) {
     removeTokenByClient(client);
 
-    std::lock_guard<std::mutex> lock(mClientListMutex);
-    auto iter = std::find(mClientList.begin(), mClientList.end(), client);
-    if (iter != mClientList.end()) {
-        mClientList.erase(iter);
+    std::lock_guard<std::mutex> lock(mClientSetMutex);
+    auto iter = std::find(mClientSet.begin(), mClientSet.end(), client);
+    if (iter != mClientSet.end()) {
+        mClientSet.erase(iter);
     }
 }
 

services/bufferhub/include/bufferhub/BufferHubService.h

diff --git a/services/bufferhub/include/bufferhub/BufferHubService.h b/services/bufferhub/include/bufferhub/BufferHubService.h
index 1c328b3..add3d89 100644
--- a/services/bufferhub/include/bufferhub/BufferHubService.h
+++ b/services/bufferhub/include/bufferhub/BufferHubService.h
@@ -55,8 +55,8 @@
     void removeTokenByClient(const BufferClient* client);
 
     // List of active BufferClient for bookkeeping.
-    std::mutex mClientListMutex;
-    std::vector<wp<BufferClient>> mClientList GUARDED_BY(mClientListMutex);
+    std::mutex mClientSetMutex;
+    std::set<wp<BufferClient>> mClientSet GUARDED_BY(mClientSetMutex);
 
     // TODO(b/118180214): use a more secure implementation
     std::mt19937 mTokenEngine;