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

8334769: Shenandoah: Move CodeCache_lock close to its use in ShenandoahConcurrentNMethodIterator #19859

Closed
wants to merge 1 commit into from

Conversation

zhengyu123
Copy link
Contributor

@zhengyu123 zhengyu123 commented Jun 24, 2024

ShenandoahConcurrentNMethodIterator requires CodeCache_lock at begin and end of iteration.

Currently, the CodeCache_lock is acquired by their callers, which is not very obvious and readable. Let's move the lock inside the methods.


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-8334769: Shenandoah: Move CodeCache_lock close to its use in ShenandoahConcurrentNMethodIterator (Enhancement - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/19859/head:pull/19859
$ git checkout pull/19859

Update a local copy of the PR:
$ git checkout pull/19859
$ git pull https://git.openjdk.org/jdk.git pull/19859/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19859

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/19859.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 24, 2024

👋 Welcome back zgu! 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 Jun 24, 2024

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

8334769: Shenandoah: Move CodeCache_lock close to its use in ShenandoahConcurrentNMethodIterator

Reviewed-by: shade, wkemper, kdnilsen

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

  • b5d5896: 8335108: Build error after JDK-8333658 due to class templates
  • 5883a20: 8334437: De-duplicate ProxyMethod list creation
  • 8591eff: 8332103: since-checker - Add missing @ since tags to java.desktop
  • 8374d16: 8335006: C2 SuperWord: add JMH benchmark VectorLoadToStoreForwarding.java
  • 4ffc5e6: 8326705: Test CertMsgCheck.java fails to find alert certificate_required
  • efb905e: 8334618: ubsan: support setting additional ubsan check options
  • b2ac725: 8327380: Add tests for Shenandoah barrier expansion optimization
  • f23295e: 8334600: TEST java/net/MulticastSocket/IPMulticastIF.java fails on linux-aarch64
  • 741a0f3: 8334241: Adjust API docs side bar dimensions
  • 4ce8822: 8334037: Local class creation in lambda in pre-construction context crashes javac
  • ... and 28 more: https://git.openjdk.org/jdk/compare/5ac2149b7bde947886533bf5996d977bb8ec66f1...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 Jun 24, 2024

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

  • hotspot-gc
  • shenandoah

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-gc hotspot-gc-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels Jun 24, 2024
@zhengyu123 zhengyu123 marked this pull request as ready for review June 24, 2024 17:02
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 24, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 24, 2024

Webrevs

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Agree, it looks cleaner that way, and has a symmetry with how ShenandoahCodeRootsIterator does it.

@shipilev
Copy link
Member

@kdnilsen @earthling-amzn might need to take a look.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 24, 2024
@earthling-amzn
Copy link
Contributor

Looks good to me.

Copy link
Contributor

@kdnilsen kdnilsen left a comment

Choose a reason for hiding this comment

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

Thanks.

@zhengyu123
Copy link
Contributor Author

/integrate

Thanks, @shipilev @earthling-amzn and @kdnilsen

@openjdk
Copy link

openjdk bot commented Jun 26, 2024

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

  • 817edcb: 8331411: Shenandoah: Reconsider spinning duration in ShenandoahLock
  • bffc848: 8333755: NumberFormat integer only parsing breaks when format has suffix
  • b5d5896: 8335108: Build error after JDK-8333658 due to class templates
  • 5883a20: 8334437: De-duplicate ProxyMethod list creation
  • 8591eff: 8332103: since-checker - Add missing @ since tags to java.desktop
  • 8374d16: 8335006: C2 SuperWord: add JMH benchmark VectorLoadToStoreForwarding.java
  • 4ffc5e6: 8326705: Test CertMsgCheck.java fails to find alert certificate_required
  • efb905e: 8334618: ubsan: support setting additional ubsan check options
  • b2ac725: 8327380: Add tests for Shenandoah barrier expansion optimization
  • f23295e: 8334600: TEST java/net/MulticastSocket/IPMulticastIF.java fails on linux-aarch64
  • ... and 30 more: https://git.openjdk.org/jdk/compare/5ac2149b7bde947886533bf5996d977bb8ec66f1...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 26, 2024

@zhengyu123 Pushed as commit 4ebb771.

💡 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
hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated shenandoah shenandoah-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

4 participants