From 45b80c69ad8057fde0c0a76f7da3a2183a2aab96 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Fri, 9 Mar 2012 14:46:01 -0800 Subject: Expose the set of enabled tags. This is used by the Java trace wrappers to avoid JNI overhead when trace tags are disabled. Also added a new tag for the input subsystem and view hierarchy. Change-Id: Ia04a507e42a37b1d3bbb19859e6c07a92f4fe9aa --- libs/utils/Trace.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libs/utils/Trace.cpp') diff --git a/libs/utils/Trace.cpp b/libs/utils/Trace.cpp index c49278ae45..d5322967ad 100644 --- a/libs/utils/Trace.cpp +++ b/libs/utils/Trace.cpp @@ -34,10 +34,12 @@ void Tracer::init() { sTraceFD = open(traceFileName, O_WRONLY); if (sTraceFD == -1) { ALOGE("error opening trace file: %s (%d)", strerror(errno), errno); + // sEnabledTags remains zero indicating that no tracing can occur } else { char value[PROPERTY_VALUE_MAX]; property_get("atrace.tags.enableflags", value, "0"); - sEnabledTags = strtoll(value, NULL, 0) | ATRACE_TAG_ALWAYS; + sEnabledTags = (strtoll(value, NULL, 0) & ATRACE_TAG_VALID_MASK) + | ATRACE_TAG_ALWAYS; } android_atomic_release_store(1, &sIsReady); -- cgit v1.2.3-59-g8ed1b