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

8270894: Use acquire semantics in ObjectSynchronizer::read_stable_mark() #1507

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jun 29, 2023

Unclean backport to improve synchronization code reliability. Does not apply cleanly due to later BiasedLocking retirement, which failed a hunk in ObjectSynchronizer::inflate_helper, applied that hunk by hand. Additionally, I rewrote the new definition to match what upstream has. This completes the JDK-8272654 backport.

Additional testing:

  • Linux x86_64 fastdebug tier1
  • Linux x86_64 fastdebug tier2
  • Linux x86_64 fastdebug tier3

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-8270894: Use acquire semantics in ObjectSynchronizer::read_stable_mark() (Enhancement - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1507/head:pull/1507
$ git checkout pull/1507

Update a local copy of the PR:
$ git checkout pull/1507
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1507/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1507

View PR using the GUI difftool:
$ git pr show -t 1507

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1507.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 29, 2023

👋 Welcome back shade! 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 openjdk bot changed the title Backport f22619032df2cf45664f110c71ddf509a5128900 8270894: Use acquire semantics in ObjectSynchronizer::read_stable_mark() Jun 29, 2023
@openjdk
Copy link

openjdk bot commented Jun 29, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jun 29, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 29, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 29, 2023

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

8270894: Use acquire semantics in ObjectSynchronizer::read_stable_mark()

Reviewed-by: phh, rkennke

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 16 new commits pushed to the master branch:

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 openjdk bot added the ready Pull request is ready to be integrated label Jun 29, 2023
Copy link
Contributor

@rkennke rkennke 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. Thanks!

@shipilev
Copy link
Member Author

shipilev commented Jul 4, 2023

Testing is clean. Reviews are here. Push approval is here.

/integrate

@openjdk
Copy link

openjdk bot commented Jul 4, 2023

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

  • 00c6470: 8270794: Avoid loading Klass* twice in TypeArrayKlass::oop_size()
  • 43d4d02: 8300098: java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java fails with internal timeout when executed with TieredCompilation1/3
  • 71f17d9: 8293811: Provide a reason for PassFailJFrame.forceFail
  • 996c6f7: 8282404: DrawStringWithInfiniteXform.java failed with "RuntimeException: drawString with InfiniteXform transform takes long time"
  • 17744ca: 8291444: GHA builds/tests won't run manually if disabled from automatic running
  • 4c5dd40: 8308872: enhance logging and some exception in krb5/Config.java
  • 788d658: 8306135: Clean up and open source some AWT tests
  • 2f31b3f: 8306575: Clean up and open source four Dialog related tests
  • a72bdbf: 8303047: avoid NULL after 8301661
  • 62140e2: 8290469: Add new positioning options to PassFailJFrame test framework
  • ... and 14 more: https://git.openjdk.org/jdk17u-dev/compare/95b4ddc74f6253e611b493d24a5693130c7a9e17...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 4, 2023

@shipilev Pushed as commit 8d6c17d.

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

@shipilev shipilev deleted the JDK-8270894-mark-acquire branch July 20, 2023 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
3 participants