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

Commit a16facc2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "trace-container: Check /sys/kernel/tracing for tracefs" am: 1ac1d86b... 

Merge "trace-container: Check /sys/kernel/tracing for tracefs" am: 1ac1d86b am: 0b9ed14c am: cb22a67a

Change-Id: I1ecc90f8ea32703a52a0e32bd9ea7b6a57eb6647
parents 64e6f253 cb22a67a

libcutils/trace-container.cpp

+21 −17
Original line number Original line Diff line number Diff line
@@ -87,6 +87,9 @@ void atrace_set_tracing_enabled(bool enabled) 




static void atrace_init_once()

static void atrace_init_once()

{

{

    atrace_marker_fd = open("/sys/kernel/tracing/trace_marker", O_WRONLY | O_CLOEXEC);

    if (atrace_marker_fd < 0) {

        // try debugfs

        atrace_marker_fd = open("/sys/kernel/debug/tracing/trace_marker", O_WRONLY | O_CLOEXEC);

        atrace_marker_fd = open("/sys/kernel/debug/tracing/trace_marker", O_WRONLY | O_CLOEXEC);

        if (atrace_marker_fd < 0) {

        if (atrace_marker_fd < 0) {

            // We're in container, ftrace may be disabled. In such case, we use the

            // We're in container, ftrace may be disabled. In such case, we use the
@@ -107,6 +110,7 @@ static void atrace_init_once() 
                goto done;

                goto done;

            }

            }

        }

        }

    }

    atrace_enabled_tags = atrace_get_property();

    atrace_enabled_tags = atrace_get_property();





done:

done: