Mercurial > hg > truffle

comparison src/share/vm/prims/jvmtiExport.cpp @ 4137:04b9a2566eec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hsx23/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 17 Dec 2011 21:40:27 +0100
parents a6eef545f1a2
children 4ceaf61479fc
comparison
equal deleted inserted replaced
3737:9dc19b7d89a3 4137:04b9a2566eec
371 371
372 if (JvmtiEnv::get_phase() == JVMTI_PHASE_LIVE) { 372 if (JvmtiEnv::get_phase() == JVMTI_PHASE_LIVE) {
373 JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread(); 373 JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread();
374 // transition code: native to VM 374 // transition code: native to VM
375 ThreadInVMfromNative __tiv(current_thread); 375 ThreadInVMfromNative __tiv(current_thread);
376 __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) 376 VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
377 debug_only(VMNativeEntryWrapper __vew;) 377 debug_only(VMNativeEntryWrapper __vew;)
378 378
379 JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version); 379 JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
380 *penv = jvmti_env->jvmti_external(); // actual type is jvmtiEnv* -- not to be confused with JvmtiEnv* 380 *penv = jvmti_env->jvmti_external(); // actual type is jvmtiEnv* -- not to be confused with JvmtiEnv*
381 return JNI_OK; 381 return JNI_OK;