Merge "Don't initialize atrace if it's already disabled." am: 0e239bbd8b am: 2fc40a6518

am: 65c685e204

Change-Id: I1ab9cff70cd461069f2db651ab96f449aae4666e
This commit is contained in:
Paul Crowley 2018-01-30 22:14:34 +00:00 committed by android-build-merger
commit 8645dd1204
1 changed files with 6 additions and 6 deletions

View File

@ -25,6 +25,7 @@ static pthread_once_t atrace_once_control = PTHREAD_ONCE_INIT;
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();
}
@ -34,18 +35,17 @@ static void atrace_init_once()
if (atrace_marker_fd == -1) {
ALOGE("Error opening trace file: %s (%d)", strerror(errno), errno);
atrace_enabled_tags = 0;
goto done;
return;
}
atrace_enabled_tags = atrace_get_property();
done:
atomic_store_explicit(&atrace_is_ready, true, memory_order_release);
}
void atrace_setup()
{
pthread_once(&atrace_once_control, atrace_init_once);
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);
}
void atrace_begin_body(const char* name)