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

8258252: Move PtrQueue enqueue to PtrQueueSet subclasses #1776

Closed
wants to merge 3 commits into from

Conversation

@kimbarrett
Copy link

@kimbarrett kimbarrett commented Dec 15, 2020

Please review this refactoring in the PtrQueue/PtrQueueSet hierarchy.

The functions PtrQueue::enqueue and PtrQueue::enqueue_known_active are
removed, along with the helper virtual function PtrQueue::handle_completed_buffer.

Instead we now have G1{Dirty,Redirty}CardQueueSet::enqueue and SATBMarkQueueSet::enqueue/enqueue_known_active, each tailored to the corresponding specific behavior. They use some shared helper routines from PtrQueueSet, and the PtrQueue buffer and index have been made accessible to clients.

Testing:
mach5 tier1-3, 5 (stress tests)
Local (linux-x64) tier1 with -XX:+UseShenandoahGC

/label hotspot


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8258252: Move PtrQueue enqueue to PtrQueueSet subclasses

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1776/head:pull/1776
$ git checkout pull/1776

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 15, 2020

👋 Welcome back kbarrett! 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.

Loading

@openjdk openjdk bot added the hotspot label Dec 15, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 15, 2020

@kimbarrett
The hotspot label was successfully added.

Loading

@kimbarrett kimbarrett marked this pull request as ready for review Dec 15, 2020
@openjdk openjdk bot added the rfr label Dec 15, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 15, 2020

Webrevs

Loading

Copy link
Contributor

@tschatzl tschatzl left a comment

Lgtm.

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Dec 15, 2020

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

8258252: Move PtrQueue enqueue to PtrQueueSet subclasses

Reviewed-by: tschatzl, 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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

Loading

@openjdk openjdk bot added the ready label Dec 15, 2020
Copy link
Contributor

@rkennke rkennke left a comment

Looks good to me, and I ran some more Shenandoah tests which also look good.

Loading

@kimbarrett
Copy link
Author

@kimbarrett kimbarrett commented Dec 16, 2020

Thanks @tschatzl and @rkennke for reviews, and @rkennke for additional Shenandoah testing.

Loading

@kimbarrett
Copy link
Author

@kimbarrett kimbarrett commented Dec 16, 2020

/integrate

Loading

@openjdk openjdk bot closed this Dec 16, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Dec 16, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Dec 16, 2020

@kimbarrett Pushed as commit cdb5342.

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

Loading

@kimbarrett kimbarrett deleted the move_enqueue branch Dec 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants