1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8065346: WB_AddToBootstrapClassLoaderSearch calls JvmtiEnv::create_a_jvmti when not in _thread_in_vm state

Browse Source 
Removed ThreadToNativeFromVM and use java_lang_String::as_utf8_string instead

Reviewed-by: dholmes, minqi
This commit is contained in:
Ioi Lam 2014-11-19 19:31:13 -08:00
parent 4151db8bfd
commit 68c088e66f
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hotspot/src/share/vm/prims/whitebox.cpp
View File

@ -116,24 +116,22 @@ WB_END
WB_ENTRY(void, WB_AddToBootstrapClassLoaderSearch(JNIEnv* env, jobject o, jstring segment)) {
#if INCLUDE_JVMTI
ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI
const char* seg = env->GetStringUTFChars(segment, NULL);
ResourceMark rm;
const char* seg = java_lang_String::as_utf8_string(JNIHandles::resolve_non_null(segment));
JvmtiEnv* jvmti_env = JvmtiEnv::create_a_jvmti(JVMTI_VERSION);
jvmtiError err = jvmti_env->AddToBootstrapClassLoaderSearch(seg);
assert(err == JVMTI_ERROR_NONE, "must not fail");
env->ReleaseStringUTFChars(segment, seg);
#endif
}
WB_END
WB_ENTRY(void, WB_AddToSystemClassLoaderSearch(JNIEnv* env, jobject o, jstring segment)) {
#if INCLUDE_JVMTI
ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI
const char* seg = env->GetStringUTFChars(segment, NULL);
ResourceMark rm;
const char* seg = java_lang_String::as_utf8_string(JNIHandles::resolve_non_null(segment));
JvmtiEnv* jvmti_env = JvmtiEnv::create_a_jvmti(JVMTI_VERSION);
jvmtiError err = jvmti_env->AddToSystemClassLoaderSearch(seg);
assert(err == JVMTI_ERROR_NONE, "must not fail");
env->ReleaseStringUTFChars(segment, seg);
#endif
}
WB_END