Merge "Annotate MessageQueue native methods as fast/critical as applicable." into main (df062e97) · Commits · e / os / android_frameworks_base

core/java/android/os/CombinedMessageQueue/MessageQueue.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,8 @@ import android.util.Printer;
		import android.util.SparseArray;
		import android.util.proto.ProtoOutputStream;

		import dalvik.annotation.optimization.CriticalNative;
		import dalvik.annotation.optimization.FastNative;
		import dalvik.annotation.optimization.NeverCompile;

		import java.io.FileDescriptor;
		@@ -115,17 +117,28 @@ public final class MessageQueue {
		private static Boolean sIsProcessAllowedToUseConcurrent = null;

		@RavenwoodRedirect
		@FastNative
		private native static long nativeInit();

		@RavenwoodRedirect
		@FastNative
		private native static void nativeDestroy(long ptr);

		@UnsupportedAppUsage
		@RavenwoodRedirect
		// Not @FastNative since significant time is spent in the native code as it may invoke
		// application callbacks.
		private native void nativePollOnce(long ptr, int timeoutMillis); /non-static for callbacks/
		@RavenwoodRedirect
		@CriticalNative
		private native static void nativeWake(long ptr);

		@RavenwoodRedirect
		@CriticalNative
		private native static boolean nativeIsPolling(long ptr);

		@RavenwoodRedirect
		@CriticalNative
		private native static void nativeSetFileDescriptorEvents(long ptr, int fd, int events);

		MessageQueue(boolean quitAllowed) {

+14 −0

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

		import com.android.internal.annotations.GuardedBy;

		import dalvik.annotation.optimization.CriticalNative;
		import dalvik.annotation.optimization.FastNative;
		import dalvik.annotation.optimization.NeverCompile;

		import java.io.FileDescriptor;
		@@ -350,16 +352,28 @@ public final class MessageQueue {
		private final AtomicInteger mNextBarrierToken = new AtomicInteger(1);

		@RavenwoodRedirect
		@FastNative
		private static native long nativeInit();

		@RavenwoodRedirect
		@FastNative
		private static native void nativeDestroy(long ptr);

		@RavenwoodRedirect
		// Not @FastNative since significant time is spent in the native code as it may invoke
		// application callbacks.
		private native void nativePollOnce(long ptr, int timeoutMillis); /non-static for callbacks/

		@RavenwoodRedirect
		@CriticalNative
		private static native void nativeWake(long ptr);

		@RavenwoodRedirect
		@CriticalNative
		private static native boolean nativeIsPolling(long ptr);

		@RavenwoodRedirect
		@CriticalNative
		private static native void nativeSetFileDescriptorEvents(long ptr, int fd, int events);

		MessageQueue(boolean quitAllowed) {

+14 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@ import android.util.Printer;
		import android.util.SparseArray;
		import android.util.proto.ProtoOutputStream;

		import dalvik.annotation.optimization.CriticalNative;
		import dalvik.annotation.optimization.FastNative;
		import dalvik.annotation.optimization.NeverCompile;

		import java.io.FileDescriptor;
		@@ -85,17 +87,29 @@ public final class MessageQueue {
		private int mNextBarrierToken;

		@RavenwoodRedirect
		@FastNative
		private native static long nativeInit();

		@RavenwoodRedirect
		@FastNative
		private native static void nativeDestroy(long ptr);

		@UnsupportedAppUsage
		@RavenwoodRedirect
		// Not @FastNative since significant time is spent in the native code as it may invoke
		// application callbacks.
		private native void nativePollOnce(long ptr, int timeoutMillis); /non-static for callbacks/

		@RavenwoodRedirect
		@CriticalNative
		private native static void nativeWake(long ptr);

		@RavenwoodRedirect
		@CriticalNative
		private native static boolean nativeIsPolling(long ptr);

		@RavenwoodRedirect
		@CriticalNative
		private native static void nativeSetFileDescriptorEvents(long ptr, int fd, int events);

		MessageQueue(boolean quitAllowed) {

+3 −0

Original line number	Diff line number	Diff line
		@@ -120,3 +120,6 @@ per-file android_tracing_Perfetto* = file:platform/development:/tools/winscope/O
		# ApplicationSharedMemory
		per-file ApplicationSharedMemory = file:/PERFORMANCE_OWNERS
		per-file PropertyInvalidatedCache = file:/PERFORMANCE_OWNERS

		# MessageQueue
		per-file MessageQueue = mfasheh@google.com, shayba@google.com

+3 −4

Original line number	Diff line number	Diff line
		@@ -226,18 +226,17 @@ static void android_os_MessageQueue_nativePollOnce(JNIEnv* env, jobject obj,
		nativeMessageQueue->pollOnce(env, obj, timeoutMillis);
		}

		static void android_os_MessageQueue_nativeWake(JNIEnv* env, jclass clazz, jlong ptr) {
		static void android_os_MessageQueue_nativeWake(jlong ptr) {
		NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr);
		nativeMessageQueue->wake();
		}

		static jboolean android_os_MessageQueue_nativeIsPolling(JNIEnv* env, jclass clazz, jlong ptr) {
		static jboolean android_os_MessageQueue_nativeIsPolling(jlong ptr) {
		NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr);
		return nativeMessageQueue->getLooper()->isPolling();
		}

		static void android_os_MessageQueue_nativeSetFileDescriptorEvents(JNIEnv* env, jclass clazz,
		jlong ptr, jint fd, jint events) {
		static void android_os_MessageQueue_nativeSetFileDescriptorEvents(jlong ptr, jint fd, jint events) {
		NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr);
		nativeMessageQueue->setFileDescriptorEvents(fd, events);
		}