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

8277542: G1: Move G1CardSetFreePool and related classes to separate files #6499

Closed

Conversation

Hamlin-Li
Copy link

@Hamlin-Li Hamlin-Li commented Nov 22, 2021

As G1CardSetFreePool and related classes are going to be reused outside of the remembered set, they should be factored out.


Progress

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

Issue

  • JDK-8277542: G1: Move G1CardSetFreePool and related classes to separate files

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6499

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 22, 2021

👋 Welcome back mli! 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 label Nov 22, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 22, 2021

@Hamlin-Li 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 label Nov 22, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 22, 2021

Webrevs

Copy link
Member

@albertnetymk albertnetymk left a comment

I was using git diff --color-moved to help me review the diff. However, the unnecessary change to
G1CardSetFreePool::free_list (moving from hpp to cpp) introduced some friction. Please refrain from mixing mechanical and manual changes in the same commit; you can use a second commit in this PR for the manual tuning.

I see the same def is duplicated in two places:
in g1SegmentedArrayFreePool.hpp:

typedef G1SegmentedArrayBuffer<mtGCCardSet> G1CardSetBuffer;
typedef G1SegmentedArrayBufferList<mtGCCardSet> G1CardSetBufferList;

and g1CardSetMemory.hpp:

typedef G1SegmentedArrayBuffer<mtGCCardSet> G1CardSetBuffer;

typedef G1SegmentedArrayBufferList<mtGCCardSet> G1CardSetBufferList;

I believe such duplication is only transient -- later refactoring/renaming will fix this, so I am fine with the current PR.

@openjdk
Copy link

@openjdk openjdk bot commented Nov 22, 2021

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

8277542: G1: Move G1CardSetFreePool and related classes to separate files

Reviewed-by: ayang, tschatzl

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

  • e529865: 8277239: SIGSEGV in vrshift_reg_maskedNode::emit
  • 8683de5: 8274685: Documentation suggests there are ArbitrarilyJumpableGenerator when none
  • 6b4fbae: 8273792: JumpableGenerator.rngs() documentation refers to wrong method
  • d427c79: 8277428: G1: Move and inline G1STWIsAliveClosure::do_object_b
  • 32839ba: 8266593: vmTestbase/nsk/jvmti/PopFrame/popframe011 fails with "assert(java_thread == _state->get_thread()) failed: Must be"
  • 8051041: 8277534: Remove unused ReferenceProcessor::has_discovered_references
  • 3f847fe: 8277385: Zero: Enable CompactStrings support
  • ca31ed5: 8275448: [REDO] AArch64: Implement string_compare intrinsic in SVE
  • 4ff4301: 8224922: Access JavaFileObject from Element(s)
  • 0a9e76c: 8277485: Zero: Fix fast{i,f}access_0 bytecodes handling
  • ... and 24 more: https://git.openjdk.java.net/jdk/compare/2f0bde1a658b0910304c110920a2e8ccbe4557f8...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 Nov 22, 2021
@Hamlin-Li
Copy link
Author

@Hamlin-Li Hamlin-Li commented Nov 23, 2021

@albertnetymk Yes, such changes are only transient, they will be reverted in next PR.

Thanks @tschatzl @albertnetymk for your reviews.

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 23, 2021

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

  • f62b81c: 8273095: vmTestbase/vm/mlvm/anonloader/stress/oome/heap/Test.java fails with "wrong OOME"
  • 05a9a51: 8277423: ciReplay: hidden class with comment expected error
  • 1049aba: 8277576: ProblemList runtime/ErrorHandling/CreateCoredumpOnCrash.java on macosx-X64
  • 851a362: 8264297: Create implementation for NSAccessibilityProgressIndicator protocol peer
  • 6cf4cd1: 8273341: Update Siphash to version 1.0
  • e3911a8: 8277429: Conflicting jpackage static library name
  • 33e2a51: 8265795: vmTestbase/nsk/jvmti/AttachOnDemand/attach022/TestDescription.java fails when running with JEP 416
  • 22f12ac: 8277522: Make formatting of null consistent in Elements
  • e529865: 8277239: SIGSEGV in vrshift_reg_maskedNode::emit
  • 8683de5: 8274685: Documentation suggests there are ArbitrarilyJumpableGenerator when none
  • ... and 32 more: https://git.openjdk.java.net/jdk/compare/2f0bde1a658b0910304c110920a2e8ccbe4557f8...master

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Nov 23, 2021

@Hamlin-Li Pushed as commit bb11c55.

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

@Hamlin-Li Hamlin-Li deleted the move-G1CardSetFreePool-out branch Nov 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-gc integrated
3 participants