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

8265064: Move clearing and setting of members into helpers in ReservedSpace #3435

Closed

Conversation

kstefanj
Copy link
Contributor

@kstefanj kstefanj commented Apr 12, 2021

Currently there are a few places in ReservedSpace that updates a set of members directly during initialization. This could be refactored into helper functions to improve readability and also to pave way for some further cleanups.

This is one of a few cleanups I plan to do to enable a clean implementation of:
JDK-8261527: Record page size used for underlying mapping in ReservedSpace

Testing
Mach5 tier1 and tier2.


Progress

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

Issue

  • JDK-8265064: Move clearing and setting of members into helpers in ReservedSpace

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3435/head:pull/3435
$ git checkout pull/3435

Update a local copy of the PR:
$ git checkout pull/3435
$ git pull https://git.openjdk.java.net/jdk pull/3435/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3435

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3435.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 12, 2021

👋 Welcome back sjohanss! 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 openjdk bot commented Apr 12, 2021

@kstefanj 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 label Apr 12, 2021
@kstefanj
Copy link
Contributor Author

@kstefanj kstefanj commented Apr 12, 2021

/label remove hotspot-runtime
/label add hotspot

@openjdk openjdk bot removed the hotspot-runtime label Apr 12, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 12, 2021

@kstefanj
The hotspot-runtime label was successfully removed.

@openjdk openjdk bot added the hotspot label Apr 12, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 12, 2021

@kstefanj
The hotspot label was successfully added.

@kstefanj kstefanj marked this pull request as ready for review Apr 12, 2021
@openjdk openjdk bot added the rfr label Apr 12, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 12, 2021

Webrevs

@@ -140,6 +135,26 @@ static bool failed_to_reserve_as_requested(char* base, char* requested_address,
return true;
}

void ReservedSpace::clear_members() {
_base = NULL;
Copy link
Contributor

@tschatzl tschatzl Apr 12, 2021

Choose a reason for hiding this comment

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

This method could call initialize_members() with the appropriate argument values, couldn't it?

Copy link
Contributor Author

@kstefanj kstefanj Apr 13, 2021

Choose a reason for hiding this comment

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

Yes. I tried that as well, but then I called it set_members() because calling initialize_members() from clear_members() felt a bit backwards. The reason I didn't go with this approach was that I preferred the name initialize_members(). But I'll make the change and call initialize from clear, it's pretty obvious what is going on.

Using initialize_members() in clear_members().
Copy link
Contributor

@tschatzl tschatzl left a comment

Lgtm.

@openjdk
Copy link

@openjdk openjdk bot commented Apr 13, 2021

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

8265064: Move clearing and setting of members into helpers in ReservedSpace

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

  • 008fc75: 8264224: Add macosx-aarch64 to Oracle build configurations
  • f4e6395: 8264190: Harden TLS interop tests
  • 18bec9c: 8265084: [BACKOUT] 8264954: unified handling for VectorMask object re-materialization during de-optimization
  • 9dd9625: 8263763: Synthetic constructor parameters of enum are not considered for annotation indices
  • 1ee80e0: 8261355: No data buffering in SunPKCS11 Cipher encryption when the underlying mechanism has no padding
  • d84a7e5: 8264124: Update MXBean specification and implementation to extend mapping of CompositeType to records
  • 714ae54: 8258788: incorrect response to change in window insets [lanai]
  • f479437: 8265082: test/hotspot/jtreg/gc/g1/TestG1SkipCompaction.java fails validate-source
  • 27f4b27: 8264623: Change to Xcode 12.4 for building on Macos at Oracle
  • 7c20d97: 8265052: Break circular include dependency in objArrayOop.inline.hpp
  • ... and 6 more: https://git.openjdk.java.net/jdk/compare/cb2806db4ed188a53161d13a0d7f882b1afe00ec...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 label Apr 13, 2021
Copy link
Member

@walulyai walulyai left a comment

looks good

@kstefanj
Copy link
Contributor Author

@kstefanj kstefanj commented Apr 13, 2021

Thanks @tschatzl and @walulyai for the reviews.

/integrate

@openjdk openjdk bot closed this Apr 13, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 13, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 13, 2021

@kstefanj Since your change was applied there have been 20 commits pushed to the master branch:

  • 7006070: 8265061: Simplify MethodHandleNatives::canBeCalledVirtual
  • 1935655: 8264957: Cleanup unused array Type::dual_type
  • 954b9a1: 8264795: IGV: Upgrade NetBeans platform
  • f2f7aa3: 8262291: Refactor reserve_memory_special_huge_tlbfs
  • 008fc75: 8264224: Add macosx-aarch64 to Oracle build configurations
  • f4e6395: 8264190: Harden TLS interop tests
  • 18bec9c: 8265084: [BACKOUT] 8264954: unified handling for VectorMask object re-materialization during de-optimization
  • 9dd9625: 8263763: Synthetic constructor parameters of enum are not considered for annotation indices
  • 1ee80e0: 8261355: No data buffering in SunPKCS11 Cipher encryption when the underlying mechanism has no padding
  • d84a7e5: 8264124: Update MXBean specification and implementation to extend mapping of CompositeType to records
  • ... and 10 more: https://git.openjdk.java.net/jdk/compare/cb2806db4ed188a53161d13a0d7f882b1afe00ec...master

Your commit was automatically rebased without conflicts.

Pushed as commit a4f644e.

💡 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 integrated
3 participants