Stop using fancy C++ stuff in signal handler

Author: jbachorik

ddprof-lib/src/main/cpp/profiler.cpp

@@ -38,7 +38,6 @@
 #include <algorithm>
 #include <dlfcn.h>
 #include <fstream>
-#include <functional>
 #include <memory>
 #include <set>
 #include <signal.h>
@@ -947,7 +946,7 @@ bool Profiler::crashHandler(int signo, siginfo_t *siginfo, void *ucontext) {
     // the following checks require vmstructs and therefore HotSpot
 
     // this check can longjmp to a completely different location - need to call exitCrashHandler() before
-    StackWalker::checkFault(std::bind(&ProfiledThread::exitCrashHandler, thrd));
+    StackWalker::checkFault(thrd);
 
     // Workaround for JDK-8313796. Setting cstack=dwarf also helps
     if (VMStructs::isInterpretedFrameValidFunc((const void *)pc) &&

ddprof-lib/src/main/cpp/stackWalker.cpp

@@ -454,11 +454,11 @@ int StackWalker::walkVM(void *ucontext, ASGCT_CallFrame *frames, int max_depth,
   return depth;
 }
 
-void StackWalker::checkFault(std::function<void()> cleanup) {
+void StackWalker::checkFault(ProfiledThread* thrd) {
   VMThread *vm_thread = VMThread::current();
   if (vm_thread != NULL && sameStack(vm_thread->exception(), &vm_thread)) {
-    if (cleanup) {
-      cleanup();
+    if (thrd) {
+      thrd->exitCrashHandler();
     }
     longjmp(*(jmp_buf *)vm_thread->exception(), 1);
   }

ddprof-lib/src/main/cpp/stackWalker.h

@@ -17,6 +17,7 @@
 #ifndef _STACKWALKER_H
 #define _STACKWALKER_H
 
+#include "thread.h"
 #include "vmEntry.h"
 #include <functional>
 #include <stdint.h>
@@ -43,7 +44,7 @@ class StackWalker {
                     const void *_termination_frame_begin,
                     const void *_termination_frame_end);
 
-  static void checkFault(std::function<void()> cleanup);
+  static void checkFault(ProfiledThread* thrd);
 };
 
 #endif // _STACKWALKER_H