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

Commit 0e69160e authored by Christopher Ferris's avatar Christopher Ferris
Browse files

Remove include/backtrace symlink. 

This requires a few other changes to support building libutils
properly. It does appear the windows versions of libutils is
referencing CallStack code, but it doesn't seem to cause any problems.
However, I removed those references completely for the windows build.

Also removed a few extra spaces that seem to have accumulated in the
RefBase.cpp.

Bug: 170465278

Test: Builds and libutils unit tests pass.
Change-Id: Ibeee7791b13636b34bdd592c5420fd91620f752a
parent 862b0174

include/backtrace

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../libbacktrace/include/backtrace
 
 No newline at end of file

libutils/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -43,7 +43,13 @@ cc_library_headers { 
            header_libs: ["libbacktrace_headers"],

            export_header_lib_headers: ["libbacktrace_headers"],

        },

        linux_glibc: {

            header_libs: ["libbacktrace_headers"],

            export_header_lib_headers: ["libbacktrace_headers"],

        },

        linux_bionic: {

            header_libs: ["libbacktrace_headers"],

            export_header_lib_headers: ["libbacktrace_headers"],

            enabled: true,

        },

        windows: {

libutils/RefBase.cpp

+33 −16
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ 


#include <android-base/macros.h>



#include <utils/RefBase.h>

#include <log/log.h>



#include <utils/CallStack.h>

#include <utils/RefBase.h>



#include <utils/Mutex.h>
@@ -55,6 +55,17 @@ 
// case.

#define DEBUG_REFBASE_DESTRUCTION 1



#if !defined(_WIN32)

// CallStack is only supported on linux type platforms.

#define CALLSTACK_ENABLED 1

#else

#define CALLSTACK_ENABLED 0

#endif



#if CALLSTACK_ENABLED

#include <utils/CallStack.h>

#endif



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



namespace android {
@@ -196,7 +207,7 @@ public: 
            while (refs) {

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

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

#if DEBUG_REFS_CALLSTACK_ENABLED

#if DEBUG_REFS_CALLSTACK_ENABLED && CALLSTACK_ENABLED

                CallStack::logStack(LOG_TAG, refs->stack.get());

#endif

                refs = refs->next;
@@ -210,7 +221,7 @@ public: 
            while (refs) {

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

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

#if DEBUG_REFS_CALLSTACK_ENABLED

#if DEBUG_REFS_CALLSTACK_ENABLED && CALLSTACK_ENABLED

                CallStack::logStack(LOG_TAG, refs->stack.get());

#endif

                refs = refs->next;
@@ -218,7 +229,9 @@ public: 
        }

        if (dumpStack) {

            ALOGE("above errors at:");

#if CALLSTACK_ENABLED

            CallStack::logStack(LOG_TAG);

#endif

        }

    }
@@ -261,8 +274,7 @@ public: 
        renameRefsId(mWeakRefs, old_id, new_id);

    }



    void trackMe(bool track, bool retain)

    { 

    void trackMe(bool track, bool retain) {

        mTrackEnabled = track;

        mRetain = retain;

    }
@@ -306,7 +318,7 @@ private: 
    {

        ref_entry* next;

        const void* id;

#if DEBUG_REFS_CALLSTACK_ENABLED

#if DEBUG_REFS_CALLSTACK_ENABLED && CALLSTACK_ENABLED

        CallStack::CallStackUPtr stack;

#endif

        int32_t ref;
@@ -323,7 +335,7 @@ private: 
            // decrement the reference count.

            ref->ref = mRef;

            ref->id = id;

#if DEBUG_REFS_CALLSTACK_ENABLED

#if DEBUG_REFS_CALLSTACK_ENABLED && CALLSTACK_ENABLED

            ref->stack = CallStack::getCurrent(2);

#endif

            ref->next = *refs;
@@ -359,7 +371,9 @@ private: 
                ref = ref->next;

            }



#if CALLSTACK_ENABLED

            CallStack::logStack(LOG_TAG);

#endif

        }

    }
@@ -385,7 +399,7 @@ private: 
            snprintf(buf, sizeof(buf), "\t%c ID %p (ref %d):\n",

                     inc, refs->id, refs->ref);

            out->append(buf);

#if DEBUG_REFS_CALLSTACK_ENABLED

#if DEBUG_REFS_CALLSTACK_ENABLED && CALLSTACK_ENABLED

            out->append(CallStack::stackToString("\t\t", refs->stack.get()));

#else

            out->append("\t\t(call stacks disabled)");
@@ -719,7 +733,10 @@ RefBase::~RefBase() 
        // Treating this as fatal is prone to causing boot loops. For debugging, it's

        // better to treat as non-fatal.

        ALOGD("RefBase: Explicit destruction, weak count = %d (in %p)", mRefs->mWeak.load(), this);



#if CALLSTACK_ENABLED

        CallStack::logStack(LOG_TAG);

#endif

#else

        LOG_ALWAYS_FATAL("RefBase: Explicit destruction, weak count = %d", mRefs->mWeak.load());

#endif