commit b7474a2d5a055810e4f13c2be1199c9792fa9ecd
author Paul Crowley <paulcrowley@google.com> Thu Feb 08 17:35:14 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 08 17:35:14 2018 +0000
tree 17210d6fd4acf236109ef84994159443dddf180c
parent 22e9481ce7756a99a21982c9294d300da166b0ef
parent 049c6d001908903e05e1308567e897225fb58c8f

Merge "Revert "Don't initialize atrace if it's already disabled.""
am: c50d19c0b0

Change-Id: I55076549651d386ed7bdfab8ec05061049735271

libcutils/trace-dev.cpp

diff --git a/libcutils/trace-dev.cpp b/libcutils/trace-dev.cpp
index 27255c2..4da8215 100644
--- a/libcutils/trace-dev.cpp
+++ b/libcutils/trace-dev.cpp
@@ -25,7 +25,6 @@
 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();
 }
 
@@ -35,17 +34,18 @@
     if (atrace_marker_fd == -1) {
         ALOGE("Error opening trace file: %s (%d)", strerror(errno), errno);
         atrace_enabled_tags = 0;
-        return;
+        goto done;
     }
+
     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);
+    pthread_once(&atrace_once_control, atrace_init_once);
 }
 
 void atrace_begin_body(const char* name)