Merge "Add Java wrappers for new atrace functionality." (a8c67eb9) · Commits · e / os / android_frameworks_base

core/java/android/os/Trace.java

0 → 100644

+94 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.os;

		/**
		* Writes trace events to the kernel trace buffer. These trace events can be
		* collected using the "atrace" program for offline analysis.
		*
		* This tracing mechanism is independent of the method tracing mechanism
		* offered by {@link Debug#startMethodTracing}. In particular, it enables
		* tracing of events that occur across processes.
		*
		* @hide
		*/
		public final class Trace {
		// These tags must be kept in sync with frameworks/native/include/utils/Trace.h.
		public static final long TRACE_TAG_NEVER = 0;
		public static final long TRACE_TAG_ALWAYS = 1L << 0;
		public static final long TRACE_TAG_GRAPHICS = 1L << 1;
		public static final long TRACE_TAG_INPUT = 1L << 2;
		public static final long TRACE_TAG_VIEW = 1L << 3;

		private static final long sEnabledTags = nativeGetEnabledTags();

		private static native long nativeGetEnabledTags();
		private static native void nativeTraceCounter(long tag, String name, int value);
		private static native void nativeTraceBegin(long tag, String name);
		private static native void nativeTraceEnd(long tag);

		private Trace() {
		}

		/**
		* Returns true if a trace tag is enabled.
		*
		* @param traceTag The trace tag to check.
		* @return True if the trace tag is valid.
		*/
		public static boolean isTagEnabled(long traceTag) {
		return (sEnabledTags & traceTag) != 0;
		}

		/**
		* Writes trace message to indicate the value of a given counter.
		*
		* @param traceTag The trace tag.
		* @param counterName The counter name to appear in the trace.
		* @param counterValue The counter value.
		*/
		public static void traceCounter(long traceTag, String counterName, int counterValue) {
		if ((sEnabledTags & traceTag) != 0) {
		nativeTraceCounter(traceTag, counterName, counterValue);
		}
		}

		/**
		* Writes a trace message to indicate that a given method has begun.
		* Must be followed by a call to {@link #traceEnd} using the same tag.
		*
		* @param traceTag The trace tag.
		* @param methodName The method name to appear in the trace.
		*/
		public static void traceBegin(long traceTag, String methodName) {
		if ((sEnabledTags & traceTag) != 0) {
		nativeTraceBegin(traceTag, methodName);
		}
		}

		/**
		* Writes a trace message to indicate that the current method has ended.
		* Must be called exactly once for each call to {@link #traceBegin} using the same tag.
		*
		* @param traceTag The trace tag.
		*/
		public static void traceEnd(long traceTag) {
		if ((sEnabledTags & traceTag) != 0) {
		nativeTraceEnd(traceTag);
		}
		}
		}

core/java/android/view/ViewRootImpl.java

+28 −11

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ import android.os.Process;
		import android.os.RemoteException;
		import android.os.SystemClock;
		import android.os.SystemProperties;
		import android.os.Trace;
		import android.util.AndroidRuntimeException;
		import android.util.DisplayMetrics;
		import android.util.EventLog;
		@@ -960,7 +961,12 @@ public final class ViewRootImpl implements ViewParent,
		}
		}

		Trace.traceBegin(Trace.TRACE_TAG_VIEW, "performTraversals");
		try {
		performTraversals();
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_VIEW);
		}

		if (ViewDebug.DEBUG_LATENCY) {
		long now = System.nanoTime();
		@@ -1919,7 +1925,13 @@ public final class ViewRootImpl implements ViewParent,

		final boolean fullRedrawNeeded = mFullRedrawNeeded;
		mFullRedrawNeeded = false;

		Trace.traceBegin(Trace.TRACE_TAG_VIEW, "draw");
		try {
		draw(fullRedrawNeeded);
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_VIEW);
		}

		if (ViewDebug.DEBUG_LATENCY) {
		long now = System.nanoTime();
		@@ -2897,6 +2909,8 @@ public final class ViewRootImpl implements ViewParent,
		q.mDeliverTimeNanos = System.nanoTime();
		}

		Trace.traceBegin(Trace.TRACE_TAG_VIEW, "deliverInputEvent");
		try {
		if (q.mEvent instanceof KeyEvent) {
		deliverKeyEvent(q);
		} else {
		@@ -2909,6 +2923,9 @@ public final class ViewRootImpl implements ViewParent,
		deliverGenericMotionEvent(q);
		}
		}
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_VIEW);
		}
		}

		private void deliverPointerEvent(QueuedInputEvent q) {

core/jni/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ LOCAL_SRC_FILES:= \
		android_os_StatFs.cpp \
		android_os_SystemClock.cpp \
		android_os_SystemProperties.cpp \
		android_os_Trace.cpp \
		android_os_UEventObserver.cpp \
		android_net_LocalSocketImpl.cpp \
		android_net_NetUtils.cpp \

core/jni/AndroidRuntime.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -136,6 +136,7 @@ extern int register_android_os_Power(JNIEnv *env);
		extern int register_android_os_StatFs(JNIEnv *env);
		extern int register_android_os_SystemProperties(JNIEnv *env);
		extern int register_android_os_SystemClock(JNIEnv* env);
		extern int register_android_os_Trace(JNIEnv* env);
		extern int register_android_os_FileObserver(JNIEnv *env);
		extern int register_android_os_FileUtils(JNIEnv *env);
		extern int register_android_os_UEventObserver(JNIEnv* env);
		@@ -1151,6 +1152,7 @@ static const RegJNIRec gRegJNI[] = {
		REG_JNI(register_android_os_ParcelFileDescriptor),
		REG_JNI(register_android_os_Power),
		REG_JNI(register_android_os_StatFs),
		REG_JNI(register_android_os_Trace),
		REG_JNI(register_android_os_UEventObserver),
		REG_JNI(register_android_net_LocalSocketImpl),
		REG_JNI(register_android_net_NetworkUtils),

core/jni/android_os_Trace.cpp

0 → 100644

+72 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#define LOG_TAG "Trace"

		#include <JNIHelp.h>
		#include <ScopedUtfChars.h>

		#include <utils/Trace.h>
		#include <cutils/log.h>

		namespace android {

		static jlong android_os_Trace_nativeGetEnabledTags(JNIEnv* env, jclass clazz) {
		return Tracer::getEnabledTags();
		}

		static void android_os_Trace_nativeTraceCounter(JNIEnv* env, jclass clazz,
		jlong tag, jstring nameStr, jint value) {
		ScopedUtfChars name(env, nameStr);
		Tracer::traceCounter(tag, name.c_str(), value);
		}

		static void android_os_Trace_nativeTraceBegin(JNIEnv* env, jclass clazz,
		jlong tag, jstring nameStr) {
		ScopedUtfChars name(env, nameStr);
		Tracer::traceBegin(tag, name.c_str());
		}

		static void android_os_Trace_nativeTraceEnd(JNIEnv* env, jclass clazz,
		jlong tag) {
		Tracer::traceEnd(tag);
		}

		static JNINativeMethod gTraceMethods[] = {
		/* name, signature, funcPtr */
		{ "nativeGetEnabledTags",
		"()J",
		(void*)android_os_Trace_nativeGetEnabledTags },
		{ "nativeTraceCounter",
		"(JLjava/lang/String;I)V",
		(void*)android_os_Trace_nativeTraceCounter },
		{ "nativeTraceBegin",
		"(JLjava/lang/String;)V",
		(void*)android_os_Trace_nativeTraceBegin },
		{ "nativeTraceEnd",
		"(J)V",
		(void*)android_os_Trace_nativeTraceEnd },
		};

		int register_android_os_Trace(JNIEnv* env) {
		int res = jniRegisterNativeMethods(env, "android/os/Trace",
		gTraceMethods, NELEM(gTraceMethods));
		LOG_FATAL_IF(res < 0, "Unable to register native methods.");

		return 0;
		}

		} // namespace android