Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d1b7d5b authored by Shai Barack's avatar Shai Barack Committed by Android (Google) Code Review
Browse files

Merge "Revert "Annotate MessageQueue native methods as fast/critical as applicable."" into main

parents b43c3357 ca64160d

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

+0 −13
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 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;
@@ -129,29 +127,18 @@ 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) {

core/java/android/os/ConcurrentMessageQueue/MessageQueue.java

+0 −14
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 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;
@@ -444,28 +442,16 @@ 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) {

core/java/android/os/LegacyMessageQueue/MessageQueue.java

+0 −14
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 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;
@@ -87,29 +85,17 @@ 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) {

core/jni/android_os_MessageQueue.cpp

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

}



static void android_os_MessageQueue_nativeWake(jlong ptr) {

static void android_os_MessageQueue_nativeWake(JNIEnv* env, jclass clazz, jlong ptr) {

    NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr);

    nativeMessageQueue->wake();

}



static jboolean android_os_MessageQueue_nativeIsPolling(jlong ptr) {

static jboolean android_os_MessageQueue_nativeIsPolling(JNIEnv* env, jclass clazz, jlong ptr) {

    NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr);

    return nativeMessageQueue->getLooper()->isPolling();

}



static void android_os_MessageQueue_nativeSetFileDescriptorEvents(jlong ptr, jint fd, jint events) {

static void android_os_MessageQueue_nativeSetFileDescriptorEvents(JNIEnv* env, jclass clazz,

        jlong ptr, jint fd, jint events) {

    NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr);

    nativeMessageQueue->setFileDescriptorEvents(fd, events);

}