commit 4cd3550d50cb14efe3d86ab9732ce75def5b85bd
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 30 01:17:47 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 30 01:17:47 2018 +0000
tree 42e8d4bf48c35810a65a428f2ccf7d917e0e5d01
parent 4a0797c9d6b7c335b2baf63468ad3f63fc5e2533
parent 2cb5f7f578ec682c2bf628f29ffe21de8ccbc917

Merge "Move static variable out of should_trace()."

libc/bionic/bionic_systrace.cpp

diff --git a/libc/bionic/bionic_systrace.cpp b/libc/bionic/bionic_systrace.cpp
index 970a92b..bac3d88 100644
--- a/libc/bionic/bionic_systrace.cpp
+++ b/libc/bionic/bionic_systrace.cpp
@@ -29,12 +29,11 @@
 #define WRITE_OFFSET   32
 
 static Lock g_lock;
+static CachedProperty g_debug_atrace_tags_enableflags("debug.atrace.tags.enableflags");
+static uint64_t g_tags;
 static int g_trace_marker_fd = -1;
 
 static bool should_trace() {
-  static CachedProperty g_debug_atrace_tags_enableflags("debug.atrace.tags.enableflags");
-  static uint64_t g_tags;
-
   g_lock.lock();
   if (g_debug_atrace_tags_enableflags.DidChange()) {
     g_tags = strtoull(g_debug_atrace_tags_enableflags.Get(), nullptr, 0);