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

8274069: Clean up g1ParScanThreadState a bit #5607

Conversation

tschatzl
Copy link
Contributor

@tschatzl tschatzl commented Sep 21, 2021

Hi all,

can I have reviews for this change that does some minor refactoring for issues found in JDK-8271880/PR#5037:

  • remove declaration without definition
  • move inlined code in the .hpp file into .inline.hpp file
  • factor out some code

Testing: gha, local compilation, local gc/g1

Thanks,
Thomas


Progress

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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5607

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 21, 2021

👋 Welcome back tschatzl! 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 bot commented Sep 21, 2021

@tschatzl 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 hotspot-gc-dev@openjdk.org label Sep 21, 2021
@tschatzl tschatzl marked this pull request as ready for review September 21, 2021 11:47
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 21, 2021
@mlbridge
Copy link

mlbridge bot commented Sep 21, 2021

Webrevs

Copy link
Contributor

@kstefanj kstefanj left a comment

Choose a reason for hiding this comment

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

👍

@openjdk
Copy link

openjdk bot commented Sep 21, 2021

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

8274069: Clean up g1ParScanThreadState a bit

Reviewed-by: sjohanss, ayang, kbarrett

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

  • 161fdb4: 8273935: (zipfs) Files.getFileAttributeView() throws UOE instead of returning null when view not supported
  • 0fc47e9: 8266666: Implementation for snippets
  • 6d91a3e: 8269039: Disable SHA-1 Signed JARs
  • 42d5d2a: 8274056: JavaAccessibilityUtilities leaks JNI objects
  • 57df0db: 8270873: JFR: Catch DirectoryIteratorException when scanning for .jfr files
  • 111d5e1: 8273915: Create 'nosafepoint' rank
  • 7acec3f: 8236505: Mark jdk/editpad/EditPadTest.java as @headful

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 Pull request is ready to be integrated label Sep 21, 2021
Copy link
Member

@albertnetymk albertnetymk left a comment

Choose a reason for hiding this comment

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

The old name, enqueue_card_after_barrier_filters, is still referenced in the comments.

(I also wonder if it makes sense to unify all callers of enqueue_card_if_tracked to use write_ref_field_post with template non-type arguments. Not in this PR ofc.)

Copy link

@kimbarrett kimbarrett left a comment

Choose a reason for hiding this comment

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

Does this change allow this inclusion of an .inline.hpp to be moved out of the .hpp?
33 #include "gc/g1/heapRegionRemSet.inline.hpp"

src/hotspot/share/gc/g1/g1ParScanThreadState.hpp Outdated Show resolved Hide resolved
@tschatzl
Copy link
Contributor Author

Does this change allow this inclusion of an .inline.hpp to be moved out of the .hpp?
33 #include "gc/g1/heapRegionRemSet.inline.hpp"

In the latest change I also touched up includes in that file a bit. Nothing about heapRegionRemSet has been used in that file...

Copy link

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

@tschatzl
Copy link
Contributor Author

Thanks @albertnetymk @kstefanj @kimbarrett for your reviews.

/integrate

@openjdk
Copy link

openjdk bot commented Sep 22, 2021

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

  • 3f73ca7: 8274068: Rename G1ScanInYoungSetter to G1SkipCardEnqueueSetter
  • 7f78803: 8273961: jdk/nio/zipfs/ZipFSTester.java fails if file path contains '+' character
  • 51085b5: 8274054: Add custom enqueue calls during reference processing
  • c77ebe8: 8274060: C2: Incorrect computation after JDK-8273454
  • d9872ba: 8273590: Move helper classes in G1 post evacuation sub tasks to cpp files
  • 688b3fe: 8274070: Rectify problemlist platform for failing test on macos12
  • eeaf43b: 8274114: ProblemList serviceability/sa/TestJhsdbJstackMixed.java on linux-aarch64 in -Xcomp mode
  • 517405e: 8273965: some testlibrary_tests/ir_framework tests fail when c1 disabled
  • 11cddd3: 8272114: Unused _last_state in osThread_windows
  • cbe57e8: 8273684: Replace usages of java.util.Stack with ArrayDeque
  • ... and 8 more: https://git.openjdk.java.net/jdk/compare/afd218d39a3125fcea50968edef6e6cfbacfff50...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 22, 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 Sep 22, 2021
@openjdk
Copy link

openjdk bot commented Sep 22, 2021

@tschatzl Pushed as commit d245a8c.

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

@tschatzl tschatzl deleted the submit/8274069-cleanup-g1parscanthreadstate branch September 22, 2021 16:14
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
4 participants