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

Commit 734db07e authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "Fix sp<> conversion operator / constructor"

parents 4476cd07 32bebb0a

include/utils/StrongPointer.h

+3 −3
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ sp<T>::sp(const sp<T>& other) 
template<typename T> template<typename U>

sp<T>::sp(U* other) : m_ptr(other)

{

    if (other) other->incStrong(this);

    if (other) ((T*)other)->incStrong(this);

}



template<typename T> template<typename U>
@@ -170,7 +170,7 @@ sp<T>& sp<T>::operator = (T* other) 
template<typename T> template<typename U>

sp<T>& sp<T>::operator = (const sp<U>& other)

{

    U* otherPtr(other.m_ptr);

    T* otherPtr(other.m_ptr);

    if (otherPtr) otherPtr->incStrong(this);

    if (m_ptr) m_ptr->decStrong(this);

    m_ptr = otherPtr;
@@ -180,7 +180,7 @@ sp<T>& sp<T>::operator = (const sp<U>& other) 
template<typename T> template<typename U>

sp<T>& sp<T>::operator = (U* other)

{

    if (other) other->incStrong(this);

    if (other) ((T*)other)->incStrong(this);

    if (m_ptr) m_ptr->decStrong(this);

    m_ptr = other;

    return *this;

libs/utils/RefBase.cpp

+30 −4
Original line number Diff line number Diff line
@@ -99,20 +99,38 @@ public: 
#if DEBUG_REFS_FATAL_SANITY_CHECKS

            LOG_ALWAYS_FATAL("Strong references remain!");

#else

            LOGE("Strong references remain!");

            LOGE("Strong references remain:");

#endif

            ref_entry* refs = mStrongRefs;

            while (refs) {

                char inc = refs->ref >= 0 ? '+' : '-';

                LOGD("\t%c ID %p (ref %d):", inc, refs->id, refs->ref);

#if DEBUG_REFS_CALLSTACK_ENABLED

                refs->stack.dump();

#endif;

                refs = refs->next;

            }

        }



        if (!mRetain && mWeakRefs != NULL) {

            dumpStack = true;

#if DEBUG_REFS_FATAL_SANITY_CHECKS

            LOG_ALWAYS_FATAL("Weak references remain!");

            LOG_ALWAYS_FATAL("Weak references remain:");

#else

            LOGE("Weak references remain!");

#endif

            ref_entry* refs = mWeakRefs;

            while (refs) {

                char inc = refs->ref >= 0 ? '+' : '-';

                LOGD("\t%c ID %p (ref %d):", inc, refs->id, refs->ref);

#if DEBUG_REFS_CALLSTACK_ENABLED

                refs->stack.dump();

#endif;

                refs = refs->next;

            }

        }



        if (dumpStack) {

            LOGE("above errors at:");

            CallStack stack;

            stack.update();

            stack.dump();
@@ -228,7 +246,8 @@ private: 
        if (mTrackEnabled) {

            AutoMutex _l(mMutex);

            

            ref_entry* ref = *refs;

            ref_entry* const head = *refs;

            ref_entry* ref = head;

            while (ref != NULL) {

                if (ref->id == id) {

                    *refs = ref->next;
@@ -249,6 +268,13 @@ private: 
                    "(weakref_type %p) that doesn't exist!",

                    id, mBase, this);



            ref = head;

            while (ref) {

                char inc = ref->ref >= 0 ? '+' : '-';

                LOGD("\t%c ID %p (ref %d):", inc, ref->id, ref->ref);

                ref = ref->next;

            }



            CallStack stack;

            stack.update();

            stack.dump();