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.

Sign up for GitHub

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

Jump to bottom

8324981: Shenandoah: Move commit and soft max heap changed methods into heap #17634

Closed
wants to merge 2 commits into from
Closed

8324981: Shenandoah: Move commit and soft max heap changed methods into heap #17634

wants to merge 2 commits into from

Conversation

earthling-amzn
Copy link
Contributor

@earthling-amzn earthling-amzn commented Jan 30, 2024 •
edited by openjdk bot
Loading

These methods could have been static in control thread because they only interact with the heap. Moving them into the heap reduces code duplication on the generational mode branch.

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-8324981: Shenandoah: Move commit and soft max heap changed methods into heap (Task - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17634

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 30, 2024

👋 Welcome back wkemper! 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 30, 2024
@openjdk
Copy link

openjdk bot commented Jan 30, 2024

@earthling-amzn 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 30, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 30, 2024 •
edited
Loading

Webrevs

shipilev
shipilev reviewed Jan 30, 2024
View reviewed changes
src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp Outdated
@@ -784,6 +792,47 @@ void ShenandoahHeap::op_uncommit(double shrink_before, size_t shrink_until) {
}
}

void ShenandoahHeap::service_uncommit(double shrink_before, size_t shrink_until) {
Copy link
Member

Choose a reason for hiding this comment

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

I propose we call it maybe_uncommit. I think you can then also inline entry_uncommit right here, as we don't need the interface between control thread and heap anymore.

@openjdk
Copy link

openjdk bot commented Jan 31, 2024 •
edited
Loading

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

8324981: Shenandoah: Move commit and soft max heap changed methods into heap

Reviewed-by: shade

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

  • 1733d2e: 8303374: Implement JEP 455: Primitive Types in Patterns, instanceof, and switch (Preview)
  • 6697160: 8320712: Rewrite BadFactoryTest in pure Java
  • 725314f: 8324771: Obsolete RAMFraction related flags
  • ec6c35c: 8324970: Serial: Refactor signature of maintain_old_to_young_invariant
  • b5c267f: 8324632: Update Zlib Data Compression Library to Version 1.3.1
  • ec56c72: 8323601: Improve LayoutPath.PathElement::toString
  • f7121de: 8322648: Improve class initialization barrier in TemplateTable::_new for PPC
  • 577de17: 8259550: The content of the print out displayed incomplete with the NimbusLAF
  • 83b3c9b: 8322649: Improve class initialization barrier in TemplateTable::_new for S390
  • 7d1a488: 8324861: Exceptions::wrap_dynamic_exception() doesn't have ResourceMark
  • ... and 13 more: https://git.openjdk.org/jdk/compare/d1e676360d5143cf12655ab1175a4a60bf402473...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@shipilev) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

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

/integrate

GHA failure on macos looks like an infrastructure issue.

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jan 31, 2024
@openjdk
Copy link

openjdk bot commented Jan 31, 2024

@earthling-amzn
Your change (at version 2d84279) is now ready to be sponsored by a Committer.

@shipilev
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jan 31, 2024

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

  • 1733d2e: 8303374: Implement JEP 455: Primitive Types in Patterns, instanceof, and switch (Preview)
  • 6697160: 8320712: Rewrite BadFactoryTest in pure Java
  • 725314f: 8324771: Obsolete RAMFraction related flags
  • ec6c35c: 8324970: Serial: Refactor signature of maintain_old_to_young_invariant
  • b5c267f: 8324632: Update Zlib Data Compression Library to Version 1.3.1
  • ec56c72: 8323601: Improve LayoutPath.PathElement::toString
  • f7121de: 8322648: Improve class initialization barrier in TemplateTable::_new for PPC
  • 577de17: 8259550: The content of the print out displayed incomplete with the NimbusLAF
  • 83b3c9b: 8322649: Improve class initialization barrier in TemplateTable::_new for S390
  • 7d1a488: 8324861: Exceptions::wrap_dynamic_exception() doesn't have ResourceMark
  • ... and 13 more: https://git.openjdk.org/jdk/compare/d1e676360d5143cf12655ab1175a4a60bf402473...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 31, 2024

@shipilev @earthling-amzn Pushed as commit 2cd1ba6.

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

@shipilev shipilev shipilev approved these changes

Assignees
No one assigned
Labels
hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated shenandoah shenandoah-dev@openjdk.org
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@earthling-amzn @shipilev