Skip to content

8258742: Move PtrQueue reset to PtrQueueSet subclasses #2115

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

Closed
wants to merge 6 commits into from

Conversation

kimbarrett
Copy link

@kimbarrett kimbarrett commented Jan 17, 2021

Please review this change to the PtrQueue hierarchy, changing queue reset
from an intrinsic operation of the queue to an operation the qset performs
on a queue. This is another piece of the refactoring being done under
JDK-8258251, separated out for easier review.

After the refactoring of queue reset, PtrQueue::is_empty and PtrQueue::size
are no longer used, so are removed. Further, PtrQueue::{set_}index_in_bytes
are removed, directly using _index instead.

A less obvious part of the change is in the G1 remark task and Shenandoah
final marking task. The threads walk performed by these no longer directly
processes the partial per-thread SATB buffers. Instead they just flush the
queues for later completed buffer processing.

Testing:
mach5 tier1
local (linux-x64) hotspot:tier1 with -XX:+UseShenandoahGC


Progress

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

Issue

  • JDK-8258742: Move PtrQueue reset to PtrQueueSet subclasses

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 17, 2021

👋 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.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 17, 2021
@openjdk
Copy link

openjdk bot commented Jan 17, 2021

@kimbarrett 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 Jan 17, 2021
@mlbridge
Copy link

mlbridge bot commented Jan 17, 2021

Webrevs

Copy link
Contributor

@tschatzl tschatzl left a comment

Choose a reason for hiding this comment

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

Lgtm.

@openjdk
Copy link

openjdk bot commented Jan 18, 2021

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

8258742: Move PtrQueue reset to PtrQueueSet subclasses

Reviewed-by: tschatzl, iwalulya

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 18, 2021
Copy link
Member

@walulyai walulyai 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
Copy link

openjdk bot commented Jan 23, 2021

@kimbarrett this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout move_reset
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Jan 23, 2021
@kimbarrett
Copy link
Author

Thanks @tschatzl and @walulyai for reviews.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Jan 23, 2021
@kimbarrett
Copy link
Author

/integrate

@openjdk openjdk bot closed this Jan 23, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 23, 2021
@kimbarrett kimbarrett deleted the move_reset branch January 23, 2021 19:47
@openjdk
Copy link

openjdk bot commented Jan 23, 2021

@kimbarrett Pushed as commit 6c4c96f.

💡 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.

3 participants