commit 537bac1f59d3f6525876eaadd95f2b138a5fa3f3
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 27 21:21:19 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 27 21:21:19 2017 +0000
tree 0b344cfc3f9a33c4f8dd99c1a03f071355253c2d
parent 2a2678e402e440068bf24d012e294d65c9c0c8b9
parent a61f5d81da89ba641bf99fdaeb63f94a7d9056fc

Merge "Add eraseIfEqual to ConcurrentMap."

transport/include/hidl/ConcurrentMap.h

diff --git a/transport/include/hidl/ConcurrentMap.h b/transport/include/hidl/ConcurrentMap.h
index cd55ad4..4066869 100644
--- a/transport/include/hidl/ConcurrentMap.h
+++ b/transport/include/hidl/ConcurrentMap.h
@@ -50,6 +50,20 @@
         return mMap.erase(k);
     }
 
+    size_type eraseIfEqual(const K& k, const V& v) {
+        std::unique_lock<std::mutex> _lock(mMutex);
+        const_iterator iter = mMap.find(k);
+        if (iter == mMap.end()) {
+            return 0;
+        }
+        if (iter->second == v) {
+            mMap.erase(iter);
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
     std::unique_lock<std::mutex> lock() { return std::unique_lock<std::mutex>(mMutex); }
 
     void setLocked(K&& k, V&& v) { mMap[std::forward<K>(k)] = std::forward<V>(v); }