linux fix + more cleanup

Author: Baraa-Hasheesh

src/dwarf.cpp

@@ -5,6 +5,10 @@
 
 #include <stdlib.h>
 #include "dwarf.h"
+
+#include <cstring>
+#include <stdio.h>
+
 #include "log.h"
 
 

src/perfEvents.h

@@ -45,7 +45,7 @@ class PerfEvents : public CpuEngine {
     const char* title();
     const char* units();
 
-    static int walk(int tid, void* ucontext, const void** callchain, int max_depth, StackContext* java_ctx);
+    static int walk(int tid, void* ucontext, const void** callchain, int max_depth, StackContext* stack_ctx);
     static void resetBuffer(int tid);
 
     static bool supported();

src/perfEvents_linux.cpp

@@ -896,7 +896,7 @@ void PerfEvents::stop() {
     J9StackTraces::stop();
 }
 
-int PerfEvents::walk(int tid, void* ucontext, const void** callchain, int max_depth, StackContext* java_ctx) {
+int PerfEvents::walk(int tid, void* ucontext, const void** callchain, int max_depth, StackContext* stack_ctx) {
     PerfEvent* event = &_events[tid];
     if (!event->tryLock()) {
         return 0;  // the event is being destroyed
@@ -917,7 +917,7 @@ int PerfEvents::walk(int tid, void* ucontext, const void** callchain, int max_de
 
             if (hdr->type == PERF_RECORD_SAMPLE) {
                 if (_record_cpu) {
-                    java_ctx->cpu = ring.next();
+                    stack_ctx->cpu = ring.next();
                 }
 
                 u64 nr = ring.next();
@@ -927,7 +927,6 @@ int PerfEvents::walk(int tid, void* ucontext, const void** callchain, int max_de
                         const void* iptr = (const void*)ip;
                         if (CodeHeap::contains(iptr) || depth >= max_depth) {
                             // Stop at the first Java frame
-                            java_ctx->pc = iptr;
                             goto stack_complete;
                         }
                         callchain[depth++] = iptr;
@@ -946,9 +945,9 @@ int PerfEvents::walk(int tid, void* ucontext, const void** callchain, int max_de
     event->unlock();
 
     if (_cstack == CSTACK_FP) {
-        depth += StackWalker::walkFP(ucontext, callchain + depth, max_depth - depth, java_ctx);
+        depth += StackWalker::walkFP(ucontext, callchain + depth, max_depth - depth);
     } else if (_cstack == CSTACK_DWARF) {
-        depth += StackWalker::walkDwarf(ucontext, callchain + depth, max_depth - depth, java_ctx);
+        depth += StackWalker::walkDwarf(ucontext, callchain + depth, max_depth - depth);
     }
 
     return depth;

src/stackFrame.h

@@ -49,7 +49,6 @@ class StackFrame {
     void ret();
 
     bool unwindStub(instruction_t* entry, const char* name, uintptr_t& pc, uintptr_t& sp, uintptr_t& fp);
-    bool unwindAtomicStub(const void*& pc);
 
     bool unwindPrologue(NMethod* nm, uintptr_t& pc, uintptr_t& sp, uintptr_t& fp);
     bool unwindEpilogue(NMethod* nm, uintptr_t& pc, uintptr_t& sp, uintptr_t& fp);

src/stackFrame_aarch64.cpp

@@ -292,19 +292,6 @@ bool StackFrame::unwindEpilogue(NMethod* nm, uintptr_t& pc, uintptr_t& sp, uintp
     return false;
 }
 
-bool StackFrame::unwindAtomicStub(const void*& pc) {
-    // VM threads may call generated atomic stubs, which are not normally walkable
-    const void* lr = (const void*)link();
-    if (VMStructs::libjvm()->contains(lr)) {
-        NMethod* nm = CodeHeap::findNMethod(pc);
-        if (nm != NULL && strncmp(nm->name(), "Stub", 4) == 0) {
-            pc = lr;
-            return true;
-        }
-    }
-    return false;
-}
-
 void StackFrame::adjustSP(const void* entry, const void* pc, uintptr_t& sp) {
     instruction_t* ip = (instruction_t*)pc;
     if (ip > entry && (ip[-1] == 0xa9bf27ff || (ip[-1] == 0xd63f0100 && ip[-2] == 0xa9bf27ff))) {

src/stackFrame_arm.cpp

@@ -93,11 +93,6 @@ bool StackFrame::unwindEpilogue(NMethod* nm, uintptr_t& pc, uintptr_t& sp, uintp
     return false;
 }
 
-bool StackFrame::unwindAtomicStub(const void*& pc) {
-    // Not needed
-    return false;
-}
-
 void StackFrame::adjustSP(const void* entry, const void* pc, uintptr_t& sp) {
     // Not needed
 }

src/stackFrame_i386.cpp

@@ -116,11 +116,6 @@ bool StackFrame::unwindEpilogue(NMethod* nm, uintptr_t& pc, uintptr_t& sp, uintp
     return false;
 }
 
-bool StackFrame::unwindAtomicStub(const void*& pc) {
-    // Not needed
-    return false;
-}
-
 void StackFrame::adjustSP(const void* entry, const void* pc, uintptr_t& sp) {
     // Not needed
 }

src/stackFrame_loongarch64.cpp

@@ -87,11 +87,6 @@ bool StackFrame::unwindEpilogue(NMethod* nm, uintptr_t& pc, uintptr_t& sp, uintp
     return false;
 }
 
-bool StackFrame::unwindAtomicStub(const void*& pc) {
-    // Not needed
-    return false;
-}
-
 void StackFrame::adjustSP(const void* entry, const void* pc, uintptr_t& sp) {
     // Not yet implemented
 }

src/stackFrame_ppc64.cpp

@@ -80,11 +80,6 @@ bool StackFrame::unwindEpilogue(NMethod* nm, uintptr_t& pc, uintptr_t& sp, uintp
     return false;
 }
 
-bool StackFrame::unwindAtomicStub(const void*& pc) {
-    // Not needed
-    return false;
-}
-
 void StackFrame::adjustSP(const void* entry, const void* pc, uintptr_t& sp) {
     // Not needed
 }

src/stackFrame_riscv64.cpp

@@ -87,11 +87,6 @@ bool StackFrame::unwindEpilogue(NMethod* nm, uintptr_t& pc, uintptr_t& sp, uintp
     return false;
 }
 
-bool StackFrame::unwindAtomicStub(const void*& pc) {
-    // Not needed
-    return false;
-}
-
 void StackFrame::adjustSP(const void* entry, const void* pc, uintptr_t& sp) {
     // Not yet implemented
 }