infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8366659: Addressed reviewer's comment.

Browse Source
This commit is contained in:
Anton Artemov 2026-01-26 15:37:53 +01:00
parent 31779cad9f
commit a3f07b94cb
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/hotspot/share/runtime/objectMonitor.cpp
View File

@ -2096,7 +2096,7 @@ bool ObjectMonitor::notify_internal(JavaThread* current) {
// _wait_set_lock protects the wait queue, not the entry_list. We could // _wait_set_lock protects the wait queue, not the entry_list. We could
// move the add-to-entry_list operation, above, outside the critical section // move the add-to-entry_list operation, above, outside the critical section
// protected by _wait_set_lock. In practice that's not useful. With the // protected by _wait_set_lock. In practice that's not useful. With the
// exception of wait() timeouts and interrupts the monitor owner // exception of wait() timeouts and interrupts the monitor owner
// is the only thread that grabs _wait_set_lock. There's almost no contention // is the only thread that grabs _wait_set_lock. There's almost no contention
// on _wait_set_lock so it's not profitable to reduce the length of the // on _wait_set_lock so it's not profitable to reduce the length of the
// critical section. // critical section.
@ -2239,7 +2239,9 @@ bool ObjectMonitor::vthread_wait_reenter(JavaThread* current, ObjectWaiter* node
// If this was an interrupted case, set the _interrupted boolean so that // If this was an interrupted case, set the _interrupted boolean so that
// once we re-acquire the monitor we know if we need to throw IE or not. // once we re-acquire the monitor we know if we need to throw IE or not.
ObjectWaiter::TStates state = node->TState; ObjectWaiter::TStates state = node->TState;
assert(was_notified || state == ObjectWaiter::TS_RUN, ""); assert(was_notified || state == ObjectWaiter::TS_RUN,
"was not notified and is not in the right state: was_notified = %s, state = %s",
was_notified ? "true" : "false", node->getTStateName(state));
node->_interrupted = node->_interruptible && !was_notified && current->is_interrupted(false); node->_interrupted = node->_interruptible && !was_notified && current->is_interrupted(false);
// Post JFR and JVMTI events. If non-interruptible we are in // Post JFR and JVMTI events. If non-interruptible we are in
@ -2546,6 +2548,23 @@ ObjectWaiter::ObjectWaiter(JavaThread* current) {
_active = false; _active = false;
} }
const char* ObjectWaiter::getTStateName(ObjectWaiter::TStates state) {
switch (state) {
case ObjectWaiter::TS_UNDEF:
return "TS_UNDEF";
case ObjectWaiter::TS_READY:
return "TS_READY";
case ObjectWaiter::TS_RUN:
return "TS_RUN";
case ObjectWaiter::TS_WAIT:
return "TS_WAIT";
case ObjectWaiter::TS_ENTER:
return "TS_ENTER";
default:
ShouldNotReachHere();
}
}
ObjectWaiter::ObjectWaiter(oop vthread, ObjectMonitor* mon) : ObjectWaiter(nullptr) { ObjectWaiter::ObjectWaiter(oop vthread, ObjectMonitor* mon) : ObjectWaiter(nullptr) {
assert(oopDesc::is_oop(vthread), ""); assert(oopDesc::is_oop(vthread), "");
_vthread = OopHandle(JavaThread::thread_oop_storage(), vthread); _vthread = OopHandle(JavaThread::thread_oop_storage(), vthread);

2
src/hotspot/share/runtime/objectMonitor.hpp
View File

@ -71,7 +71,7 @@ class ObjectWaiter : public CHeapObj<mtThread> {
oop vthread() const; oop vthread() const;
void wait_reenter_begin(ObjectMonitor *mon); void wait_reenter_begin(ObjectMonitor *mon);
void wait_reenter_end(ObjectMonitor *mon); void wait_reenter_end(ObjectMonitor *mon);
const char* getTStateName(TStates state);
void set_bad_pointers() { void set_bad_pointers() {
#ifdef ASSERT #ifdef ASSERT
this->_prev = (ObjectWaiter*) badAddressVal; this->_prev = (ObjectWaiter*) badAddressVal;