More cleanup

Author: zhengyu123

ddprof-lib/src/main/cpp/hotspot/vmStructs.cpp

@@ -678,8 +678,10 @@ ExecutionMode VMThread::getExecutionMode() {
 
 OSThreadState VMThread::getOSThreadState() {
   VMThread* vm_thread = VMThread::current();
-  assert(vm_thread != nullptr);
-  int raw_thread_state = vm_thread ? vm_thread->state() : 0;
+  if (vm_thread == nullptr) {
+    return OSThreadState::UNKNOWN;
+  }
+  int raw_thread_state = vm_thread->state();
   bool is_java_thread = raw_thread_state >= 4 && raw_thread_state < 12;
   OSThreadState state = OSThreadState::UNKNOWN;
   if (is_java_thread) {

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

@@ -21,6 +21,7 @@
 #include "counters.h"
 #include "common.h"
 #include "engine.h"
+#include "hotspot/vmStructs.h"
 #include "incbin.h"
 #include "jvmThread.h"
 #include "os.h"
@@ -295,7 +296,7 @@ Java_com_datadoghq_profiler_JavaProfiler_recordQueueEnd0(
   if (tid < 0) {
     return;
   }
-  int origin_tid = JVMThread::native_thread_id(env, origin);
+  int origin_tid = JVMThread::nativeThreadId(env, origin);
   if (origin_tid < 0) {
     return;
   }

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

@@ -6,12 +6,13 @@
 #include "jvmThread.h"
 #include "hotspot/vmStructs.inline.h"
 #include "j9/j9Ext.h"
+#include "vmEntry.h"
 
 pthread_key_t JVMThread::_thread_key = pthread_key_t(-1);
 jfieldID JVMThread::_tid = nullptr;
 
 bool JVMThread::initialize() {
-  void* current_thread = current_thread_slow();
+  void* current_thread = currentThreadSlow();
   if (current_thread == nullptr) {
     return false;
   }
@@ -26,11 +27,11 @@ bool JVMThread::initialize() {
   return _thread_key != pthread_key_t(-1);
 }
 
-int JVMThread::native_thread_id(JNIEnv* jni, jthread thread) {
+int JVMThread::nativeThreadId(JNIEnv* jni, jthread thread) {
     return VM::isOpenJ9() ? J9Ext::GetOSThreadID(thread) : VMThread::nativeThreadId(jni, thread);
 }
 
-void* JVMThread::current_thread_slow() {
+void* JVMThread::currentThreadSlow() {
     jthread thread;
     if (VM::jvmti()->GetCurrentThread(&thread) != JVMTI_ERROR_NONE) {
         return nullptr;

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

@@ -8,12 +8,9 @@
 
 #include <cassert>
 #include <jni.h>
+#include <jvmti.h>
 #include <pthread.h>
 
-#include "hotspot/vmStructs.h"
-#include "j9/j9Ext.h"
-#include "vmEntry.h"
-
 /**
  * JVMThread represents a native JVM thread that is JVM implementation agnostic
  */
@@ -23,7 +20,7 @@ class JVMThread {
     static jfieldID _tid;
 
 public:
-    static bool is_initialized() {
+    static bool isInitialized() {
         return _thread_key != pthread_key_t(-1);
     }
 
@@ -33,14 +30,15 @@ class JVMThread {
      */
     static bool initialize();
     static inline void* current() {
+        assert(isInitialized());
         return pthread_getspecific(_thread_key);
     }
 
     static inline pthread_key_t key() {
         return _thread_key;
     }
 
-    static int native_thread_id(JNIEnv* jni, jthread thread);
+    static int nativeThreadId(JNIEnv* jni, jthread thread);
 
     static inline jlong javaThreadId(JNIEnv* env, jthread thread) {
        return env->GetLongField(thread, _tid);
@@ -51,7 +49,7 @@ class JVMThread {
     }
 
 private:
-    static void* current_thread_slow();
+    static void* currentThreadSlow();
 };
 
 #endif // _JVMTHREAD_H

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

@@ -168,7 +168,7 @@ static void **_pthread_entry = NULL;
 // pthread_setspecific(). HotSpot puts VMThread into TLS on thread start, and
 // resets on thread end.
 static int pthread_setspecific_hook(pthread_key_t key, const void *value) {
-  assert(JVMThread::is_initialized());
+  assert(JVMThread::isInitialized());
   if (JVMThread::key() != key) {
     return pthread_setspecific(key, value);
   }

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

@@ -142,7 +142,7 @@ void Profiler::onThreadEnd(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread) {
     ProfiledThread::release();
   } else {
     // ProfiledThread already cleaned up - try to get tid from JVMTI as fallback
-    tid = JVMThread::native_thread_id(jni, thread);
+    tid = JVMThread::nativeThreadId(jni, thread);
     if (tid < 0) {
       // No ProfiledThread AND can't get tid from JVMTI - nothing we can do
       return;
@@ -1154,7 +1154,7 @@ void Profiler::updateThreadName(jvmtiEnv *jvmti, JNIEnv *jni, jthread thread,
     native_thread_id = ProfiledThread::currentTid();
     assert(native_thread_id != -1);
   } else {
-    native_thread_id = JVMThread::native_thread_id(jni, thread);
+    native_thread_id = JVMThread::nativeThreadId(jni, thread);
   }
 
   if (native_thread_id >= 0 &&
@@ -1274,7 +1274,7 @@ Engine *Profiler::selectAllocEngine(Arguments &args) {
 }
 
 Error Profiler::checkJvmCapabilities() {
-  if (!JVMThread::is_initialized()) {
+  if (!JVMThread::isInitialized()) {
     return Error("Could not find JVMThread bridge. Unsupported JVM?");
   }
 

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

@@ -848,7 +848,7 @@ __attribute__((no_sanitize("address"))) int StackWalker::walkVM(void* ucontext,
 }
 
 void StackWalker::checkFault(ProfiledThread* thrd) {
-    if (!JVMThread::is_initialized()) {
+    if (!JVMThread::isInitialized()) {
         // JVM has not been loaded or VMStructs have not been initialized yet
         return;
     }

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

@@ -1,5 +1,5 @@
-#ifndef JAVA_PROFILER_LIBRARY_THREAD_STATE_H
-#define JAVA_PROFILER_LIBRARY_THREAD_STATE_H
+#ifndef _THREADSTATE_H
+#define _THREADSTATE_H
 
 
 enum class OSThreadState : int {
@@ -28,4 +28,4 @@ enum class ExecutionMode : int {
 inline ExecutionMode getThreadExecutionMode();
 inline OSThreadState getOSThreadState();
 
-#endif // JAVA_PROFILER_LIBRARY_THREAD_STATE_H
+#endif // _THREADSTATE_H

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

@@ -1,3 +1,12 @@
+/*
+ * Copyright The async-profiler authors
+ * Copyright 2026 Datadog, Inc
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _THREADSTATE_INLINE_H
+#define _THREADSTATE_INLINE_H
+
 #include "threadState.h"
 #include "hotspot/vmStructs.h"
 
@@ -10,3 +19,5 @@ inline OSThreadState getOSThreadState() {
     return VM::isHotspot() ? VMThread::getOSThreadState() :
                              OSThreadState::UNKNOWN;
 }
+
+#endif // _THREADSTATE_INLINE_H