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

Commit 7673c4dc authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Hide warning in cutils/trace.h" am: 5cf3db6d am: a802e570 

am: 06ec4b13

Change-Id: If41d5b551ffe237922f4768cf403cadf7ee15887
parents e84c07c8 06ec4b13

include/cutils/trace.h

+2 −2
Original line number Diff line number Diff line
@@ -189,8 +189,8 @@ 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))) {

        char c = 'E';

        write(atrace_marker_fd, &c, 1);

        void atrace_end_body();

        atrace_end_body();

    }

}

libcutils/trace-dev.c

+6 −0
Original line number Diff line number Diff line
@@ -196,6 +196,12 @@ void atrace_begin_body(const char* name) 
    write(atrace_marker_fd, buf, len);

}



void atrace_end_body()

{

    char c = 'E';

    write(atrace_marker_fd, &c, 1);

}



#define WRITE_MSG(format_begin, format_end, pid, name, value) { \

    char buf[ATRACE_MESSAGE_LENGTH]; \

    int len = snprintf(buf, sizeof(buf), format_begin "%s" format_end, pid, \

libcutils/trace-host.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ void atrace_set_tracing_enabled(bool enabled __unused) { } 
void atrace_update_tags() { }

void atrace_setup() { }

void atrace_begin_body(const char* name __unused) { }

void atrace_end_body() { }

void atrace_async_begin_body(const char* name __unused, int32_t cookie __unused) { }

void atrace_async_end_body(const char* name __unused, int32_t cookie __unused) { }

void atrace_int_body(const char* name __unused, int32_t value __unused) { }