ThreadID

Author: xmas92

src/hotspot/share/classfile/javaClasses.hpp

@@ -410,7 +410,7 @@ class java_lang_Thread : AllStatic {
   // Stack size hint
   static jlong stackSize(oop java_thread);
   // Thread ID
-  static int64_t thread_id(oop java_thread);
+  static ThreadID thread_id(oop java_thread);
   static ByteSize thread_id_offset();
   // Continuation
   static inline oop continuation(oop java_thread);

src/hotspot/share/classfile/javaClasses.inline.hpp

@@ -34,6 +34,7 @@
 #include "oops/oop.inline.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "oops/typeArrayOop.inline.hpp"
+#include "runtime/threadIdentifier.hpp"
 
 void java_lang_String::set_coder(oop string, jbyte coder) {
   string->byte_field_put(_coder_offset, coder);
@@ -211,8 +212,8 @@ inline oop java_lang_Thread::continuation(oop java_thread) {
   return java_thread->obj_field(_continuation_offset);
 }
 
-inline int64_t java_lang_Thread::thread_id(oop java_thread) {
-  return java_thread->long_field(_tid_offset);
+inline ThreadID java_lang_Thread::thread_id(oop java_thread) {
+  return static_cast<ThreadID>(java_thread->long_field(_tid_offset));
 }
 
 inline oop java_lang_VirtualThread::vthread_scope() {

src/hotspot/share/include/jvm.h

@@ -323,6 +323,9 @@ JVM_FindScopedValueBindings(JNIEnv *env, jclass threadClass);
 JNIEXPORT jlong JNICALL
 JVM_GetNextThreadIdOffset(JNIEnv *env, jclass threadClass);
 
+JNIEXPORT jlong JNICALL
+JVM_GetPrimordialThreadId(JNIEnv *env, jclass threadClass);
+
 /*
  * jdk.internal.vm.Continuation
  */

src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.cpp

@@ -90,10 +90,10 @@ traceid JfrThreadId::id(const Thread* t, oop vthread) {
     return os_id(t);
   }
   if (vthread != nullptr) {
-    return java_lang_Thread::thread_id(vthread);
+    return static_cast<traceid>(java_lang_Thread::thread_id(vthread));
   }
   const oop thread_obj = JavaThread::cast(t)->threadObj();
-  return thread_obj != nullptr ? java_lang_Thread::thread_id(thread_obj) : 0;
+  return thread_obj != nullptr ? static_cast<traceid>(java_lang_Thread::thread_id(thread_obj)) : 0;
 }
 
 traceid JfrThreadId::os_id(const Thread* t) {

src/hotspot/share/jvmci/vmStructs_jvmci.cpp

@@ -225,7 +225,7 @@
   nonstatic_field(JavaThread,                  _vthread,                                      OopHandle)                             \
   nonstatic_field(JavaThread,                  _scopedValueCache,                             OopHandle)                             \
   nonstatic_field(JavaThread,                  _anchor,                                       JavaFrameAnchor)                       \
-  nonstatic_field(JavaThread,                  _lock_id,                                      int64_t)                               \
+  nonstatic_field(JavaThread,                  _lock_id,                                      ThreadID)                              \
   nonstatic_field(JavaThread,                  _vm_result,                                    oop)                                   \
   nonstatic_field(JavaThread,                  _stack_overflow_state._stack_overflow_limit,   address)                               \
   volatile_nonstatic_field(JavaThread,         _exception_oop,                                oop)                                   \
@@ -330,7 +330,7 @@
   volatile_nonstatic_field(ObjectMonitor,      _recursions,                                   intptr_t)                              \
   volatile_nonstatic_field(ObjectMonitor,      _cxq,                                          ObjectWaiter*)                         \
   volatile_nonstatic_field(ObjectMonitor,      _EntryList,                                    ObjectWaiter*)                         \
-  volatile_nonstatic_field(ObjectMonitor,      _succ,                                         int64_t)                               \
+  volatile_nonstatic_field(ObjectMonitor,      _succ,                                         ThreadID)                              \
   volatile_nonstatic_field(ObjectMonitor,      _stack_locker,                                 BasicLock*)                            \
                                                                                                                                      \
   volatile_nonstatic_field(oopDesc,            _mark,                                         markWord)                              \

src/hotspot/share/prims/jvm.cpp

@@ -3097,13 +3097,17 @@ JVM_ENTRY(void, JVM_SetCurrentThread(JNIEnv* env, jobject thisThread,
 JVM_END
 
 JVM_ENTRY_NO_ENV(void, JVM_SetCurrentLockId(JNIEnv* env, jclass threadClass, jlong tid))
-  thread->set_lock_id(tid);
+  thread->set_lock_id(static_cast<ThreadID>(tid));
 JVM_END
 
 JVM_ENTRY(jlong, JVM_GetNextThreadIdOffset(JNIEnv* env, jclass threadClass))
   return static_cast<jlong>(ThreadIdentifier::unsafe_offset());
 JVM_END
 
+JVM_ENTRY(jlong, JVM_GetPrimordialThreadId(JNIEnv* env, jclass threadClass))
+  return static_cast<jlong>(ThreadID::PRIMORDIAL_TID);
+JVM_END
+
 JVM_ENTRY(void, JVM_Interrupt(JNIEnv* env, jobject jthread))
   ThreadsListHandle tlh(thread);
   JavaThread* receiver = nullptr;

src/hotspot/share/prims/jvmtiTagMap.cpp

@@ -2271,7 +2271,7 @@ class StackRefCollector {
 bool StackRefCollector::set_thread(oop o) {
   _threadObj = o;
   _thread_tag = tag_for(_tag_map, _threadObj);
-  _tid = java_lang_Thread::thread_id(_threadObj);
+  _tid = static_cast<jlong>(java_lang_Thread::thread_id(_threadObj));
 
   _is_top_frame = true;
   _depth = 0;
@@ -2819,7 +2819,7 @@ inline bool VM_HeapWalkOperation::collect_stack_refs(JavaThread* java_thread,
       return false;
     }
     // no last java frame but there may be JNI locals
-    blk->set_context(tag_for(_tag_map, threadObj), java_lang_Thread::thread_id(threadObj), 0, (jmethodID)nullptr);
+    blk->set_context(tag_for(_tag_map, threadObj), static_cast<jlong>(java_lang_Thread::thread_id(threadObj)), 0, (jmethodID)nullptr);
     java_thread->active_handles()->oops_do(blk);
     return !blk->stopped();
   }

src/hotspot/share/prims/jvmtiThreadState.cpp

@@ -444,7 +444,7 @@ JvmtiVTMSTransitionDisabler::start_VTMS_transition(jthread vthread, bool is_moun
 
   // Do not allow suspends inside VTMS transitions.
   // Block while transitions are disabled or there are suspend requests.
-  int64_t thread_id = java_lang_Thread::thread_id(vth());  // Cannot use oops while blocked.
+  ThreadID thread_id = java_lang_Thread::thread_id(vth());  // Cannot use oops while blocked.
 
   if (_VTMS_transition_disable_for_all_count > 0 ||
       java_lang_Thread::VTMS_transition_disable_count(vth()) > 0 ||
@@ -505,7 +505,7 @@ JvmtiVTMSTransitionDisabler::finish_VTMS_transition(jthread vthread, bool is_mou
   if (!sync_protocol_enabled()) {
     return;
   }
-  int64_t thread_id = java_lang_Thread::thread_id(vt);
+  ThreadID thread_id = java_lang_Thread::thread_id(vt);
 
   // Unblock waiting VTMS transition disablers.
   if (_VTMS_transition_disable_for_one_count > 0 ||
@@ -706,7 +706,7 @@ JvmtiVTSuspender::register_all_vthreads_resume() {
 
 void
 JvmtiVTSuspender::register_vthread_suspend(oop vt) {
-  int64_t id = java_lang_Thread::thread_id(vt);
+  ThreadID id = java_lang_Thread::thread_id(vt);
   MonitorLocker ml(JvmtiVTMSTransition_lock);
 
   if (_SR_mode == SR_all) {
@@ -723,7 +723,7 @@ JvmtiVTSuspender::register_vthread_suspend(oop vt) {
 
 void
 JvmtiVTSuspender::register_vthread_resume(oop vt) {
-  int64_t id = java_lang_Thread::thread_id(vt);
+  ThreadID id = java_lang_Thread::thread_id(vt);
   MonitorLocker ml(JvmtiVTMSTransition_lock);
 
   if (_SR_mode == SR_all) {
@@ -743,7 +743,7 @@ JvmtiVTSuspender::register_vthread_resume(oop vt) {
 }
 
 bool
-JvmtiVTSuspender::is_vthread_suspended(int64_t thread_id) {
+JvmtiVTSuspender::is_vthread_suspended(ThreadID thread_id) {
   bool suspend_is_needed =
    (_SR_mode == SR_all && !_not_suspended_list->contains(thread_id)) ||
    (_SR_mode == SR_ind && _suspended_list->contains(thread_id));

src/hotspot/share/prims/jvmtiThreadState.hpp

@@ -137,9 +137,9 @@ class JvmtiVTMSTransitionDisabler {
 // Used for Virtual Threads Suspend/Resume management.
 // It's a list of thread IDs.
 //
-class VirtualThreadList : public GrowableArrayCHeap<int64_t, mtServiceability> {
+class VirtualThreadList : public GrowableArrayCHeap<ThreadID, mtServiceability> {
  public:
-  VirtualThreadList() : GrowableArrayCHeap<int64_t, mtServiceability>(0) {}
+  VirtualThreadList() : GrowableArrayCHeap<ThreadID, mtServiceability>(0) {}
   void invalidate() { clear(); }
 };
 
@@ -168,7 +168,7 @@ class JvmtiVTSuspender : AllStatic {
   static void register_vthread_suspend(oop vt);
   static void register_vthread_resume(oop vt);
   static bool is_vthread_suspended(oop vt);
-  static bool is_vthread_suspended(int64_t thread_id);
+  static bool is_vthread_suspended(ThreadID thread_id);
 };
 
 ///////////////////////////////////////////////////////////////

src/hotspot/share/prims/whitebox.cpp

@@ -2535,7 +2535,7 @@ WB_END
 //
 WB_ENTRY(void, WB_CheckThreadObjOfTerminatingThread(JNIEnv* env, jobject wb, jobject target_handle))
   oop target_oop = JNIHandles::resolve_non_null(target_handle);
-  jlong tid = java_lang_Thread::thread_id(target_oop);
+  ThreadID tid = java_lang_Thread::thread_id(target_oop);
   JavaThread* target = java_lang_Thread::thread(target_oop);
 
   // Grab a ThreadsListHandle to protect the target thread whilst terminating