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

Commit e1844235 authored by Paul Crowley's avatar Paul Crowley
Browse files

Don't initialize atrace if it's already disabled. 

For processes that start very early, atrace initialization can cause
an selinux denial, so make sure it's possible to disable it and avoid
the call to open "trace_marker".

Bug: 63927601
Test: disable atrace early in vold, ensure that selinux denial is
avoided.

Change-Id: I2422e6d0db323bc13c6d6ed1896435151fca21f7
parent 01ba1157

libcutils/trace-dev.cpp

+6 −6
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ static pthread_once_t atrace_once_control = PTHREAD_ONCE_INIT; 
void atrace_set_tracing_enabled(bool enabled)

{

    atomic_store_explicit(&atrace_is_enabled, enabled, memory_order_release);

    atomic_store_explicit(&atrace_is_ready, false, memory_order_release);

    atrace_update_tags();

}
@@ -34,19 +35,18 @@ static void atrace_init_once() 
    if (atrace_marker_fd == -1) {

        ALOGE("Error opening trace file: %s (%d)", strerror(errno), errno);

        atrace_enabled_tags = 0;

        goto done;

        return;

    }



    atrace_enabled_tags = atrace_get_property();



done:

    atomic_store_explicit(&atrace_is_ready, true, memory_order_release);

}



void atrace_setup()

{

    if (atomic_load_explicit(&atrace_is_enabled, memory_order_acquire)) {

        pthread_once(&atrace_once_control, atrace_init_once);

    }

    atomic_store_explicit(&atrace_is_ready, true, memory_order_release);

}



void atrace_begin_body(const char* name)

{