am c802a661: Merge "Trace: add ALOGVs for easier debugging" into klp-dev

* commit 'c802a6614095660bccfd0cdf4f15404ad1863b76':
  Trace: add ALOGVs for easier debugging
This commit is contained in:
Igor Murashkin
2013-10-25 15:15:12 -07:00
committed by Android Git Automerger

View File

@@ -15,6 +15,7 @@
*/
#define LOG_TAG "Trace"
// #define LOG_NDEBUG 0
#include <JNIHelp.h>
#include <ScopedUtfChars.h>
@@ -46,6 +47,8 @@ static jlong android_os_Trace_nativeGetEnabledTags(JNIEnv* env, jclass clazz) {
static void android_os_Trace_nativeTraceCounter(JNIEnv* env, jclass clazz,
jlong tag, jstring nameStr, jint value) {
ScopedUtfChars name(env, nameStr);
ALOGV("%s: %lld %s %d", __FUNCTION__, tag, name.c_str(), value);
atrace_int(tag, name.c_str(), value);
}
@@ -55,11 +58,15 @@ static void android_os_Trace_nativeTraceBegin(JNIEnv* env, jclass clazz,
ScopedStringChars jchars(env, nameStr);
String8 utf8Chars(reinterpret_cast<const char16_t*>(jchars.get()), jchars.size());
sanitizeString(utf8Chars);
ALOGV("%s: %lld %s", __FUNCTION__, tag, utf8Chars.string());
atrace_begin(tag, utf8Chars.string());
}
static void android_os_Trace_nativeTraceEnd(JNIEnv* env, jclass clazz,
jlong tag) {
ALOGV("%s: %lld", __FUNCTION__, tag);
atrace_end(tag);
}
@@ -69,6 +76,8 @@ static void android_os_Trace_nativeAsyncTraceBegin(JNIEnv* env, jclass clazz,
ScopedStringChars jchars(env, nameStr);
String8 utf8Chars(reinterpret_cast<const char16_t*>(jchars.get()), jchars.size());
sanitizeString(utf8Chars);
ALOGV("%s: %lld %s %d", __FUNCTION__, tag, utf8Chars.string(), cookie);
atrace_async_begin(tag, utf8Chars.string(), cookie);
}
@@ -78,16 +87,22 @@ static void android_os_Trace_nativeAsyncTraceEnd(JNIEnv* env, jclass clazz,
ScopedStringChars jchars(env, nameStr);
String8 utf8Chars(reinterpret_cast<const char16_t*>(jchars.get()), jchars.size());
sanitizeString(utf8Chars);
ALOGV("%s: %lld %s %d", __FUNCTION__, tag, utf8Chars.string(), cookie);
atrace_async_end(tag, utf8Chars.string(), cookie);
}
static void android_os_Trace_nativeSetAppTracingAllowed(JNIEnv* env,
jclass clazz, jboolean allowed) {
ALOGV("%s: %d", __FUNCTION__, allowed);
atrace_set_debuggable(allowed);
}
static void android_os_Trace_nativeSetTracingEnabled(JNIEnv* env,
jclass clazz, jboolean enabled) {
ALOGV("%s: %d", __FUNCTION__, enabled);
atrace_set_tracing_enabled(enabled);
}