Roman's comments

Author: zhengyu123

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

@@ -690,11 +690,11 @@ enum JVMJavaThreadState {
 };
 
 DECLARE(VMThread)
+  friend class JVMThread;
   public:
     static void* initialize(jthread thread);
 
     static inline VMThread* current();
-    static inline int nativeThreadId(JNIEnv* jni, jthread thread);
     static inline VMThread* fromJavaThread(JNIEnv* env, jthread thread);
     static ExecutionMode getExecutionMode();
     static OSThreadState getOSThreadState();
@@ -782,6 +782,8 @@ DECLARE(VMThread)
     }
 
     inline VMMethod* compiledMethod();
+private:
+    static inline int nativeThreadId(JNIEnv* jni, jthread thread);
 DECLARE_END
 
 DECLARE(VMConstMethod)

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

@@ -22,7 +22,6 @@ VMThread* VMThread::fromJavaThread(JNIEnv* env, jthread thread) {
 }
 
 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;

ddprof-lib/src/main/cpp/j9/j9Ext.h

@@ -71,6 +71,8 @@ static inline int sanitizeJ9FrameType(jint j9_type) {
 }
 
 class J9Ext {
+  friend class JVMThread;
+  friend class J9WallClock;
 private:
   static jvmtiEnv *_jvmti;
 
@@ -119,14 +121,6 @@ class J9Ext {
 
   static bool initialize(jvmtiEnv *jvmti, const void *j9thread_self);
 
-  static int GetOSThreadID(jthread thread) {
-    jlong thread_id;
-    return JVMTI_EXT(_GetOSThreadID, jthread, jlong *)(_jvmti, thread,
-                                                       &thread_id) == 0
-               ? (int)thread_id
-               : -1;
-  }
-
   static JNIEnv *GetJ9vmThread(jthread thread) {
     JNIEnv *result;
     return JVMTI_EXT(_GetJ9vmThread, jthread, JNIEnv **)(_jvmti, thread,
@@ -176,6 +170,15 @@ class J9Ext {
   }
 
   static int InstrumentableObjectAlloc_id;
+
+private:
+    static int GetOSThreadID(jthread thread) {
+      jlong thread_id;
+      return JVMTI_EXT(_GetOSThreadID, jthread, jlong *)(_jvmti, thread,
+                                                         &thread_id) == 0
+                 ? (int)thread_id
+                 : -1;
+    }
 };
 
 #endif // _J9_J9EXT_H

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

@@ -12,6 +12,7 @@
 #include "stackFrame.h"
 #include "symbols.h"
 #include "hotspot/vmStructs.inline.h"
+#include "jvmThread.h"
 #include "thread.h"