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

Commit e70fff33 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Make atrace_*_body explicitly a part of API." am: 6ecea169 am: b9ee39cb am: b8d0423f 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2645719



Change-Id: I4ae1d3c5cc29f792033aa722b81181b70394c553
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 649a6238 b8d0423f

libcutils/include/cutils/trace.h

+30 −10
Original line number Diff line number Diff line
@@ -89,6 +89,36 @@ __BEGIN_DECLS 
#error ATRACE_TAG must be defined to be one of the tags defined in cutils/trace.h

#endif



/** Internal implementation detail. Do not use. */

void atrace_begin_body(const char*);



/** Internal implementation detail. Do not use. */

void atrace_end_body();



/** Internal implementation detail. Do not use. */

void atrace_async_begin_body(const char*, int32_t);



/** Internal implementation detail. Do not use. */

void atrace_async_end_body(const char*, int32_t);



/** Internal implementation detail. Do not use. */

void atrace_async_for_track_begin_body(const char*, const char*, int32_t);



/** Internal implementation detail. Do not use. */

void atrace_async_for_track_end_body(const char*, int32_t);



/** Internal implementation detail. Do not use. */

void atrace_instant_body(const char*);



/** Internal implementation detail. Do not use. */

void atrace_instant_for_track_body(const char*, const char*);



/** Internal implementation detail. Do not use. */

void atrace_int_body(const char*, int32_t);



/** Internal implementation detail. Do not use. */

void atrace_int64_body(const char*, int64_t);



/**

 * Opens the trace file for writing and reads the property for initial tags.

 * The atrace.tags.enableflags property sets the tags to trace.
@@ -159,7 +189,6 @@ static inline uint64_t atrace_is_tag_enabled(uint64_t tag) 
static inline void atrace_begin(uint64_t tag, const char* name)

{

    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {

        void atrace_begin_body(const char*);

        atrace_begin_body(name);

    }

}
@@ -172,7 +201,6 @@ static inline void atrace_begin(uint64_t tag, const char* name) 
static inline void atrace_end(uint64_t tag)

{

    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {

        void atrace_end_body();

        atrace_end_body();

    }

}
@@ -190,7 +218,6 @@ static inline void atrace_async_begin(uint64_t tag, const char* name, 
        int32_t cookie)

{

    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {

        void atrace_async_begin_body(const char*, int32_t);

        atrace_async_begin_body(name, cookie);

    }

}
@@ -203,7 +230,6 @@ static inline void atrace_async_begin(uint64_t tag, const char* name, 
static inline void atrace_async_end(uint64_t tag, const char* name, int32_t cookie)

{

    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {

        void atrace_async_end_body(const char*, int32_t);

        atrace_async_end_body(name, cookie);

    }

}
@@ -221,7 +247,6 @@ static inline void atrace_async_end(uint64_t tag, const char* name, int32_t cook 
static inline void atrace_async_for_track_begin(uint64_t tag, const char* track_name,

                                                const char* name, int32_t cookie) {

    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {

        void atrace_async_for_track_begin_body(const char*, const char*, int32_t);

        atrace_async_for_track_begin_body(track_name, name, cookie);

    }

}
@@ -235,7 +260,6 @@ static inline void atrace_async_for_track_begin(uint64_t tag, const char* track_ 
static inline void atrace_async_for_track_end(uint64_t tag, const char* track_name,

                                              int32_t cookie) {

    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {

        void atrace_async_for_track_end_body(const char*, int32_t);

        atrace_async_for_track_end_body(track_name, cookie);

    }

}
@@ -252,7 +276,6 @@ static inline void atrace_async_for_track_end(uint64_t tag, const char* track_na 
#define ATRACE_INSTANT(name) atrace_instant(ATRACE_TAG, name)

static inline void atrace_instant(uint64_t tag, const char* name) {

    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {

        void atrace_instant_body(const char*);

        atrace_instant_body(name);

    }

}
@@ -269,7 +292,6 @@ static inline void atrace_instant(uint64_t tag, const char* name) { 
static inline void atrace_instant_for_track(uint64_t tag, const char* track_name,

                                            const char* name) {

    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {

        void atrace_instant_for_track_body(const char*, const char*);

        atrace_instant_for_track_body(track_name, name);

    }

}
@@ -282,7 +304,6 @@ static inline void atrace_instant_for_track(uint64_t tag, const char* track_name 
static inline void atrace_int(uint64_t tag, const char* name, int32_t value)

{

    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {

        void atrace_int_body(const char*, int32_t);

        atrace_int_body(name, value);

    }

}
@@ -295,7 +316,6 @@ static inline void atrace_int(uint64_t tag, const char* name, int32_t value) 
static inline void atrace_int64(uint64_t tag, const char* name, int64_t value)

{

    if (CC_UNLIKELY(atrace_is_tag_enabled(tag))) {

        void atrace_int64_body(const char*, int64_t);

        atrace_int64_body(name, value);

    }

}

libcutils/trace-host.cpp

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ atomic_bool atrace_is_ready = ATOMIC_VAR_INIT(true); 
int                     atrace_marker_fd     = -1;

uint64_t                atrace_enabled_tags  = 0;



void atrace_set_debuggable(bool /*debuggable*/) {}

void atrace_set_tracing_enabled(bool /*enabled*/) {}

void atrace_update_tags() { }

void atrace_setup() { }