Automatic merge of jdk:master into master

duke · duke · commit 1aae0801d867 · 2023-12-06T22:59:41.000Z
diff --git a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "classfile/javaThreadStatus.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "jfr/recorder/jfrRecorder.hpp"
 #include "jfr/periodic/sampling/jfrCallTrace.hpp"
@@ -200,7 +201,7 @@ void OSThreadSampler::protected_task(const SuspendedThreadTaskContext& context)
       ev->set_starttime(_suspend_time);
       ev->set_endtime(_suspend_time); // fake to not take an end time
       ev->set_sampledThread(JfrThreadLocal::thread_id(jt));
-      ev->set_state(static_cast<u8>(java_lang_Thread::get_thread_status(_thread_oop)));
+      ev->set_state(static_cast<u8>(JavaThreadStatus::RUNNABLE));
     }
   }
 }
@@ -230,7 +231,7 @@ static void write_native_event(JfrThreadSampleClosure& closure, JavaThread* jt,
   EventNativeMethodSample *ev = closure.next_event_native();
   ev->set_starttime(JfrTicks::now());
   ev->set_sampledThread(JfrThreadLocal::thread_id(jt));
-  ev->set_state(static_cast<u8>(java_lang_Thread::get_thread_status(thread_oop)));
+  ev->set_state(static_cast<u8>(JavaThreadStatus::RUNNABLE));
 }
 
 void JfrNativeSamplerCallback::call() {

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`*/`
`24`	`24`
`25`	`25`	`#include "precompiled.hpp"`
	`26`	`+#include "classfile/javaThreadStatus.hpp"`
`26`	`27`	`#include "jfr/jfrEvents.hpp"`
`27`	`28`	`#include "jfr/recorder/jfrRecorder.hpp"`
`28`	`29`	`#include "jfr/periodic/sampling/jfrCallTrace.hpp"`
`@@ -200,7 +201,7 @@ void OSThreadSampler::protected_task(const SuspendedThreadTaskContext& context)`
`200`	`201`	`ev->set_starttime(_suspend_time);`
`201`	`202`	`ev->set_endtime(_suspend_time); // fake to not take an end time`
`202`	`203`	`ev->set_sampledThread(JfrThreadLocal::thread_id(jt));`
`203`		`- ev->set_state(static_cast<u8>(java_lang_Thread::get_thread_status(_thread_oop)));`
	`204`	`+ ev->set_state(static_cast<u8>(JavaThreadStatus::RUNNABLE));`
`204`	`205`	`}`
`205`	`206`	`}`
`206`	`207`	`}`
`@@ -230,7 +231,7 @@ static void write_native_event(JfrThreadSampleClosure& closure, JavaThread* jt,`
`230`	`231`	`EventNativeMethodSample *ev = closure.next_event_native();`
`231`	`232`	`ev->set_starttime(JfrTicks::now());`
`232`	`233`	`ev->set_sampledThread(JfrThreadLocal::thread_id(jt));`
`233`		`- ev->set_state(static_cast<u8>(java_lang_Thread::get_thread_status(thread_oop)));`
	`234`	`+ ev->set_state(static_cast<u8>(JavaThreadStatus::RUNNABLE));`
`234`	`235`	`}`
`235`	`236`
`236`	`237`	`void JfrNativeSamplerCallback::call() {`