commit 63a2d51e0537eb4bd0653b842589dd4375883980
author Steven Moreland <smoreland@google.com> Fri Jun 25 01:10:15 2021 +0000
committer Steven Moreland <smoreland@google.com> Fri Jun 25 19:43:04 2021 +0000
tree 7b89a6a35b29b0fadac1cbee92aaf433c9aaed66
parent 28318606d85897024dcfd06107bfd87748f5c4bd

libbinder: attachObject APIs work with threads

These APIs now return values so that they can be used in a
multi-threaded environment without needing additional locking.

Bug: 192023359
Test: binderLibTest
Change-Id: Idc9054bde869a57c2cb5142963aae362674ce0c0

libs/binder/Binder.cpp

diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp
index 02321cd..4965386 100644
--- a/libs/binder/Binder.cpp
+++ b/libs/binder/Binder.cpp
@@ -311,15 +311,13 @@
     return NO_ERROR;
 }
 
-void BBinder::attachObject(
-    const void* objectID, void* object, void* cleanupCookie,
-    object_cleanup_func func)
-{
+void* BBinder::attachObject(const void* objectID, void* object, void* cleanupCookie,
+                            object_cleanup_func func) {
     Extras* e = getOrCreateExtras();
-    if (!e) return; // out of memory
+    if (!e) return nullptr; // out of memory
 
     AutoMutex _l(e->mLock);
-    e->mObjects.attach(objectID, object, cleanupCookie, func);
+    return e->mObjects.attach(objectID, object, cleanupCookie, func);
 }
 
 void* BBinder::findObject(const void* objectID) const
@@ -331,13 +329,12 @@
     return e->mObjects.find(objectID);
 }
 
-void BBinder::detachObject(const void* objectID)
-{
+void* BBinder::detachObject(const void* objectID) {
     Extras* e = mExtras.load(std::memory_order_acquire);
-    if (!e) return;
+    if (!e) return nullptr;
 
     AutoMutex _l(e->mLock);
-    e->mObjects.detach(objectID);
+    return e->mObjects.detach(objectID);
 }
 
 BBinder* BBinder::localBinder()