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

8294059: Serial: Refactor GenCollectedHeap::collect #10355

Closed
wants to merge 2 commits into from

Conversation

albertnetymk
Copy link
Member

@albertnetymk albertnetymk commented Sep 20, 2022

Simple cleanup of control flow in GenCollectedHeap::collect.

Test: hotspot_gc


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-8294059: Serial: Refactor GenCollectedHeap::collect

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10355

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 20, 2022

👋 Welcome back ayang! 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 changed the title 8294059 8294059: Serial: Refactor GenCollectedHeap::collect Sep 20, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 20, 2022
@openjdk
Copy link

openjdk bot commented Sep 20, 2022

@albertnetymk 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 20, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 20, 2022

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.

Nice cleanup.

src/hotspot/share/gc/shared/genCollectedHeap.cpp Outdated Show resolved Hide resolved
@openjdk
Copy link

openjdk bot commented Sep 28, 2022

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

8294059: Serial: Refactor GenCollectedHeap::collect

Reviewed-by: sjohanss, 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 111 new commits pushed to the master branch:

  • ea61671: 8294359: Interpreter(AArch64) intrinsify Thread.currentThread()
  • c42ef70: 7148092: [macosx] When Alt+down arrow key is pressed, the combobox popup does not appear.
  • 94e14da: 8294057: Parallel: Tighten ParallelCompactData::initialize_region_data
  • 1ea0d6b: 8292301: [REDO v2] C2 crash when allocating array of size too large
  • c13e0ef: 8292848: AWT_Mixing and TrayIcon tests fail on el8 with hard-coded isOel7
  • 79ccc79: 8293613: need to properly handle and hide tmp VTMS transitions
  • 5e1e449: 8290920: sspi_bridge.dll not built if BUILD_CRYPTO is false
  • d827fd8: 8294430: RISC-V: Small refactoring for movptr_with_offset
  • 9d76ac8: 8292158: AES-CTR cipher state corruption with AVX-512
  • e5b65c4: 8290482: Update JNI Specification of DestroyJavaVM for better alignment with JLS, JVMS, and Java SE API Specifications
  • ... and 101 more: https://git.openjdk.org/jdk/compare/fe541f05cc4092752d9d33ea41002fe907283655...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 Pull request is ready to be integrated label Sep 28, 2022
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.

Looks good.

Comment on lines +838 to +842

const GenerationType max_generation = should_run_young_gc
? YoungGen
: OldGen;

Copy link
Contributor

Choose a reason for hiding this comment

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

At high risk of sounding onerous and nitpicky: please avoid adding new ways of formatting the ? statement, and in this case it's short enough to write on a single line without any loss of clarity too.

(Fwiw, I searched for multi-line formatting of ? in shared code, and as far as I can see the ? isn't aligned to the = above ever - it is seemingly in the majority of times intended like a new scope, i.e. 2 (or sometimes 4?) spaces from the previous line. Actually I wanted to avoid these kinds of discussions, but, well it kind of pops out when looking at it...)

Copy link
Member Author

Choose a reason for hiding this comment

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

I can see one such example in jvm_posix.cpp. Anyway, I feel this is clearer. (Very subjective ofc.)

Co-authored-by: Stefan Johansson <54407259+kstefanj@users.noreply.github.com>
@albertnetymk
Copy link
Member Author

Thanks for the review.

/integrate

@openjdk
Copy link

openjdk bot commented Sep 28, 2022

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

  • ea61671: 8294359: Interpreter(AArch64) intrinsify Thread.currentThread()
  • c42ef70: 7148092: [macosx] When Alt+down arrow key is pressed, the combobox popup does not appear.
  • 94e14da: 8294057: Parallel: Tighten ParallelCompactData::initialize_region_data
  • 1ea0d6b: 8292301: [REDO v2] C2 crash when allocating array of size too large
  • c13e0ef: 8292848: AWT_Mixing and TrayIcon tests fail on el8 with hard-coded isOel7
  • 79ccc79: 8293613: need to properly handle and hide tmp VTMS transitions
  • 5e1e449: 8290920: sspi_bridge.dll not built if BUILD_CRYPTO is false
  • d827fd8: 8294430: RISC-V: Small refactoring for movptr_with_offset
  • 9d76ac8: 8292158: AES-CTR cipher state corruption with AVX-512
  • e5b65c4: 8290482: Update JNI Specification of DestroyJavaVM for better alignment with JLS, JVMS, and Java SE API Specifications
  • ... and 101 more: https://git.openjdk.org/jdk/compare/fe541f05cc4092752d9d33ea41002fe907283655...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 28, 2022
@openjdk openjdk bot closed this Sep 28, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 28, 2022
@openjdk
Copy link

openjdk bot commented Sep 28, 2022

@albertnetymk Pushed as commit 60616f2.

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

@albertnetymk albertnetymk deleted the gc-cause branch September 28, 2022 10:42
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
3 participants