Skip to content

8356455: ZGC: Replace ZIntrusiveRBTree with IntrusiveRBTree#25112

Closed
xmas92 wants to merge 7 commits intoopenjdk:masterfrom
xmas92:JDK-8356455
Closed

8356455: ZGC: Replace ZIntrusiveRBTree with IntrusiveRBTree#25112
xmas92 wants to merge 7 commits intoopenjdk:masterfrom
xmas92:JDK-8356455

Conversation

@xmas92
Copy link
Member

@xmas92 xmas92 commented May 8, 2025

JDK-8350441 was implemented before IntrusiveRBTree was introduced, and as such implemented its own intrusive red-black tree. Now that a shared data structure implementation is available, use that instead.

The switch is straight forward, and the O(1) left and right most node lookup which ZIntrusiveRBTree implements that IntrusiveRBTree does not is trivial to implement on top of the tree.

Initial performance evaluation shows no difference between the two implementations. And the functional testing passes.

Tested Oracle Supported platforms, Oracle tier1-8 ZGC testing tasks.


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-8356455: ZGC: Replace ZIntrusiveRBTree with IntrusiveRBTree (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25112

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 8, 2025

👋 Welcome back aboldtch! 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 May 8, 2025

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

8356455: ZGC: Replace ZIntrusiveRBTree with IntrusiveRBTree

Reviewed-by: stefank, eosterlund, jsikstro

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 4 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 rfr Pull request is ready for review label May 8, 2025
@openjdk
Copy link

openjdk bot commented May 8, 2025

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

  • hotspot-gc

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-gc hotspot-gc-dev@openjdk.org label May 8, 2025
@mlbridge
Copy link

mlbridge bot commented May 8, 2025

Webrevs

Copy link
Contributor

@fisk fisk 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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 8, 2025
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label May 8, 2025
@xmas92
Copy link
Member Author

xmas92 commented May 8, 2025

@stefank had some comments about having to much logic inlined. So abstracted the extra tree logic into its own inner class. Currently re-running tests.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 12, 2025
Copy link
Member

@stefank stefank left a comment

Choose a reason for hiding this comment

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

Thanks for doing this cleanup. I have a few nits below.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label May 14, 2025
@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 20, 2025
@xmas92
Copy link
Member Author

xmas92 commented May 21, 2025

Thanks for the reviews
/integrate

@openjdk
Copy link

openjdk bot commented May 21, 2025

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 21, 2025

@xmas92 Pushed as commit 50e873f.

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

@xmas92 xmas92 deleted the JDK-8356455 branch January 5, 2026 06:06
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

Development

Successfully merging this pull request may close these issues.

4 participants