8362239: Reconcile enter_internal and reenter_internal in the ObjectMonitor code #26858
+85
−121
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
👋 Welcome back toxaart! A progress list of the required criteria for merging this PR into |
|
❗ This change is not yet ready to be integrated. |
toxaart
force-pushed
the
JDK-object-monitor-experiments-reconcile-enter-reenter-attempt5
branch
6 times, most recently
from
54f64a0 to
8a0d56b
Compare
toxaart
force-pushed
the
JDK-object-monitor-experiments-reconcile-enter-reenter-attempt5
branch
from
8a0d56b to
bcea486
Compare
dholmes-ora
reviewed
Aug 21, 2025
| @@ -1935,7 +1900,7 @@ void ObjectMonitor::wait(jlong millis, bool interruptible, TRAPS) { | |||
| enter(current); | |||
| } else { | |||
| guarantee(v == ObjectWaiter::TS_ENTER, "invariant"); | |||
| reenter_internal(current, &node); | |||
| enter_internal(current, &node, true); | |||
There was a problem hiding this comment.
Suggested change
| enter_internal(current, &node, true); | |
| enter_internal(current, &node, true /* do_reenter */); |
dholmes-ora
reviewed
Aug 21, 2025
Comment on lines
+977
to
+981
| // As an aside, if were to ever rewrite the synchronization code mostly | ||
| // in Java, WaitNodes, ObjectMonitors, and Events would become 1st-class | ||
| // Java objects. This would avoid awkward lifecycle and liveness issues, | ||
| // as well as eliminate a subset of ABA issues. | ||
| // TODO: eliminate ObjectWaiter and enqueue either Threads or Events. |
There was a problem hiding this comment.
Side issue: I think this commentary can be removed now.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please consider the following changes:
The two methods of the
ObjectMonitorclass, namelyenter_internal()andreenter_internal(), are reconciled. As a result,reenter_internal()is removed, whereasenter_internal()is modified.The modification affects the range of the code, where the thread is in the blocked state. Now, it is only a small part in the innermost loop of the method. However, suspension of the "contender" thread is not allowed on the initial entrance, as this can potentially lead to a deadlock: if the "contender" thread is suspended in the innermost loop, and the "resumer" thread is parked, no one will be making progress as the "resumer" thread cannot be woken up, as the "contender" thread has not yet exited the monitor to unpark the "resumer".
In this sense, the initial entrance to the monitor is considered to be atomic, i.e. it is either completed, or not done at all. This means it should not be interrupted by a suspension request. The re-entrance to the monitor, however, allows suspension, as the monitor has been already owned by a "contender" thread.
Tested in tiers 1-5.
Progress
Issue
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26858/head:pull/26858$ git checkout pull/26858Update a local copy of the PR:
$ git checkout pull/26858$ git pull https://git.openjdk.org/jdk.git pull/26858/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 26858View PR using the GUI difftool:
$ git pr show -t 26858Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26858.diff
Using Webrev
Link to Webrev Comment