diff options
| author | Andy McFadden <fadden@android.com> | 2012-11-09 22:45:13 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-09 22:45:13 -0800 |
| commit | 41f7736ad1e72df8796416a82ce3cede6193d1eb (patch) | |
| tree | c28bab3111037060f097a01ea4db127678dc1f90 | |
| parent | 77622879a6a12c6cb916df46c919dde87656e6df (diff) | |
| parent | 434e21bfd6b14f8d99b9bcdb829e7252edd574f3 (diff) | |
| download | frameworks_native-41f7736ad1e72df8796416a82ce3cede6193d1eb.zip frameworks_native-41f7736ad1e72df8796416a82ce3cede6193d1eb.tar.gz frameworks_native-41f7736ad1e72df8796416a82ce3cede6193d1eb.tar.bz2 | |
am 434e21bf: am 3fdeb48e: Reduce emulator logspam
* commit '434e21bfd6b14f8d99b9bcdb829e7252edd574f3':
Reduce emulator logspam
| -rw-r--r-- | include/utils/Trace.h | 2 | ||||
| -rw-r--r-- | libs/utils/Trace.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/utils/Trace.h b/include/utils/Trace.h index 93e2285..41bce00 100644 --- a/include/utils/Trace.h +++ b/include/utils/Trace.h @@ -54,6 +54,8 @@ #define ATRACE_TAG_CAMERA (1<<10) #define ATRACE_TAG_LAST ATRACE_TAG_CAMERA +#define ATRACE_TAG_NOT_READY (1LL<<63) // Reserved for use during init + #define ATRACE_TAG_VALID_MASK ((ATRACE_TAG_LAST - 1) | ATRACE_TAG_LAST) #ifndef ATRACE_TAG diff --git a/libs/utils/Trace.cpp b/libs/utils/Trace.cpp index 5cd5731..f5aaea3 100644 --- a/libs/utils/Trace.cpp +++ b/libs/utils/Trace.cpp @@ -25,7 +25,7 @@ namespace android { volatile int32_t Tracer::sIsReady = 0; int Tracer::sTraceFD = -1; -uint64_t Tracer::sEnabledTags = 0; +uint64_t Tracer::sEnabledTags = ATRACE_TAG_NOT_READY; Mutex Tracer::sMutex; void Tracer::changeCallback() { @@ -46,7 +46,7 @@ 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 + sEnabledTags = 0; // no tracing can occur } else { loadSystemProperty(); } |