ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

am 434e21bf: am 3fdeb48e: Reduce emulator logspam

Browse Source 
* commit '434e21bfd6b14f8d99b9bcdb829e7252edd574f3':
  Reduce emulator logspam
This commit is contained in:
Andy McFadden 2012-11-09 22:45:13 -08:00 committed by Android Git Automerger
commit 41f7736ad1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/utils/Trace.h
View File

@ -54,6 +54,8 @@
#define ATRACE_TAG_CAMERA (1<<10) #define ATRACE_TAG_CAMERA (1<<10)
#define ATRACE_TAG_LAST ATRACE_TAG_CAMERA #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) #define ATRACE_TAG_VALID_MASK ((ATRACE_TAG_LAST - 1) | ATRACE_TAG_LAST)
#ifndef ATRACE_TAG #ifndef ATRACE_TAG

4
libs/utils/Trace.cpp
View File

@ -25,7 +25,7 @@ namespace android {
volatile int32_t Tracer::sIsReady = 0; volatile int32_t Tracer::sIsReady = 0;
int Tracer::sTraceFD = -1; int Tracer::sTraceFD = -1;
uint64_t Tracer::sEnabledTags = 0; uint64_t Tracer::sEnabledTags = ATRACE_TAG_NOT_READY;
Mutex Tracer::sMutex; Mutex Tracer::sMutex;
void Tracer::changeCallback() { void Tracer::changeCallback() {
@ -46,7 +46,7 @@ void Tracer::init() {
sTraceFD = open(traceFileName, O_WRONLY); sTraceFD = open(traceFileName, O_WRONLY);
if (sTraceFD == -1) { if (sTraceFD == -1) {
ALOGE("error opening trace file: %s (%d)", strerror(errno), errno); 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 { } else {
loadSystemProperty(); loadSystemProperty();
} }