Skip to content
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

Closed
wants to merge 9 commits into from

Conversation

AlanBateman
Copy link
Contributor

@AlanBateman AlanBateman commented Dec 12, 2024

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

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8346120: VirtualThreadPinned event recorded for Object.wait may have wrong duration or may record second event (Bug - P4)

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

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 12, 2024

👋 Welcome back alanb! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Dec 12, 2024

@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:

8346120: VirtualThreadPinned event recorded for Object.wait may have wrong duration or may record second event

Reviewed-by: dholmes, pchilanomate

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 master branch:

  • 87804f2: 8346294: Invalid lint category specified in compiler.properties
  • 18d1d61: 8346046: Enable copyright header format check
  • a7631cc: 8346235: RISC-V: Optimize bitwise AND with mask values
  • 929d4a5: 8346231: RISC-V: Fix incorrect assertion in SharedRuntime::generate_handler_blob
  • 3030230: 8346278: Clean up some flag handing in flags-cflags.m4
  • fd0207d: 8345327: JDK 24 RDP1 L10n resource files update
  • 31c3b19: 8346174: UMAX/UMIN are missing from XXXVector::reductionOperations
  • c75b1d4: 8346082: Output JVMTI agent information in hserr files
  • 51662c2: 8346232: Remove leftovers of the jar --normalize feature
  • d335941: 8345678: compute_modifiers should not be in create_mirror
  • ... and 8 more: https://git.openjdk.org/jdk/compare/dbffe33251da4472945d97ab54c7e3354d7f42d2...master

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 master branch, type /integrate in a new comment.

@openjdk
Copy link

openjdk bot commented Dec 12, 2024

@AlanBateman The following labels will be automatically applied to this pull request:

  • core-libs
  • hotspot-runtime

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.

@openjdk openjdk bot added hotspot-runtime hotspot-runtime-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Dec 12, 2024
@AlanBateman AlanBateman marked this pull request as ready for review December 13, 2024 12:52
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 13, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 13, 2024

Webrevs

Copy link
Contributor

@pchilano pchilano left a 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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 13, 2024
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Dec 13, 2024
Copy link
Member

@dholmes-ora dholmes-ora left a 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.

@AlanBateman
Copy link
Contributor Author

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.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 17, 2024
@AlanBateman
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Dec 17, 2024

Going to push as commit fbbc7c3.
Since your change was applied there have been 20 commits pushed to the master branch:

  • 466c00a: 8346234: javax/swing/text/DefaultEditorKit/4278839/bug4278839.java still fails in CI
  • bd3c0be: 8268611: jar --validate should check targeted classes in MR-JAR files
  • 87804f2: 8346294: Invalid lint category specified in compiler.properties
  • 18d1d61: 8346046: Enable copyright header format check
  • a7631cc: 8346235: RISC-V: Optimize bitwise AND with mask values
  • 929d4a5: 8346231: RISC-V: Fix incorrect assertion in SharedRuntime::generate_handler_blob
  • 3030230: 8346278: Clean up some flag handing in flags-cflags.m4
  • fd0207d: 8345327: JDK 24 RDP1 L10n resource files update
  • 31c3b19: 8346174: UMAX/UMIN are missing from XXXVector::reductionOperations
  • c75b1d4: 8346082: Output JVMTI agent information in hserr files
  • ... and 10 more: https://git.openjdk.org/jdk/compare/dbffe33251da4472945d97ab54c7e3354d7f42d2...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 17, 2024
@openjdk openjdk bot closed this Dec 17, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 17, 2024
@openjdk
Copy link

openjdk bot commented Dec 17, 2024

@AlanBateman Pushed as commit fbbc7c3.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants