v9

Author: zhengyu123

ddprof-lib/src/main/cpp/hotspot/hotspotThreadState.h

@@ -0,0 +1,14 @@
+/*
+ * Copyright The async-profiler authors
+ * Copyright 2026 Datadog, Inc
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _HOTSPOT_HOTSPOTTHREADSTATE_H
+#define _HOTSPOT_HOTSPOTTHREADSTATE_H
+
+#include "threadState.h"
+
+ExecutionMode hotspotThreadExecutionMode();
+
+#endif // _HOTSPOT_HOTSPOTTHREADSTATE_H

ddprof-lib/src/main/cpp/wallClock.cpp …f-lib/src/main/cpp/hotspot/wallClock.cppddprof-lib/src/main/cpp/wallClock.cpp renamed to ddprof-lib/src/main/cpp/hotspot/wallClock.cpp ddprof-lib/src/main/cpp/wallClock.cpp renamed to ddprof-lib/src/main/cpp/hotspot/wallClock.cpp

@@ -1,10 +1,12 @@
 /*
  * Copyright The async-profiler authors
- * Copyright 2025, Datadog, Inc.
+ * Copyright 2026, Datadog, Inc.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "wallClock.h"
+#include "hotspot/wallClock.h"
+#include "hotspot/vmStructs.inline.h"
+
 #include "stackFrame.h"
 #include "context.h"
 #include "debugSupport.h"
@@ -78,7 +80,7 @@ void WallClockASGCT::signalHandler(int signo, siginfo_t *siginfo, void *ucontext
   }
 
   ExecutionEvent event;
-  VMThread *vm_thread =(VMThread*) JVMThread::current();
+  VMThread *vm_thread = VMThread::current();
   if (vm_thread != NULL && !vm_thread->isThreadAccessible()) {
       vm_thread = NULL;
   }

ddprof-lib/src/main/cpp/wallClock.h …rof-lib/src/main/cpp/hotspot/wallClock.hddprof-lib/src/main/cpp/wallClock.h renamed to ddprof-lib/src/main/cpp/hotspot/wallClock.h ddprof-lib/src/main/cpp/wallClock.h renamed to ddprof-lib/src/main/cpp/hotspot/wallClock.h

@@ -1,11 +1,11 @@
 /*
  * Copyright The async-profiler authors
- * Copyright 2025, Datadog, Inc.
+ * Copyright 2026, Datadog, Inc.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef _WALLCLOCK_H
-#define _WALLCLOCK_H
+#ifndef _HOTSPOT_WALLCLOCK_H
+#define _HOTSPOT_WALLCLOCK_H
 
 #include "engine.h"
 #include "os.h"
@@ -154,4 +154,4 @@ class WallClockASGCT : public BaseWallClock {
     }
 };
 
-#endif // _WALLCLOCK_H
+#endif // _HOTSPOT_WALLCLOCK_H

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

@@ -29,7 +29,6 @@
 #include "thread.h"
 #include "tsc.h"
 #include "vmEntry.h"
-#include "wallClock.h"
 #include <errno.h>
 #include <fstream>
 #include <sstream>

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

@@ -28,7 +28,7 @@
 #include "thread.h"
 #include "tsc.h"
 #include "hotspot/vmStructs.h"
-#include "wallClock.h"
+#include "hotspot/wallClock.h"
 #include <algorithm>
 #include <dlfcn.h>
 #include <fstream>

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

@@ -1,7 +1,6 @@
 #ifndef JAVA_PROFILER_LIBRARY_THREAD_STATE_H
 #define JAVA_PROFILER_LIBRARY_THREAD_STATE_H
 
-#include "jvmti.h"
 
 enum class OSThreadState : int {
   UNKNOWN = 0,
@@ -26,48 +25,6 @@ enum class ExecutionMode : int {
   SYSCALL = 5
 };
 
-static ExecutionMode convertJvmExecutionState(int state) {
-  switch (state) {
-  case 4:
-  case 5:
-    return ExecutionMode::NATIVE;
-  case 6:
-  case 7:
-    return ExecutionMode::JVM;
-  case 8:
-  case 9:
-    return ExecutionMode::JAVA;
-  case 10:
-  case 11:
-    return ExecutionMode::SAFEPOINT;
-  default:
-    return ExecutionMode::UNKNOWN;
-  }
-}
-
-/**
- * Determines the execution mode from a VMThread's state.
- *
- * This function distinguishes Java threads from JVM internal threads based on their state.
- * Java threads have states in [_thread_in_native, _thread_max_state) range [4, 12).
- * JVM internal threads (GC, Compiler) have state 0 or outside this range.
- *
- * CRITICAL: This function is safe to call from signal handlers. It does NOT call VM::jni()
- * which would trigger __tls_get_addr for thread-local JNIEnv lookup. If the signal interrupts
- * during TLS initialization (e.g., ForkJoinWorkerThread startup), VM::jni() would cause
- * re-entrant TLS allocation and heap corruption.
- *
- * Thread states are defined in OpenJDK:
- * https://github.com/openjdk/jdk/blob/master/src/hotspot/share/utilities/globalDefinitions.hpp
- * Search for "enum JavaThreadState"
- *
- * @param vm_thread The VMThread pointer (can be null)
- * @return ExecutionMode::UNKNOWN if vm_thread is null,
- *         ExecutionMode::JVM for JVM internal threads,
- *         or the appropriate execution mode for Java threads
- */
- class VMThread;
-
 inline ExecutionMode getThreadExecutionMode();
 
 #endif // JAVA_PROFILER_LIBRARY_THREAD_STATE_H