Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue"

Browse Source 
* commit '84ee7930bb0f91f6a19662efa4c3f7c7044be426':
  AArch64: Use long for pointers in android/os/MessageQueue
This commit is contained in:
Narayan Kamath
2014-01-16 07:32:01 -08:00
committed by Android Git Automerger
parent caea42fd2d 84ee7930bb
commit faa62aaca5
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/os/MessageQueue.java
View File

@@ -35,7 +35,7 @@ public final class MessageQueue {
private final boolean mQuitAllowed; private final boolean mQuitAllowed;
@SuppressWarnings("unused") @SuppressWarnings("unused")
private int mPtr; // used by native code private long mPtr; // used by native code
Message mMessages; Message mMessages;
private final ArrayList<IdleHandler> mIdleHandlers = new ArrayList<IdleHandler>(); private final ArrayList<IdleHandler> mIdleHandlers = new ArrayList<IdleHandler>();
@@ -49,11 +49,11 @@ public final class MessageQueue {
// Barriers are indicated by messages with a null target whose arg1 field carries the token. // Barriers are indicated by messages with a null target whose arg1 field carries the token.
private int mNextBarrierToken; private int mNextBarrierToken;
private native static int nativeInit(); private native static long nativeInit();
private native static void nativeDestroy(int ptr); private native static void nativeDestroy(long ptr);
private native static void nativePollOnce(int ptr, int timeoutMillis); private native static void nativePollOnce(long ptr, int timeoutMillis);
private native static void nativeWake(int ptr); private native static void nativeWake(long ptr);
private native static boolean nativeIsIdling(int ptr); private native static boolean nativeIsIdling(long ptr);
/** /**
* Callback interface for discovering when a thread is going to block * Callback interface for discovering when a thread is going to block

28
core/jni/android_os_MessageQueue.cpp
View File

@@ -110,11 +110,11 @@ void NativeMessageQueue::wake() {
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
sp<MessageQueue> android_os_MessageQueue_getMessageQueue(JNIEnv* env, jobject messageQueueObj) { sp<MessageQueue> android_os_MessageQueue_getMessageQueue(JNIEnv* env, jobject messageQueueObj) {
jint intPtr = env->GetIntField(messageQueueObj, gMessageQueueClassInfo.mPtr); jlong ptr = env->GetLongField(messageQueueObj, gMessageQueueClassInfo.mPtr);
return reinterpret_cast<NativeMessageQueue*>(intPtr); return reinterpret_cast<NativeMessageQueue*>(ptr);
} }
static jint android_os_MessageQueue_nativeInit(JNIEnv* env, jclass clazz) { static jlong android_os_MessageQueue_nativeInit(JNIEnv* env, jclass clazz) {
NativeMessageQueue* nativeMessageQueue = new NativeMessageQueue(); NativeMessageQueue* nativeMessageQueue = new NativeMessageQueue();
if (!nativeMessageQueue) { if (!nativeMessageQueue) {
jniThrowRuntimeException(env, "Unable to allocate native queue"); jniThrowRuntimeException(env, "Unable to allocate native queue");
@@ -122,26 +122,26 @@ static jint android_os_MessageQueue_nativeInit(JNIEnv* env, jclass clazz) {
} }
nativeMessageQueue->incStrong(env); nativeMessageQueue->incStrong(env);
return reinterpret_cast<jint>(nativeMessageQueue); return reinterpret_cast<jlong>(nativeMessageQueue);
} }
static void android_os_MessageQueue_nativeDestroy(JNIEnv* env, jclass clazz, jint ptr) { static void android_os_MessageQueue_nativeDestroy(JNIEnv* env, jclass clazz, jlong ptr) {
NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr); NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr);
nativeMessageQueue->decStrong(env); nativeMessageQueue->decStrong(env);
} }
static void android_os_MessageQueue_nativePollOnce(JNIEnv* env, jclass clazz, static void android_os_MessageQueue_nativePollOnce(JNIEnv* env, jclass clazz,
jint ptr, jint timeoutMillis) { jlong ptr, jint timeoutMillis) {
NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr); NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr);
nativeMessageQueue->pollOnce(env, timeoutMillis); nativeMessageQueue->pollOnce(env, timeoutMillis);
} }
static void android_os_MessageQueue_nativeWake(JNIEnv* env, jclass clazz, jint ptr) { static void android_os_MessageQueue_nativeWake(JNIEnv* env, jclass clazz, jlong ptr) {
NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr); NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr);
return nativeMessageQueue->wake(); return nativeMessageQueue->wake();
} }
static jboolean android_os_MessageQueue_nativeIsIdling(JNIEnv* env, jclass clazz, jint ptr) { static jboolean android_os_MessageQueue_nativeIsIdling(JNIEnv* env, jclass clazz, jlong ptr) {
NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr); NativeMessageQueue* nativeMessageQueue = reinterpret_cast<NativeMessageQueue*>(ptr);
return nativeMessageQueue->getLooper()->isIdling(); return nativeMessageQueue->getLooper()->isIdling();
} }
@@ -150,11 +150,11 @@ static jboolean android_os_MessageQueue_nativeIsIdling(JNIEnv* env, jclass clazz
static JNINativeMethod gMessageQueueMethods[] = { static JNINativeMethod gMessageQueueMethods[] = {
/* name, signature, funcPtr */ /* name, signature, funcPtr */
{ "nativeInit", "()I", (void*)android_os_MessageQueue_nativeInit }, { "nativeInit", "()J", (void*)android_os_MessageQueue_nativeInit },
{ "nativeDestroy", "(I)V", (void*)android_os_MessageQueue_nativeDestroy }, { "nativeDestroy", "(J)V", (void*)android_os_MessageQueue_nativeDestroy },
{ "nativePollOnce", "(II)V", (void*)android_os_MessageQueue_nativePollOnce }, { "nativePollOnce", "(JI)V", (void*)android_os_MessageQueue_nativePollOnce },
{ "nativeWake", "(I)V", (void*)android_os_MessageQueue_nativeWake }, { "nativeWake", "(J)V", (void*)android_os_MessageQueue_nativeWake },
{ "nativeIsIdling", "(I)Z", (void*)android_os_MessageQueue_nativeIsIdling } { "nativeIsIdling", "(J)Z", (void*)android_os_MessageQueue_nativeIsIdling }
}; };
#define FIND_CLASS(var, className) \ #define FIND_CLASS(var, className) \
@@ -174,7 +174,7 @@ int register_android_os_MessageQueue(JNIEnv* env) {
FIND_CLASS(clazz, "android/os/MessageQueue"); FIND_CLASS(clazz, "android/os/MessageQueue");
GET_FIELD_ID(gMessageQueueClassInfo.mPtr, clazz, GET_FIELD_ID(gMessageQueueClassInfo.mPtr, clazz,
"mPtr", "I"); "mPtr", "J");
return 0; return 0;
} }