Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f010a05c authored by Hans Boehm's avatar Hans Boehm
Browse files

Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""" 

This reverts commit 66629e0d.

Change-Id: Ic298b345d0e500d18e4297b00e755ce3340f13fb
parent 66629e0d

include/binder/Binder.h

+1 −3
Original line number Original line Diff line number Diff line
@@ -17,8 +17,6 @@ 
#ifndef ANDROID_BINDER_H

#ifndef ANDROID_BINDER_H

#define ANDROID_BINDER_H

#define ANDROID_BINDER_H





#include <stdatomic.h>

#include <stdint.h>

#include <binder/IBinder.h>

#include <binder/IBinder.h>





// ---------------------------------------------------------------------------

// ---------------------------------------------------------------------------
@@ -71,7 +69,7 @@ private: 




    class Extras;

    class Extras;





    atomic_uintptr_t    mExtras;  // should be atomic<Extras *>

            Extras*     mExtras;

            void*       mReserved0;

            void*       mReserved0;

};

};

libs/binder/Binder.cpp

+14 −18
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 




#include <binder/Binder.h>

#include <binder/Binder.h>





#include <stdatomic.h>

#include <utils/Atomic.h>

#include <utils/misc.h>

#include <utils/misc.h>

#include <binder/BpBinder.h>

#include <binder/BpBinder.h>

#include <binder/IInterface.h>

#include <binder/IInterface.h>
@@ -71,8 +71,8 @@ public: 
// ---------------------------------------------------------------------------

// ---------------------------------------------------------------------------





BBinder::BBinder()

BBinder::BBinder()

    : mExtras(NULL)

{

{

    atomic_init(&mExtras, 0);

}

}





bool BBinder::isBinderAlive() const

bool BBinder::isBinderAlive() const
@@ -139,19 +139,19 @@ void BBinder::attachObject( 
    const void* objectID, void* object, void* cleanupCookie,

    const void* objectID, void* object, void* cleanupCookie,

    object_cleanup_func func)

    object_cleanup_func func)

{

{

    Extras* e = reinterpret_cast<Extras*>(

    Extras* e = mExtras;

                    atomic_load_explicit(&mExtras, memory_order_acquire));





    if (!e) {

    if (!e) {

        e = new Extras;

        e = new Extras;

        uintptr_t* expected = 0;

#ifdef __LP64__

        if (!atomic_compare_exchange_strong_explicit(

        if (android_atomic_release_cas64(0, reinterpret_cast<int64_t>(e),

                                        &mExtras, &expected,

                reinterpret_cast<volatile int64_t*>(&mExtras)) != 0) {

                                        reinterpret_cast<uintptr_t>(e),

#else

                                        memory_order_release,

        if (android_atomic_cmpxchg(0, reinterpret_cast<int32_t>(e),

                                        memory_order_acquire)) {

                reinterpret_cast<volatile int32_t*>(&mExtras)) != 0) {

#endif

            delete e;

            delete e;

            e = reinterpret_cast<Extras*>(expected);  // Filled in by CAS

            e = mExtras;

        }

        }

        if (e == 0) return; // out of memory

        if (e == 0) return; // out of memory

    }

    }
@@ -162,8 +162,7 @@ void BBinder::attachObject( 




void* BBinder::findObject(const void* objectID) const

void* BBinder::findObject(const void* objectID) const

{

{

    Extras* e = reinterpret_cast<Extras*>(

    Extras* e = mExtras;

                    atomic_load_explicit(&mExtras, memory_order_acquire));

    if (!e) return NULL;

    if (!e) return NULL;





    AutoMutex _l(e->mLock);

    AutoMutex _l(e->mLock);
@@ -172,8 +171,7 @@ void* BBinder::findObject(const void* objectID) const 




void BBinder::detachObject(const void* objectID)

void BBinder::detachObject(const void* objectID)

{

{

    Extras* e = reinterpret_cast<Extras*>(

    Extras* e = mExtras;

                    atomic_load_explicit(&mExtras, memory_order_acquire));

    if (!e) return;

    if (!e) return;





    AutoMutex _l(e->mLock);

    AutoMutex _l(e->mLock);
@@ -187,9 +185,7 @@ BBinder* BBinder::localBinder() 




BBinder::~BBinder()

BBinder::~BBinder()

{

{

    Extras* e = reinterpret_cast<Extras*>(

    if (mExtras) delete mExtras;

                    atomic_load_explicit(&mExtras, memory_order_relaxed));

    if (e) delete e;

}

}