-
Notifications
You must be signed in to change notification settings - Fork 5.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
8346120: VirtualThreadPinned event recorded for Object.wait may have wrong duration or may record second event #22718
Conversation
👋 Welcome back alanb! A progress list of the required criteria for merging this PR into |
@AlanBateman This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 18 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
@AlanBateman The following labels will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So to be clear ... you want one pinned event, the duration of which spans the wait and the monitor reentry. If we are pinned for the wait then we must be pinned for the reentry for the same reason, so no need to report the same thing twice.
Right, and also it would be confusing to have a "contended monitor enter" event recorded with Object.wait as the top frame in the stack trace. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Thanks
/integrate |
Going to push as commit fbbc7c3.
Your commit was automatically rebased without conflicts. |
@AlanBateman Pushed as commit fbbc7c3. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
A jdk.VirtualPinnedEvent JFR event is recorded by Object::wait when a virtual thread waits in Object.wait while pinned. The posting of the event in ObjectMonitor::wait is done after waiting but it can block again in enter/ReenterI before it re-acquires. If that happens then the event duration won't be accurate, and for the off-list case, the enter may be contended and a jdk.VirtualPinnedEvent event will be recorded for contended monitor enter. The changes to fix this are small: move the post of the event for Object.wait to end of the wait function, and only post an event for contended monitor enter when not waiting.
I've added a test to check the pinned event that is recored for several contended monitor enter and Object.wait cases. It checks the event duration and that only one event is recorded for each case.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22718/head:pull/22718
$ git checkout pull/22718
Update a local copy of the PR:
$ git checkout pull/22718
$ git pull https://git.openjdk.org/jdk.git pull/22718/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 22718
View PR using the GUI difftool:
$ git pr show -t 22718
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22718.diff
Using Webrev
Link to Webrev Comment