Merge "bionic: Check /sys/kernel/tracing for tracefs" am: 4537cf868b

Change-Id: I9e6c830c330d1e023d1969a8158d84e42b3d473e
This commit is contained in:
Automerger Merge Worker 2020-02-10 16:56:08 +00:00
commit 657cfdd14b

View file

@ -46,7 +46,10 @@ static bool should_trace() {
static int get_trace_marker_fd() {
g_lock.lock();
if (g_trace_marker_fd == -1) {
g_trace_marker_fd = open("/sys/kernel/debug/tracing/trace_marker", O_CLOEXEC | O_WRONLY);
g_trace_marker_fd = open("/sys/kernel/tracing/trace_marker", O_CLOEXEC | O_WRONLY);
if (g_trace_marker_fd == -1) {
g_trace_marker_fd = open("/sys/kernel/debug/tracing/trace_marker", O_CLOEXEC | O_WRONLY);
}
}
g_lock.unlock();
return g_trace_marker_fd;