66
77#include " profiler.h"
88#include " asyncSampleMutex.h"
9- #include " common.h"
109#include " context.h"
1110#include " counters.h"
1211#include " ctimer.h"
@@ -278,7 +277,7 @@ int Profiler::getNativeTrace(void *ucontext, ASGCT_CallFrame *frames,
278277 PerfEvents::walkKernel (tid, callchain + native_frames,
279278 MAX_NATIVE_FRAMES - native_frames, java_ctx);
280279 }
281- if (_cstack = = CSTACK_VM) {
280+ if (_cstack > = CSTACK_VM) {
282281 return 0 ;
283282 } else if (_cstack == CSTACK_DWARF) {
284283 native_frames += StackWalker::walkDwarf (ucontext, callchain + native_frames,
@@ -395,7 +394,7 @@ int Profiler::getJavaTraceAsync(void *ucontext, ASGCT_CallFrame *frames,
395394 if (in_java && java_ctx->sp != 0 ) {
396395 // skip ahead to the Java frames before calling AGCT
397396 frame.restore ((uintptr_t )java_ctx->pc , java_ctx->sp , java_ctx->fp );
398- } else if (state != 0 && vm_thread->lastJavaSP () == 0 ) {
397+ } else if (state != 0 && ( vm_thread->anchor () == nullptr || vm_thread-> anchor ()-> lastJavaSP () == 0 ) ) {
399398 // we haven't found the top Java frame ourselves, and the lastJavaSP wasn't
400399 // recorded either when not in the Java state, lastJava ucontext will be
401400 // used by AGCT
@@ -474,14 +473,16 @@ int Profiler::getJavaTraceAsync(void *ucontext, ASGCT_CallFrame *frames,
474473 }
475474 } else if (trace.num_frames == ticks_unknown_not_Java &&
476475 !(_safe_mode & LAST_JAVA_PC)) {
477- uintptr_t &sp = vm_thread->lastJavaSP ();
478- uintptr_t &pc = vm_thread->lastJavaPC ();
479- if (sp != 0 && pc == 0 ) {
476+ JavaFrameAnchor* anchor = vm_thread->anchor ();
477+ uintptr_t sp = anchor->lastJavaSP ();
478+ const void * pc = anchor->lastJavaPC ();
479+ if (sp != 0 && pc == NULL ) {
480480 // We have the last Java frame anchor, but it is not marked as walkable.
481481 // Make it walkable here
482- pc = ((uintptr_t *)sp)[-1 ];
482+ pc = ((const void **)sp)[-1 ];
483+ anchor->setLastJavaPC (pc);
483484
484- NMethod *m = CodeHeap::findNMethod (( const void *) pc);
485+ NMethod *m = CodeHeap::findNMethod (pc);
485486 if (m != NULL ) {
486487 // AGCT fails if the last Java frame is a Runtime Stub with an invalid
487488 // _frame_complete_offset. In this case we patch _frame_complete_offset
@@ -491,28 +492,29 @@ int Profiler::getJavaTraceAsync(void *ucontext, ASGCT_CallFrame *frames,
491492 m->setFrameCompleteOffset (0 );
492493 }
493494 VM::_asyncGetCallTrace (&trace, max_depth, ucontext);
494- } else if (_libs->findLibraryByAddress (( const void *) pc) != NULL ) {
495+ } else if (_libs->findLibraryByAddress (pc) != NULL ) {
495496 VM::_asyncGetCallTrace (&trace, max_depth, ucontext);
496497 }
497498
498- pc = 0 ;
499+ anchor-> setLastJavaPC ( nullptr ) ;
499500 }
500501 } else if (trace.num_frames == ticks_not_walkable_not_Java &&
501502 !(_safe_mode & LAST_JAVA_PC)) {
502- uintptr_t &sp = vm_thread->lastJavaSP ();
503- uintptr_t &pc = vm_thread->lastJavaPC ();
504- if (sp != 0 && pc != 0 ) {
503+ JavaFrameAnchor* anchor = vm_thread->anchor ();
504+ uintptr_t sp = anchor->lastJavaSP ();
505+ const void * pc = anchor->lastJavaPC ();
506+ if (sp != 0 && pc != NULL ) {
505507 // Similar to the above: last Java frame is set,
506508 // but points to a Runtime Stub with an invalid _frame_complete_offset
507- NMethod *m = CodeHeap::findNMethod (( const void *) pc);
509+ NMethod *m = CodeHeap::findNMethod (pc);
508510 if (m != NULL && !m->isNMethod () && m->frameSize () > 0 &&
509511 m->frameCompleteOffset () == -1 ) {
510512 m->setFrameCompleteOffset (0 );
511513 VM::_asyncGetCallTrace (&trace, max_depth, ucontext);
512514 }
513515 }
514516 } else if (trace.num_frames == ticks_GC_active && !(_safe_mode & GC_TRACES)) {
515- if (vm_thread->lastJavaSP () == 0 ) {
517+ if (vm_thread->anchor ()-> lastJavaSP () == 0 ) {
516518 // Do not add 'GC_active' for threads with no Java frames, e.g. Compiler
517519 // threads
518520 frame.restore (saved_pc, saved_sp, saved_fp);
@@ -671,28 +673,32 @@ void Profiler::recordSample(void *ucontext, u64 counter, int tid,
671673 ASGCT_CallFrame *native_stop = frames + num_frames;
672674 num_frames += getNativeTrace (ucontext, native_stop, event_type, tid,
673675 &java_ctx, &truncated);
674- if (_cstack == CSTACK_VM) {
675- num_frames +=
676- StackWalker::walkVM (ucontext, frames + num_frames, _max_stack_depth,
677- _call_stub_begin, _call_stub_end);
676+ if (_cstack == CSTACK_VMX) {
677+ num_frames += StackWalker::walkVM (ucontext, frames + num_frames, _max_stack_depth, VM_EXPERT, &truncated);
678678 } else if (event_type == BCI_CPU || event_type == BCI_WALL) {
679- int java_frames = 0 ;
680- {
679+ if (_cstack == CSTACK_VM) {
680+ num_frames += StackWalker::walkVM (ucontext, frames + num_frames, _max_stack_depth, VM_NORMAL, &truncated);
681+ } else {
681682 // Async events
682683 AsyncSampleMutex mutex (ProfiledThread::current ());
684+ int java_frames = 0 ;
683685 if (mutex.acquired ()) {
684- java_frames =
685- getJavaTraceAsync (ucontext, frames + num_frames, _max_stack_depth,
686- &java_ctx, &truncated);
686+ java_frames = getJavaTraceAsync (ucontext, frames + num_frames, _max_stack_depth, &java_ctx, &truncated);
687+ if (java_frames > 0 && java_ctx.pc != NULL && VMStructs::hasMethodStructs ()) {
688+ NMethod* nmethod = CodeHeap::findNMethod (java_ctx.pc );
689+ if (nmethod != NULL ) {
690+ fillFrameTypes (frames + num_frames, java_frames, nmethod);
691+ }
692+ }
687693 }
688- }
689- if (java_frames > 0 && java_ctx. pc != NULL ) {
690- NMethod * nmethod = CodeHeap::findNMethod (java_ctx. pc );
691- if (nmethod != NULL ) {
692- fillFrameTypes (frames + num_frames, java_frames, nmethod);
694+ if (java_frames > 0 && java_ctx. pc != NULL ) {
695+ NMethod *nmethod = CodeHeap::findNMethod (java_ctx. pc );
696+ if ( nmethod != NULL ) {
697+ fillFrameTypes (frames + num_frames, java_frames, nmethod);
698+ }
693699 }
700+ num_frames += java_frames;
694701 }
695- num_frames += java_frames;
696702 }
697703
698704 if (num_frames == 0 ) {
@@ -1058,7 +1064,7 @@ Error Profiler::checkJvmCapabilities() {
10581064 }
10591065 }
10601066
1061- if (!VMStructs::hasDebugSymbols () && !VM::isOpenJ9 ()) {
1067+ if (!VMStructs::libjvm ()-> hasDebugSymbols () && !VM::isOpenJ9 ()) {
10621068 Log::warn (" Install JVM debug symbols to improve profile accuracy"
10631069 }
10641070
@@ -1151,7 +1157,6 @@ Error Profiler::start(Arguments &args, bool reset) {
11511157 return Error (
11521158 " VMStructs stack walking is not supported on this JVM/platform"
11531159 }
1154- Log::info (" cstack=vm is an experimental option, use with care"
11551160 }
11561161
11571162 // Kernel symbols are useful only for perf_events without --all-user
@@ -1281,7 +1286,7 @@ Error Profiler::check(Arguments &args) {
12811286 return Error (" DWARF unwinding is not supported on this platform"
12821287 } else if (args._cstack == CSTACK_LBR && _cpu_engine != &perf_events) {
12831288 return Error (" Branch stack is supported only with PMU events"
1284- } else if (args. _cstack == CSTACK_VM && !VMStructs::hasStackStructs ()) {
1289+ } else if (_cstack >= CSTACK_VM && !( VMStructs::hasStackStructs () && OS::isLinux () )) {
12851290 return Error (
12861291 " VMStructs stack walking is not supported on this JVM/platform"
12871292 }
0 commit comments