archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 02:54:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8143911: Reintegrate JEP 259: Stack-Walking API

Browse source 
Co-authored-by: Brent Christian <brent.christian@oracle.com>
Co-authored-by: Daniel Fuchs <daniel.fuchs@oracle.com>
Co-authored-by: Hamlin Li <huaming.li@oracle.com>
Reviewed-by: coleenp, dfuchs, bchristi, psandoz, sspitsyn
This commit is contained in:
Mandy Chung 2015-11-24 14:59:17 -08:00
parent 7171a533ff
commit 2b732b223e
14 changed files with 1080 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

89
hotspot/src/share/vm/prims/jvm.cpp
View file

@ -46,6 +46,7 @@
#include "prims/jvmtiThreadState.hpp"
#include "prims/nativeLookup.hpp"
#include "prims/privilegedStack.hpp"
#include "prims/stackwalk.hpp"
#include "runtime/arguments.hpp"
#include "runtime/atomic.inline.hpp"
#include "runtime/handles.inline.hpp"
@ -547,6 +548,94 @@ JVM_ENTRY(jobject, JVM_GetStackTraceElement(JNIEnv *env, jobject throwable, jint
JVM_END
// java.lang.StackWalker //////////////////////////////////////////////////////
JVM_ENTRY(jobject, JVM_CallStackWalk(JNIEnv *env, jobject stackStream, jlong mode,
jint skip_frames, jint frame_count, jint start_index,
jobjectArray classes,
jobjectArray frames))
JVMWrapper("JVM_CallStackWalk");
JavaThread* jt = (JavaThread*) THREAD;
if (!jt->is_Java_thread() || !jt->has_last_Java_frame()) {
THROW_MSG_(vmSymbols::java_lang_InternalError(), "doStackWalk: no stack trace", NULL);
}
Handle stackStream_h(THREAD, JNIHandles::resolve_non_null(stackStream));
objArrayOop ca = objArrayOop(JNIHandles::resolve_non_null(classes));
objArrayHandle classes_array_h(THREAD, ca);
// frames array is null when only getting caller reference
objArrayOop fa = objArrayOop(JNIHandles::resolve(frames));
objArrayHandle frames_array_h(THREAD, fa);
int limit = start_index + frame_count;
if (classes_array_h->length() < limit) {
THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(), "not enough space in buffers", NULL);
}
Handle result = StackWalk::walk(stackStream_h, mode, skip_frames, frame_count,
start_index, classes_array_h,
frames_array_h, CHECK_NULL);
return JNIHandles::make_local(env, result());
JVM_END
JVM_ENTRY(jint, JVM_MoreStackWalk(JNIEnv *env, jobject stackStream, jlong mode, jlong anchor,
jint frame_count, jint start_index,
jobjectArray classes,
jobjectArray frames))
JVMWrapper("JVM_MoreStackWalk");
JavaThread* jt = (JavaThread*) THREAD;
objArrayOop ca = objArrayOop(JNIHandles::resolve_non_null(classes));
objArrayHandle classes_array_h(THREAD, ca);
// frames array is null when only getting caller reference
objArrayOop fa = objArrayOop(JNIHandles::resolve(frames));
objArrayHandle frames_array_h(THREAD, fa);
int limit = start_index+frame_count;
if (classes_array_h->length() < limit) {
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "not enough space in buffers");
}
Handle stackStream_h(THREAD, JNIHandles::resolve_non_null(stackStream));
return StackWalk::moreFrames(stackStream_h, mode, anchor, frame_count,
start_index, classes_array_h,
frames_array_h, THREAD);
JVM_END
JVM_ENTRY(void, JVM_FillStackFrames(JNIEnv *env, jclass stackStream,
jint start_index,
jobjectArray frames,
jint from_index, jint to_index))
JVMWrapper("JVM_FillStackFrames");
if (TraceStackWalk) {
tty->print("JVM_FillStackFrames() start_index=%d from_index=%d to_index=%d\n",
start_index, from_index, to_index);
}
JavaThread* jt = (JavaThread*) THREAD;
objArrayOop fa = objArrayOop(JNIHandles::resolve_non_null(frames));
objArrayHandle frames_array_h(THREAD, fa);
if (frames_array_h->length() < to_index) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "array length not matched");
}
for (int i = from_index; i < to_index; i++) {
Handle stackFrame(THREAD, frames_array_h->obj_at(i));
java_lang_StackFrameInfo::fill_methodInfo(stackFrame, CHECK);
}
JVM_END
JVM_ENTRY(void, JVM_SetMethodInfo(JNIEnv *env, jobject frame))
JVMWrapper("JVM_SetMethodInfo");
Handle stackFrame(THREAD, JNIHandles::resolve(frame));
java_lang_StackFrameInfo::fill_methodInfo(stackFrame, THREAD);
JVM_END
// java.lang.Object ///////////////////////////////////////////////