diff options
| -rw-r--r-- | Binder.cpp | 32 | ||||
| -rw-r--r-- | include/hwbinder/Binder.h | 3 |
2 files changed, 15 insertions, 20 deletions
@@ -16,7 +16,7 @@ #include <binder/Binder.h> -#include <stdatomic.h> +#include <utils/Atomic.h> #include <utils/misc.h> #include <binder/BpBinder.h> #include <binder/IInterface.h> @@ -71,8 +71,8 @@ public: // --------------------------------------------------------------------------- BBinder::BBinder() + : mExtras(NULL) { - atomic_init(&mExtras, 0); } bool BBinder::isBinderAlive() const @@ -139,19 +139,19 @@ void BBinder::attachObject( const void* objectID, void* object, void* cleanupCookie, object_cleanup_func func) { - Extras* e = reinterpret_cast<Extras*>( - atomic_load_explicit(&mExtras, memory_order_acquire)); + Extras* e = mExtras; if (!e) { e = new Extras; - uintptr_t* expected = 0; - if (!atomic_compare_exchange_strong_explicit( - &mExtras, &expected, - reinterpret_cast<uintptr_t>(e), - memory_order_release, - memory_order_acquire)) { +#ifdef __LP64__ + if (android_atomic_release_cas64(0, reinterpret_cast<int64_t>(e), + reinterpret_cast<volatile int64_t*>(&mExtras)) != 0) { +#else + if (android_atomic_cmpxchg(0, reinterpret_cast<int32_t>(e), + reinterpret_cast<volatile int32_t*>(&mExtras)) != 0) { +#endif delete e; - e = reinterpret_cast<Extras*>(expected); // Filled in by CAS + e = mExtras; } if (e == 0) return; // out of memory } @@ -162,8 +162,7 @@ void BBinder::attachObject( void* BBinder::findObject(const void* objectID) const { - Extras* e = reinterpret_cast<Extras*>( - atomic_load_explicit(&mExtras, memory_order_acquire)); + Extras* e = mExtras; if (!e) return NULL; AutoMutex _l(e->mLock); @@ -172,8 +171,7 @@ void* BBinder::findObject(const void* objectID) const void BBinder::detachObject(const void* objectID) { - Extras* e = reinterpret_cast<Extras*>( - atomic_load_explicit(&mExtras, memory_order_acquire)); + Extras* e = mExtras; if (!e) return; AutoMutex _l(e->mLock); @@ -187,9 +185,7 @@ BBinder* BBinder::localBinder() BBinder::~BBinder() { - Extras* e = reinterpret_cast<Extras*>( - atomic_load_explicit(&mExtras, memory_order_relaxed)); - if (e) delete e; + if (mExtras) delete mExtras; } diff --git a/include/hwbinder/Binder.h b/include/hwbinder/Binder.h index 16f2c4a..ba3ac4b 100644 --- a/include/hwbinder/Binder.h +++ b/include/hwbinder/Binder.h @@ -17,7 +17,6 @@ #ifndef ANDROID_BINDER_H #define ANDROID_BINDER_H -#include <stdatomic.h> #include <binder/IBinder.h> // --------------------------------------------------------------------------- @@ -70,7 +69,7 @@ private: class Extras; - atomic_uintptr_t mExtras; // should be atomic<Extras *> + Extras* mExtras; void* mReserved0; }; |