diff options
author | Jamie Gennis | 2013-05-07 17:09:17 -0500 |
---|---|---|
committer | Jamie Gennis | 2013-05-07 17:19:34 -0500 |
commit | 2b68e0675b3e3e2f45001e4597872609d26956ae (patch) | |
tree | 03d708f5161b381f760a3aff7d52d92d25bb223c | |
parent | b3478f4a50fc44bf573dc4caf4f7e1ddcc4f0eea (diff) | |
download | platform-system-core-2b68e0675b3e3e2f45001e4597872609d26956ae.tar.gz platform-system-core-2b68e0675b3e3e2f45001e4597872609d26956ae.tar.xz platform-system-core-2b68e0675b3e3e2f45001e4597872609d26956ae.zip |
libcutils: add a trace tag for Dalvik
This change adds a trace tag bit for Dalvik. It also allows the ATRACE_*
macros to be called from code compiled for the host with no effect.
Bug: 8856374
Change-Id: I9c17129d6cc170cae00b6500485b5b5fa4b5e647
-rw-r--r-- | include/cutils/trace.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/include/cutils/trace.h b/include/cutils/trace.h index 9b564e25e..29034cab5 100644 --- a/include/cutils/trace.h +++ b/include/cutils/trace.h | |||
@@ -65,7 +65,8 @@ __BEGIN_DECLS | |||
65 | #define ATRACE_TAG_HAL (1<<11) | 65 | #define ATRACE_TAG_HAL (1<<11) |
66 | #define ATRACE_TAG_APP (1<<12) | 66 | #define ATRACE_TAG_APP (1<<12) |
67 | #define ATRACE_TAG_RESOURCES (1<<13) | 67 | #define ATRACE_TAG_RESOURCES (1<<13) |
68 | #define ATRACE_TAG_LAST ATRACE_TAG_RESOURCES | 68 | #define ATRACE_TAG_DALVIK (1<<14) |
69 | #define ATRACE_TAG_LAST ATRACE_TAG_DALVIK | ||
69 | 70 | ||
70 | // Reserved for initialization. | 71 | // Reserved for initialization. |
71 | #define ATRACE_TAG_NOT_READY (1LL<<63) | 72 | #define ATRACE_TAG_NOT_READY (1LL<<63) |
@@ -78,6 +79,7 @@ __BEGIN_DECLS | |||
78 | #error ATRACE_TAG must be defined to be one of the tags defined in cutils/trace.h | 79 | #error ATRACE_TAG must be defined to be one of the tags defined in cutils/trace.h |
79 | #endif | 80 | #endif |
80 | 81 | ||
82 | #ifdef HAVE_ANDROID_OS | ||
81 | /** | 83 | /** |
82 | * Maximum size of a message that can be logged to the trace buffer. | 84 | * Maximum size of a message that can be logged to the trace buffer. |
83 | * Note this message includes a tag, the pid, and the string given as the name. | 85 | * Note this message includes a tag, the pid, and the string given as the name. |
@@ -256,6 +258,19 @@ static inline void atrace_int(uint64_t tag, const char* name, int32_t value) | |||
256 | } | 258 | } |
257 | } | 259 | } |
258 | 260 | ||
261 | #else // not HAVE_ANDROID_OS | ||
262 | |||
263 | #define ATRACE_INIT() | ||
264 | #define ATRACE_GET_ENABLED_TAGS() | ||
265 | #define ATRACE_ENABLED() | ||
266 | #define ATRACE_BEGIN(name) | ||
267 | #define ATRACE_END() | ||
268 | #define ATRACE_ASYNC_BEGIN(name, cookie) | ||
269 | #define ATRACE_ASYNC_END(name, cookie) | ||
270 | #define ATRACE_INT(name, value) | ||
271 | |||
272 | #endif // not HAVE_ANDROID_OS | ||
273 | |||
259 | __END_DECLS | 274 | __END_DECLS |
260 | 275 | ||
261 | #endif // _LIBS_CUTILS_TRACE_H | 276 | #endif // _LIBS_CUTILS_TRACE_H |