Merge "Use @FastNative and @CriticalNative where applicable" into main (e5da1ef7) · Commits · e / os / android_frameworks_base

core/java/android/tracing/perfetto/DataSource.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import android.util.proto.ProtoInputStream;

		import com.android.internal.annotations.VisibleForTesting;

		import dalvik.annotation.optimization.CriticalNative;

		/**
		* Templated base class meant to be derived by embedders to create a custom data
		* source.
		@@ -177,7 +179,10 @@ public abstract class DataSource<DataSourceInstanceType extends DataSourceInstan
		private static native void nativeReleasePerfettoInstanceLocked(
		long dataSourcePtr, int dsInstanceIdx);

		@CriticalNative
		private static native boolean nativePerfettoDsTraceIterateBegin(long dataSourcePtr);
		@CriticalNative
		private static native boolean nativePerfettoDsTraceIterateNext(long dataSourcePtr);
		@CriticalNative
		private static native void nativePerfettoDsTraceIterateBreak(long dataSourcePtr);
		}

core/jni/android_tracing_PerfettoDataSource.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -395,7 +395,7 @@ void nativeRegisterDataSource(JNIEnv* env, jclass clazz, jlong datasource_ptr,
		PerfettoDsRegister(&datasource->dataSource, datasource->dataSourceName.c_str(), params);
		}

		jobject nativeGetPerfettoInstanceLocked(JNIEnv* env, jclass clazz, jlong dataSourcePtr,
		jobject nativeGetPerfettoInstanceLocked(JNIEnv* /* env /, jclass / clazz */, jlong dataSourcePtr,
		PerfettoDsInstanceIndex instance_idx) {
		ALOG(LOG_DEBUG, LOG_TAG, "nativeGetPerfettoInstanceLocked ds=%p, idx=%d", (void*)dataSourcePtr,
		instance_idx);
		@@ -415,7 +415,7 @@ jobject nativeGetPerfettoInstanceLocked(JNIEnv* env, jclass clazz, jlong dataSou
		return datasource_instance->GetJavaDataSourceInstance();
		}

		void nativeReleasePerfettoInstanceLocked(JNIEnv* env, jclass clazz, jlong dataSourcePtr,
		void nativeReleasePerfettoInstanceLocked(JNIEnv* /* env /, jclass / clazz */, jlong dataSourcePtr,
		PerfettoDsInstanceIndex instance_idx) {
		ALOG(LOG_DEBUG, LOG_TAG, "nativeReleasePerfettoInstanceLocked got lock ds=%p, idx=%d",
		(void*)dataSourcePtr, instance_idx);
		@@ -423,27 +423,27 @@ void nativeReleasePerfettoInstanceLocked(JNIEnv* env, jclass clazz, jlong dataSo
		PerfettoDsImplReleaseInstanceLocked(datasource->dataSource.impl, instance_idx);
		}

		bool nativePerfettoDsTraceIterateBegin(JNIEnv* env, jclass clazz, jlong dataSourcePtr) {
		bool nativePerfettoDsTraceIterateBegin(jlong dataSourcePtr) {
		sp<PerfettoDataSource> datasource = reinterpret_cast<PerfettoDataSource*>(dataSourcePtr);
		return datasource->TraceIterateBegin();
		}

		bool nativePerfettoDsTraceIterateNext(JNIEnv* env, jclass clazz, jlong dataSourcePtr) {
		bool nativePerfettoDsTraceIterateNext(jlong dataSourcePtr) {
		sp<PerfettoDataSource> datasource = reinterpret_cast<PerfettoDataSource*>(dataSourcePtr);
		return datasource->TraceIterateNext();
		}

		void nativePerfettoDsTraceIterateBreak(JNIEnv* env, jclass clazz, jlong dataSourcePtr) {
		void nativePerfettoDsTraceIterateBreak(jlong dataSourcePtr) {
		sp<PerfettoDataSource> datasource = reinterpret_cast<PerfettoDataSource*>(dataSourcePtr);
		return datasource->TraceIterateBreak();
		}

		jobject nativeGetCustomTls(JNIEnv* env, jclass clazz, jlong dataSourcePtr) {
		jobject nativeGetCustomTls(JNIEnv* /* env /, jclass / clazz */, jlong dataSourcePtr) {
		sp<PerfettoDataSource> datasource = reinterpret_cast<PerfettoDataSource*>(dataSourcePtr);
		return datasource->GetCustomTls();
		}

		jobject nativeGetIncrementalState(JNIEnv* env, jclass clazz, jlong dataSourcePtr) {
		jobject nativeGetIncrementalState(JNIEnv* /* env /, jclass / clazz */, jlong dataSourcePtr) {
		sp<PerfettoDataSource> datasource = reinterpret_cast<PerfettoDataSource*>(dataSourcePtr);
		return datasource->GetIncrementalState();
		}