v8

Author: zhengyu123

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

@@ -7,7 +7,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdarg.h>
-#include "hotspot/vmStructs.h"
+#include "hotspot/vmStructs.inline.h"
 #include "vmEntry.h"
 #include "jniHelper.h"
 #include "jvmHeap.h"
@@ -79,7 +79,7 @@ DECLARE_LONG_CONSTANTS_DO(INIT_LONG_CONSTANT, INIT_LONG_CONSTANT)
 #undef INIT_INT_CONSTANT
 #undef INIT_LONG_CONSTANT
 
-
+jfieldID VMStructs::_eetop = NULL;
 jfieldID VMStructs::_klass = NULL;
 intptr_t VMStructs::_env_offset = -1;
 void* VMStructs::_java_thread_vtbl[6];
@@ -605,26 +605,27 @@ void VMStructs::checkNativeBinding(jvmtiEnv *jvmti, JNIEnv *jni,
     jvmti->Deallocate((unsigned char *)method_name);
 }
 
-void VMThread::initialize(void* current) {
-    VMThread* vm_thread = VMThread::cast(current);
+void* VMThread::initialize(jthread thread) {
+    JNIEnv* env = VM::jni();
+    jclass thread_class = env->FindClass("java/lang/Thread");
+    if (thread_class == NULL) {
+        env->ExceptionClear();
+        return nullptr;
+    }
+
+    // Get eetop field - a bridge from Java Thread to VMThread
+    if ((_eetop = env->GetFieldID(thread_class, "eetop", "J")) == NULL) {
+        // No such field - probably not a HotSpot JVM
+        env->ExceptionClear();
+        return nullptr;
+    }
+
+    VMThread* vm_thread = fromJavaThread(env, thread);
     assert(vm_thread != nullptr);
     _has_native_thread_id = _thread_osthread_offset >= 0 && _osthread_id_offset >= 0;
-    JNIEnv* env = VM::jni();
     _env_offset = (intptr_t)env - (intptr_t)vm_thread;
     memcpy(_java_thread_vtbl, vm_thread->vtable(), sizeof(_java_thread_vtbl));
-}
-
-VMThread* VMThread::current() {
-    return VMThread::cast(JVMThread::current());
-}
-
-int VMThread::nativeThreadId(JNIEnv* jni, jthread thread) {
-//    assert(_has_native_thread_id);
-    if (_has_native_thread_id) {
-        VMThread* vm_thread = cast(JVMThread::fromJavaThread(jni, thread));
-        return vm_thread != NULL ? vm_thread->osThreadId() : -1;
-    }
-    return -1;
+    return (void*)vm_thread;
 }
 
 int VMThread::osThreadId() {

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

@@ -351,6 +351,7 @@ class VMStructs {
 #undef DECLARE_LONG_CONSTANT_VAR
 
 
+    static jfieldID _eetop;
     static jfieldID _klass;
     static intptr_t _env_offset;
     static void* _java_thread_vtbl[6];
@@ -690,13 +691,13 @@ enum JVMJavaThreadState {
 
 DECLARE(VMThread)
   public:
-    static void initialize(void* current);
+    static void* initialize(jthread thread);
 
     static inline VMThread* current();
-    static int nativeThreadId(JNIEnv* jni, jthread thread);
+    static inline int nativeThreadId(JNIEnv* jni, jthread thread);
+    static inline VMThread* fromJavaThread(JNIEnv* env, jthread thread);
 
     int osThreadId();
-
     JNIEnv* jni();
 
     const void** vtable() {

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

@@ -6,9 +6,28 @@
 
 #include "hotspot/vmStructs.h"
 #include "jvmThread.h"
+
 VMThread* VMThread::current() {
-    void* current = JVMThread::current();
-    return VMThread::cast(current);
+    return VMThread::cast(JVMThread::current());
+}
+
+VMThread* VMThread::fromJavaThread(JNIEnv* env, jthread thread) {
+    assert(_eetop != nullptr);
+    if (_eetop != nullptr) {
+        void* thr = (void*)env->GetLongField(thread, _eetop);
+        return VMThread::cast(thr);
+    } else {
+        return nullptr;
+    }
+}
+
+int VMThread::nativeThreadId(JNIEnv* jni, jthread thread) {
+//    assert(_has_native_thread_id);
+    if (_has_native_thread_id) {
+        VMThread* vm_thread = fromJavaThread(jni, thread);
+        return vm_thread != NULL ? vm_thread->osThreadId() : -1;
+    }
+    return -1;
 }
 
 VMNMethod* VMMethod::code() {

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

@@ -22,13 +22,13 @@
 #include "common.h"
 #include "engine.h"
 #include "incbin.h"
+#include "jvmThread.h"
 #include "os.h"
 #include "otel_process_ctx.h"
 #include "profiler.h"
 #include "thread.h"
 #include "tsc.h"
 #include "vmEntry.h"
-#include "hotspot/vmStructs.h"
 #include "wallClock.h"
 #include <errno.h>
 #include <fstream>
@@ -296,7 +296,7 @@ Java_com_datadoghq_profiler_JavaProfiler_recordQueueEnd0(
   if (tid < 0) {
     return;
   }
-  int origin_tid = VMThread::nativeThreadId(env, origin);
+  int origin_tid = JVMThread::native_thread_id(env, origin);
   if (origin_tid < 0) {
     return;
   }

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

@@ -4,6 +4,7 @@
  */
 
 #include "jvmThread.h"
+#include "hotspot/vmStructs.inline.h"
 #include "j9/j9Ext.h"
 
 pthread_key_t JVMThread::_thread_key = pthread_key_t(-1);
@@ -22,17 +23,14 @@ bool JVMThread::initialize() {
         break;
     }
   }
-
   assert(_tid != nullptr);
-  assert(!VM::isHotspot() || _eetop != nullptr);
-
-  if (VM::isHotspot()) {
-    VMThread::initialize(current_thread);
-  }
-
   return true;
 }
 
+int JVMThread::native_thread_id(JNIEnv* jni, jthread thread) {
+    return VM::isOpenJ9() ? J9Ext::GetOSThreadID(thread) : VMThread::nativeThreadId(jni, thread);
+}
+
 void* JVMThread::current_thread_slow() {
     jthread thread;
     if (VM::jvmti()->GetCurrentThread(&thread) != JVMTI_ERROR_NONE) {
@@ -46,16 +44,9 @@ void* JVMThread::current_thread_slow() {
         return nullptr;
     }
 
-    // Get eetop field - a bridge from Java Thread to VMThread
-    if ((_eetop = env->GetFieldID(thread_class, "eetop", "J")) == NULL) {
-       // No such field - probably not a HotSpot JVM
-       env->ExceptionClear();
-    }
-
     if (VM::isOpenJ9()) {
       return J9Ext::j9thread_self();
     } else {
-      assert(_eetop != nullptr);
-      return (void*)env->GetLongField(thread, _eetop);
+      return VMThread::initialize(thread);
     }
 }

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

@@ -41,17 +41,7 @@ class JVMThread {
         return _thread_key;
     }
 
-    static inline int native_thread_id(JNIEnv* jni, jthread thread) {
-        return VM::isOpenJ9() ? J9Ext::GetOSThreadID(thread) : VMThread::nativeThreadId(jni, thread);
-    }
-
-    static void* fromJavaThread(JNIEnv* env, jthread thread) {
-        if (_eetop != nullptr) {
-            return (void*)env->GetLongField(thread, _eetop);
-        } else {
-            return nullptr;
-        }
-    }
+    static int native_thread_id(JNIEnv* jni, jthread thread);
 
     static inline jlong javaThreadId(JNIEnv* env, jthread thread) {
        return env->GetLongField(thread, _tid);

ddprof-test/src/test/java/com/datadoghq/profiler/queue/QueueTimeTest.java

@@ -44,7 +44,8 @@ private Task(JavaProfiler profiler) {
         public void run() {
             profiler.setContext(1, 2);
             long now = profiler.getCurrentTicks();
-            if (profiler.isThresholdExceeded(9, start, now)) {
+            if (profiler.isThresholdExceeded(1, start, now)) {
+                System.out.println("Emitting QueueTime event");
                 profiler.recordQueueTime(start, now, getClass(), QueueTimeTest.class, ArrayBlockingQueue.class, 10, origin);
             }
             profiler.clearContext();