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

Commit 18feb083 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libcutils must check /sys/kernel/tracing for tracefs first" am: 7259edac am: 2ae99763 

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

Change-Id: I3330a25da008ccabc396d14f75da7172391ba539
parents 88693877 2ae99763

libcutils/trace-dev.cpp

+2 −2
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ void atrace_set_tracing_enabled(bool enabled) 


static void atrace_init_once()

{

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

    if (atrace_marker_fd == -1) {

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

    if (atrace_marker_fd == -1) {

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

    }



    if (atrace_marker_fd == -1) {