diff --git a/include/utils/Trace.h b/include/utils/Trace.h index 41bce0095..940aec1ce 100644 --- a/include/utils/Trace.h +++ b/include/utils/Trace.h @@ -27,42 +27,9 @@ #include #include +#include -// The ATRACE_TAG macro can be defined before including this header to trace -// using one of the tags defined below. It must be defined to one of the -// following ATRACE_TAG_* macros. The trace tag is used to filter tracing in -// userland to avoid some of the runtime cost of tracing when it is not desired. -// -// Defining ATRACE_TAG to be ATRACE_TAG_ALWAYS will result in the tracing always -// being enabled - this should ONLY be done for debug code, as userland tracing -// has a performance cost even when the trace is not being recorded. Defining -// ATRACE_TAG to be ATRACE_TAG_NEVER or leaving ATRACE_TAG undefined will result -// in the tracing always being disabled. -// -// These tags must be kept in sync with frameworks/base/core/java/android/os/Trace.java. -#define ATRACE_TAG_NEVER 0 // The "never" tag is never enabled. -#define ATRACE_TAG_ALWAYS (1<<0) // The "always" tag is always enabled. -#define ATRACE_TAG_GRAPHICS (1<<1) -#define ATRACE_TAG_INPUT (1<<2) -#define ATRACE_TAG_VIEW (1<<3) -#define ATRACE_TAG_WEBVIEW (1<<4) -#define ATRACE_TAG_WINDOW_MANAGER (1<<5) -#define ATRACE_TAG_ACTIVITY_MANAGER (1<<6) -#define ATRACE_TAG_SYNC_MANAGER (1<<7) -#define ATRACE_TAG_AUDIO (1<<8) -#define ATRACE_TAG_VIDEO (1<<9) -#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 -#define ATRACE_TAG ATRACE_TAG_NEVER -#elif ATRACE_TAG > ATRACE_TAG_LAST -#error ATRACE_TAG must be defined to be one of the tags defined in utils/Trace.h -#endif +// See for more ATRACE_* macros. // ATRACE_CALL traces the beginning and end of the current function. To trace // the correct start and end times this macro should be the first line of the @@ -74,119 +41,20 @@ // function body. #define ATRACE_NAME(name) android::ScopedTrace ___tracer(ATRACE_TAG, name) -// ATRACE_INT traces a named integer value. This can be used to track how the -// value changes over time in a trace. -#define ATRACE_INT(name, value) android::Tracer::traceCounter(ATRACE_TAG, name, value) - -// ATRACE_ENABLED returns true if the trace tag is enabled. It can be used as a -// guard condition around more expensive trace calculations. -#define ATRACE_ENABLED() android::Tracer::isTagEnabled(ATRACE_TAG) - namespace android { -class Tracer { - -public: - - static uint64_t getEnabledTags() { - initIfNeeded(); - return sEnabledTags; - } - - static inline bool isTagEnabled(uint64_t tag) { - initIfNeeded(); - return sEnabledTags & tag; - } - - static inline void traceCounter(uint64_t tag, const char* name, - int32_t value) { - if (CC_UNLIKELY(isTagEnabled(tag))) { - char buf[1024]; - snprintf(buf, 1024, "C|%d|%s|%d", getpid(), name, value); - write(sTraceFD, buf, strlen(buf)); - } - } - - static inline void traceBegin(uint64_t tag, const char* name) { - if (CC_UNLIKELY(isTagEnabled(tag))) { - char buf[1024]; - size_t len = snprintf(buf, 1024, "B|%d|%s", getpid(), name); - write(sTraceFD, buf, len); - } - } - - static inline void traceEnd(uint64_t tag) { - if (CC_UNLIKELY(isTagEnabled(tag))) { - char buf = 'E'; - write(sTraceFD, &buf, 1); - } - } - -private: - - static inline void initIfNeeded() { - if (!android_atomic_acquire_load(&sIsReady)) { - init(); - } - } - - static void changeCallback(); - - // init opens the trace marker file for writing and reads the - // atrace.tags.enableflags system property. It does this only the first - // time it is run, using sMutex for synchronization. - static void init(); - - // retrieve the current value of the system property. - static void loadSystemProperty(); - - // sIsReady is a boolean value indicating whether a call to init() has - // completed in this process. It is initialized to 0 and set to 1 when the - // first init() call completes. It is set to 1 even if a failure occurred - // in init (e.g. the trace marker file couldn't be opened). - // - // This should be checked by all tracing functions using an atomic acquire - // load operation before calling init(). This check avoids the need to lock - // a mutex each time a trace function gets called. - static volatile int32_t sIsReady; - - // sTraceFD is the file descriptor used to write to the kernel's trace - // buffer. It is initialized to -1 and set to an open file descriptor in - // init() while a lock on sMutex is held. - // - // This should only be used by a trace function after init() has - // successfully completed. - static int sTraceFD; - - // sEnabledTags is the set of tag bits for which tracing is currently - // enabled. It is initialized to 0 and set based on the - // atrace.tags.enableflags system property in init() while a lock on sMutex - // is held. - // - // This should only be used by a trace function after init() has - // successfully completed. - // - // This value is only ever non-zero when tracing is initialized and sTraceFD is not -1. - static uint64_t sEnabledTags; - - // sMutex is used to protect the execution of init(). - static Mutex sMutex; -}; - class ScopedTrace { - public: - inline ScopedTrace(uint64_t tag, const char* name) : - mTag(tag) { - Tracer::traceBegin(mTag, name); - } +inline ScopedTrace(uint64_t tag, const char* name) + : mTag(tag) { + atrace_begin(mTag,name); +} - inline ~ScopedTrace() { - Tracer::traceEnd(mTag); - } +inline ~ScopedTrace() { + atrace_end(mTag); +} private: - uint64_t mTag; }; diff --git a/libs/utils/Trace.cpp b/libs/utils/Trace.cpp index f5aaea322..d4f02187f 100644 --- a/libs/utils/Trace.cpp +++ b/libs/utils/Trace.cpp @@ -14,52 +14,12 @@ * limitations under the License. */ -#define LOG_TAG "Trace" - -#include -#include -#include #include +#include -namespace android { +static void traceInit() __attribute__((constructor)); -volatile int32_t Tracer::sIsReady = 0; -int Tracer::sTraceFD = -1; -uint64_t Tracer::sEnabledTags = ATRACE_TAG_NOT_READY; -Mutex Tracer::sMutex; - -void Tracer::changeCallback() { - Mutex::Autolock lock(sMutex); - if (sIsReady && sTraceFD >= 0) { - loadSystemProperty(); - } +static void traceInit() +{ + android::add_sysprop_change_callback(atrace_update_tags, 0); } - -void Tracer::init() { - Mutex::Autolock lock(sMutex); - - if (!sIsReady) { - add_sysprop_change_callback(changeCallback, 0); - - const char* const traceFileName = - "/sys/kernel/debug/tracing/trace_marker"; - sTraceFD = open(traceFileName, O_WRONLY); - if (sTraceFD == -1) { - ALOGE("error opening trace file: %s (%d)", strerror(errno), errno); - sEnabledTags = 0; // no tracing can occur - } else { - loadSystemProperty(); - } - - android_atomic_release_store(1, &sIsReady); - } -} - -void Tracer::loadSystemProperty() { - char value[PROPERTY_VALUE_MAX]; - property_get("debug.atrace.tags.enableflags", value, "0"); - sEnabledTags = (strtoll(value, NULL, 0) & ATRACE_TAG_VALID_MASK) - | ATRACE_TAG_ALWAYS; -} - -} // namespace andoid