diff options
author | Paul Duffin <paulduffin@google.com> | 2018-08-03 12:52:21 +0100 |
---|---|---|
committer | Paul Duffin <paulduffin@google.com> | 2018-08-15 18:47:29 +0100 |
commit | 0549663b1cdf8c6386685c7c2e3d3ec27c8c0bc6 (patch) | |
tree | 65e68a8114afee103e98016dbe1bd6c402a698a6 /runtime/native/java_lang_Thread.cc | |
parent | 017d63c144081b8977d63ecf3f67a7677ba77593 (diff) |
Rename Thread native methods to match OpenJDK 8u121-b13
Renames the following native methods:
* nativeSetPriority -> setPriority0
* nativeSetName -> setNativeName
* nativeInterrupt -> interrupt0
Tested using:
make checkbuild, flash and CtsLibcoreTestCases
art/test/testrunner/run_build_test_target.py -j80 art-test
Bug: 80180276
Test: see above
Change-Id: I83ac240dfc108a2bf7f6c33895c9046b74707072
Diffstat (limited to 'runtime/native/java_lang_Thread.cc')
-rw-r--r-- | runtime/native/java_lang_Thread.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/runtime/native/java_lang_Thread.cc b/runtime/native/java_lang_Thread.cc index 13871f7be7..b7f0a7aabc 100644 --- a/runtime/native/java_lang_Thread.cc +++ b/runtime/native/java_lang_Thread.cc @@ -122,7 +122,7 @@ static jboolean Thread_holdsLock(JNIEnv* env, jclass, jobject java_object) { return thread->HoldsLock(object); } -static void Thread_nativeInterrupt(JNIEnv* env, jobject java_thread) { +static void Thread_interrupt0(JNIEnv* env, jobject java_thread) { ScopedFastNativeObjectAccess soa(env); MutexLock mu(soa.Self(), *Locks::thread_list_lock_); Thread* thread = Thread::FromManagedThread(soa, java_thread); @@ -131,7 +131,7 @@ static void Thread_nativeInterrupt(JNIEnv* env, jobject java_thread) { } } -static void Thread_nativeSetName(JNIEnv* env, jobject peer, jstring java_name) { +static void Thread_setNativeName(JNIEnv* env, jobject peer, jstring java_name) { ScopedUtfChars name(env, java_name); { ScopedObjectAccess soa(env); @@ -168,7 +168,7 @@ static void Thread_nativeSetName(JNIEnv* env, jobject peer, jstring java_name) { * from Thread.MIN_PRIORITY to Thread.MAX_PRIORITY (1-10), with "normal" * threads at Thread.NORM_PRIORITY (5). */ -static void Thread_nativeSetPriority(JNIEnv* env, jobject java_thread, jint new_priority) { +static void Thread_setPriority0(JNIEnv* env, jobject java_thread, jint new_priority) { ScopedObjectAccess soa(env); MutexLock mu(soa.Self(), *Locks::thread_list_lock_); Thread* thread = Thread::FromManagedThread(soa, java_thread); @@ -200,9 +200,9 @@ static JNINativeMethod gMethods[] = { NATIVE_METHOD(Thread, nativeCreate, "(Ljava/lang/Thread;JZ)V"), NATIVE_METHOD(Thread, nativeGetStatus, "(Z)I"), NATIVE_METHOD(Thread, holdsLock, "(Ljava/lang/Object;)Z"), - FAST_NATIVE_METHOD(Thread, nativeInterrupt, "()V"), - NATIVE_METHOD(Thread, nativeSetName, "(Ljava/lang/String;)V"), - NATIVE_METHOD(Thread, nativeSetPriority, "(I)V"), + FAST_NATIVE_METHOD(Thread, interrupt0, "()V"), + NATIVE_METHOD(Thread, setNativeName, "(Ljava/lang/String;)V"), + NATIVE_METHOD(Thread, setPriority0, "(I)V"), FAST_NATIVE_METHOD(Thread, sleep, "(Ljava/lang/Object;JI)V"), NATIVE_METHOD(Thread, yield, "()V"), }; |