am ba111ef9: am c802a661: Merge "Trace: add ALOGVs for easier debugging" into klp-dev (ee46eab2) · Commits · e / os / android_frameworks_base

core/jni/android_os_Trace.cpp

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,7 @@
	*/		*/

	#define LOG_TAG "Trace"		#define LOG_TAG "Trace"
			// #define LOG_NDEBUG 0

	#include <JNIHelp.h>		#include <JNIHelp.h>
	#include <ScopedUtfChars.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,		static void android_os_Trace_nativeTraceCounter(JNIEnv* env, jclass clazz,
	jlong tag, jstring nameStr, jint value) {		jlong tag, jstring nameStr, jint value) {
	ScopedUtfChars name(env, nameStr);		ScopedUtfChars name(env, nameStr);

			ALOGV("%s: %lld %s %d", __FUNCTION__, tag, name.c_str(), value);
	atrace_int(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);		ScopedStringChars jchars(env, nameStr);
	String8 utf8Chars(reinterpret_cast<const char16_t*>(jchars.get()), jchars.size());		String8 utf8Chars(reinterpret_cast<const char16_t*>(jchars.get()), jchars.size());
	sanitizeString(utf8Chars);		sanitizeString(utf8Chars);

			ALOGV("%s: %lld %s", __FUNCTION__, tag, utf8Chars.string());
	atrace_begin(tag, utf8Chars.string());		atrace_begin(tag, utf8Chars.string());
	}		}

	static void android_os_Trace_nativeTraceEnd(JNIEnv* env, jclass clazz,		static void android_os_Trace_nativeTraceEnd(JNIEnv* env, jclass clazz,
	jlong tag) {		jlong tag) {

			ALOGV("%s: %lld", __FUNCTION__, tag);
	atrace_end(tag);		atrace_end(tag);
	}		}

	@@ -69,6 +76,8 @@ static void android_os_Trace_nativeAsyncTraceBegin(JNIEnv* env, jclass clazz,
	ScopedStringChars jchars(env, nameStr);		ScopedStringChars jchars(env, nameStr);
	String8 utf8Chars(reinterpret_cast<const char16_t*>(jchars.get()), jchars.size());		String8 utf8Chars(reinterpret_cast<const char16_t*>(jchars.get()), jchars.size());
	sanitizeString(utf8Chars);		sanitizeString(utf8Chars);

			ALOGV("%s: %lld %s %d", __FUNCTION__, tag, utf8Chars.string(), cookie);
	atrace_async_begin(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);		ScopedStringChars jchars(env, nameStr);
	String8 utf8Chars(reinterpret_cast<const char16_t*>(jchars.get()), jchars.size());		String8 utf8Chars(reinterpret_cast<const char16_t*>(jchars.get()), jchars.size());
	sanitizeString(utf8Chars);		sanitizeString(utf8Chars);

			ALOGV("%s: %lld %s %d", __FUNCTION__, tag, utf8Chars.string(), cookie);
	atrace_async_end(tag, utf8Chars.string(), cookie);		atrace_async_end(tag, utf8Chars.string(), cookie);
	}		}

	static void android_os_Trace_nativeSetAppTracingAllowed(JNIEnv* env,		static void android_os_Trace_nativeSetAppTracingAllowed(JNIEnv* env,
	jclass clazz, jboolean allowed) {		jclass clazz, jboolean allowed) {
			ALOGV("%s: %d", __FUNCTION__, allowed);

	atrace_set_debuggable(allowed);		atrace_set_debuggable(allowed);
	}		}

	static void android_os_Trace_nativeSetTracingEnabled(JNIEnv* env,		static void android_os_Trace_nativeSetTracingEnabled(JNIEnv* env,
	jclass clazz, jboolean enabled) {		jclass clazz, jboolean enabled) {
			ALOGV("%s: %d", __FUNCTION__, enabled);

	atrace_set_tracing_enabled(enabled);		atrace_set_tracing_enabled(enabled);
	}		}