openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

am: c50d19c0b0

Change-Id: I55076549651d386ed7bdfab8ec05061049735271
This commit is contained in:
Paul Crowley 2018-02-08 17:35:14 +00:00 committed by android-build-merger
parent 6edfca6e3b c50d19c0b0
commit 33d3758684
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libcutils/trace-dev.cpp
View File

@ -25,7 +25,6 @@ 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();
}
@ -35,17 +34,18 @@ static void atrace_init_once()
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)