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

8317240: Promptly free OopMapEntry after fail to insert the entry to OopMapCache #15963

Closed
wants to merge 1 commit into from

Conversation

zhengyu123
Copy link
Contributor

@zhengyu123 zhengyu123 commented Sep 28, 2023

In OopMapCache::lookup(), after fail to insert newly created OopMapEntry to the cache, the new entry can be free immediately, because it is not published, not accessible by other thread.

The patch also refactored code a bit to reduce duplicate.

Test:
hotspot_gc on MacOSX (fastdebug and release)


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-8317240: Promptly free OopMapEntry after fail to insert the entry to OopMapCache (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15963

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 28, 2023

👋 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 openjdk bot added the rfr Pull request is ready for review label Sep 28, 2023
@openjdk
Copy link

openjdk bot commented Sep 28, 2023

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

  • hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Sep 28, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 28, 2023

Webrevs

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

Yes, this seems reasonable and nice to have a function for the duplicated deallocation code.

@openjdk
Copy link

openjdk bot commented Oct 5, 2023

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

8317240: Promptly free OopMapEntry after fail to insert the entry to OopMapCache

Reviewed-by: coleenp, fparain

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

  • 4c5b66d: 8317522: Test logic for BODY_CF in AbstractThrowingSubscribers.java is wrong
  • 42be238: 8316523: Relativize esp in interpreter frames (PowerPC only)
  • a250ae4: 8317039: Enable specifying the JDK used to run jtreg
  • 1ed9c76: 8309204: Obsolete DoReserveCopyInSuperWord
  • 3630af2: 8316594: C2 SuperWord: wrong result with hand unrolled loops
  • c6c69b5: 8314654: Metaspace: move locking out of MetaspaceArena
  • 3105538: 8316146: Open some swing tests 4
  • 36314a9: 8267509: Improve IllegalAccessException message to include the cause of the exception
  • ddacf92: 8305765: CompressedClassPointers.java is unreliable due to ASLR
  • 4195246: 8317354: Serial: Move DirtyCardToOopClosure to gc/serial folder
  • ... and 89 more: https://git.openjdk.org/jdk/compare/347bd15e49f5632e16d0ae4dd7240a3648baf539...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 openjdk bot added the ready Pull request is ready to be integrated label Oct 5, 2023
Copy link
Contributor

@fparain fparain left a comment

Choose a reason for hiding this comment

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

LGTM

Fred

@zhengyu123
Copy link
Contributor Author

Thanks, @coleenp and @fparain

@zhengyu123
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 5, 2023

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

  • 4c5b66d: 8317522: Test logic for BODY_CF in AbstractThrowingSubscribers.java is wrong
  • 42be238: 8316523: Relativize esp in interpreter frames (PowerPC only)
  • a250ae4: 8317039: Enable specifying the JDK used to run jtreg
  • 1ed9c76: 8309204: Obsolete DoReserveCopyInSuperWord
  • 3630af2: 8316594: C2 SuperWord: wrong result with hand unrolled loops
  • c6c69b5: 8314654: Metaspace: move locking out of MetaspaceArena
  • 3105538: 8316146: Open some swing tests 4
  • 36314a9: 8267509: Improve IllegalAccessException message to include the cause of the exception
  • ddacf92: 8305765: CompressedClassPointers.java is unreliable due to ASLR
  • 4195246: 8317354: Serial: Move DirtyCardToOopClosure to gc/serial folder
  • ... and 89 more: https://git.openjdk.org/jdk/compare/347bd15e49f5632e16d0ae4dd7240a3648baf539...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 5, 2023

@zhengyu123 Pushed as commit a8eacb3.

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

@zhengyu123 zhengyu123 deleted the JDK-8317240 branch October 27, 2023 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
3 participants