Skip to content
Permalink
Browse files

Merge

  • Loading branch information
AlanBateman committed Nov 14, 2019
2 parents 2716973 + f062010 commit 68405c7c9051b2750cd579fb6edf645e1b04b773
Showing with 11 additions and 11 deletions.
  1. +9 −9 src/hotspot/share/prims/jvmtiEnv.cpp
  2. +2 −2 src/hotspot/share/prims/jvmtiEnvBase.hpp
@@ -1591,7 +1591,7 @@ JvmtiEnv::GetStackTrace(jthread thread, jint start_depth, jint max_frame_count,

// Support for ordinary threads
ThreadsListHandle tlh(current_thread);
err = get_JavaThread(tlh, thread, &java_thread);
err = get_JavaThread(tlh.list(), thread, &java_thread);
if (err != JVMTI_ERROR_NONE) {
return err;
}
@@ -1667,7 +1667,7 @@ JvmtiEnv::GetFrameCount(jthread thread, jint* count_ptr) {

// Support for ordinary threads
ThreadsListHandle tlh(current_thread);
err = get_JavaThread(tlh, thread, &java_thread);
err = get_JavaThread(tlh.list(), thread, &java_thread);
if (err != JVMTI_ERROR_NONE) {
return err;
}
@@ -1820,7 +1820,7 @@ JvmtiEnv::GetFrameLocation(jthread thread, jint depth, jmethodID* method_ptr, jl

// Support for ordinary threads
ThreadsListHandle tlh(current_thread);
err = get_JavaThread(tlh, thread, &java_thread);
err = get_JavaThread(tlh.list(), thread, &java_thread);
if (err != JVMTI_ERROR_NONE) {
return err;
}
@@ -2143,7 +2143,7 @@ JvmtiEnv::GetLocalObject(jthread thread, jint depth, jint slot, jobject* value_p
} else {
// Support for ordinary threads
ThreadsListHandle tlh(current_thread);
err = get_JavaThread(tlh, thread, &java_thread);
err = get_JavaThread(tlh.list(), thread, &java_thread);
if (err != JVMTI_ERROR_NONE) {
return err;
}
@@ -2180,7 +2180,7 @@ JvmtiEnv::GetLocalInstance(jthread thread, jint depth, jobject* value_ptr){
} else {
// Support for ordinary threads
ThreadsListHandle tlh(current_thread);
err = get_JavaThread(tlh, thread, &java_thread);
err = get_JavaThread(tlh.list(), thread, &java_thread);
if (err != JVMTI_ERROR_NONE) {
return err;
}
@@ -2218,7 +2218,7 @@ JvmtiEnv::GetLocalInt(jthread thread, jint depth, jint slot, jint* value_ptr) {
} else {
// Support for ordinary threads
ThreadsListHandle tlh(current_thread);
err = get_JavaThread(tlh, thread, &java_thread);
err = get_JavaThread(tlh.list(), thread, &java_thread);
if (err != JVMTI_ERROR_NONE) {
return err;
}
@@ -2256,7 +2256,7 @@ JvmtiEnv::GetLocalLong(jthread thread, jint depth, jint slot, jlong* value_ptr)
} else {
// Support for ordinary threads
ThreadsListHandle tlh(current_thread);
err = get_JavaThread(tlh, thread, &java_thread);
err = get_JavaThread(tlh.list(), thread, &java_thread);
if (err != JVMTI_ERROR_NONE) {
return err;
}
@@ -2294,7 +2294,7 @@ JvmtiEnv::GetLocalFloat(jthread thread, jint depth, jint slot, jfloat* value_ptr
} else {
// Support for ordinary threads
ThreadsListHandle tlh(current_thread);
err = get_JavaThread(tlh, thread, &java_thread);
err = get_JavaThread(tlh.list(), thread, &java_thread);
if (err != JVMTI_ERROR_NONE) {
return err;
}
@@ -2332,7 +2332,7 @@ JvmtiEnv::GetLocalDouble(jthread thread, jint depth, jint slot, jdouble* value_p
} else {
// Support for ordinary threads
ThreadsListHandle tlh(current_thread);
err = get_JavaThread(tlh, thread, &java_thread);
err = get_JavaThread(tlh.list(), thread, &java_thread);
if (err != JVMTI_ERROR_NONE) {
return err;
}
@@ -154,12 +154,12 @@ class JvmtiEnvBase : public CHeapObj<mtInternal> {
return byte_offset_of(JvmtiEnvBase, _jvmti_external);
};

static jvmtiError get_JavaThread(ThreadsListHandle tlh, jthread thread, JavaThread ** jt_pp) {
static jvmtiError get_JavaThread(ThreadsList* tlist, jthread thread, JavaThread** jt_pp) {
jvmtiError err = JVMTI_ERROR_NONE;
if (thread == NULL) {
*jt_pp = JavaThread::current();
} else {
err = JvmtiExport::cv_external_thread_to_JavaThread(tlh.list(), thread, jt_pp, NULL);
err = JvmtiExport::cv_external_thread_to_JavaThread(tlist, thread, jt_pp, NULL);
}
return err;
}

0 comments on commit 68405c7

Please sign in to comment.
You can’t perform that action at this time.