summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2013-05-07 15:09:17 -0700
committerJamie Gennis <jgennis@google.com>2013-05-07 15:19:34 -0700
commit2b68e0675b3e3e2f45001e4597872609d26956ae (patch)
tree03d708f5161b381f760a3aff7d52d92d25bb223c
parentb3478f4a50fc44bf573dc4caf4f7e1ddcc4f0eea (diff)
downloadsystem_core-2b68e0675b3e3e2f45001e4597872609d26956ae.zip
system_core-2b68e0675b3e3e2f45001e4597872609d26956ae.tar.gz
system_core-2b68e0675b3e3e2f45001e4597872609d26956ae.tar.bz2
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.h17
1 files changed, 16 insertions, 1 deletions
diff --git a/include/cutils/trace.h b/include/cutils/trace.h
index 9b564e2..29034ca 100644
--- a/include/cutils/trace.h
+++ b/include/cutils/trace.h
@@ -65,7 +65,8 @@ __BEGIN_DECLS
#define ATRACE_TAG_HAL (1<<11)
#define ATRACE_TAG_APP (1<<12)
#define ATRACE_TAG_RESOURCES (1<<13)
-#define ATRACE_TAG_LAST ATRACE_TAG_RESOURCES
+#define ATRACE_TAG_DALVIK (1<<14)
+#define ATRACE_TAG_LAST ATRACE_TAG_DALVIK
// Reserved for initialization.
#define ATRACE_TAG_NOT_READY (1LL<<63)
@@ -78,6 +79,7 @@ __BEGIN_DECLS
#error ATRACE_TAG must be defined to be one of the tags defined in cutils/trace.h
#endif
+#ifdef HAVE_ANDROID_OS
/**
* Maximum size of a message that can be logged to the trace buffer.
* 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)
}
}
+#else // not HAVE_ANDROID_OS
+
+#define ATRACE_INIT()
+#define ATRACE_GET_ENABLED_TAGS()
+#define ATRACE_ENABLED()
+#define ATRACE_BEGIN(name)
+#define ATRACE_END()
+#define ATRACE_ASYNC_BEGIN(name, cookie)
+#define ATRACE_ASYNC_END(name, cookie)
+#define ATRACE_INT(name, value)
+
+#endif // not HAVE_ANDROID_OS
+
__END_DECLS
#endif // _LIBS_CUTILS_TRACE_H