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

8292606: G1 and Epsilon header cleanup for JDK-8282729 #9921

Closed
wants to merge 1 commit into from

Conversation

xmas92
Copy link
Member

@xmas92 xmas92 commented Aug 18, 2022

In JDK-8282729 a few headers where found which were indirectly included via #include "gc/shared/blockOffsetTable.hpp", [JDK-8282729](https://bugs.openjdk.org/browse/JDK-8282729) moves the Serial part of blockOffsetTableintogc/serial` so those headers needs to be fixed for G1 and Epsilon. These header fixes were moved out of the issue to make the review processes easier. Here is a list of the files in question.

  • src/hotspot/share/gc/epsilon/epsilonHeap.hpp
    • Uses VirtualSpace
  • src/hotspot/share/gc/g1/g1CollectionSetChooser.hpp
    • Uses G1MixedGCLiveThresholdPercent
  • src/hotspot/share/gc/g1/g1FullGCScope.cpp
    • Uses MarkSweepDeadRatio
  • src/hotspot/share/gc/g1/g1HeapRegionEventSender.cpp
    • Uses UseG1GC
  • src/hotspot/share/gc/g1/g1HeapSizingPolicy.cpp
    • Uses GCTimeRatio, G1ExpandByPercentOfAvailable, MaxHeapSize, MinHeapSize, MaxHeapFreeRatio, MinHeapFreeRatio
  • src/hotspot/share/gc/g1/g1MemoryPool.cpp
    • Uses UseG1GC
  • src/hotspot/share/gc/g1/g1NUMA.cpp
    • Uses AlwaysPreTouch
  • src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp
    • Uses AlwaysPreTouch
  • src/hotspot/share/gc/g1/g1SegmentedArrayFreeMemoryTask.cpp
    • Uses G1RemSetFreeMemoryStepDurationMillis

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-8292606: G1 and Epsilon header cleanup for JDK-8282729

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9921

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 18, 2022

👋 Welcome back aboldtch! 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 Aug 18, 2022
@openjdk
Copy link

openjdk bot commented Aug 18, 2022

@xmas92 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 Aug 18, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 18, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Aug 18, 2022

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

8292606: G1 and Epsilon header cleanup for JDK-8282729

Reviewed-by: ayang, shade, 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 22 new commits pushed to the master branch:

  • 2edd550: 8292312: Work around memset() called operator new
  • 964aac2: 8292499: CDS ArchivedEnumTest.java fails: object points to a static field that may be reinitialized
  • f85411f: 8292458: Atomic operations on scoped enums don't build with clang
  • 82dbe29: 8292633: runtime/cds/appcds/dynamicArchive/CDSStreamTestDriver.java fails to compile
  • 54ce114: 6587699: Document DigestInputStream behavior when skip() or mark() / reset() is used
  • a1df2da: 8292632: compiler/sharedstubs/SharedTrampolineTest.java fails with "Error: VM option 'PrintRelocations' is develop and is available only in debug version of VM."
  • 1b756bf: 8236048: Cleanup use of Utils.normalizeNewlines
  • 97e2689: 8288121: [JVMCI] Re-export the TerminatingThreadLocal functionality to the graal compiler.
  • 833bf06: 8292608: [AIX] Broken build after 8291945
  • 62a7fc6: 8292315: Tests should not rely on specific JAR file names (hotspot)
  • ... and 12 more: https://git.openjdk.org/jdk/compare/e81210f5fe03ea3dc9c9fb0dba2be79e1dcc03bc...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 (@albertnetymk, @shipilev, @tschatzl) 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 Aug 18, 2022
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Epsilon change looks fine.

@xmas92
Copy link
Member Author

xmas92 commented Aug 19, 2022

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 19, 2022
@openjdk
Copy link

openjdk bot commented Aug 19, 2022

@xmas92
Your change (at version 98f373b) is now ready to be sponsored by a Committer.

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.

Lgtm.

/sponsor

@tschatzl
Copy link
Contributor

/sponsor
(just trying again because of no bot reaction after 10mins)

@openjdk
Copy link

openjdk bot commented Aug 19, 2022

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

  • 2edd550: 8292312: Work around memset() called operator new
  • 964aac2: 8292499: CDS ArchivedEnumTest.java fails: object points to a static field that may be reinitialized
  • f85411f: 8292458: Atomic operations on scoped enums don't build with clang
  • 82dbe29: 8292633: runtime/cds/appcds/dynamicArchive/CDSStreamTestDriver.java fails to compile
  • 54ce114: 6587699: Document DigestInputStream behavior when skip() or mark() / reset() is used
  • a1df2da: 8292632: compiler/sharedstubs/SharedTrampolineTest.java fails with "Error: VM option 'PrintRelocations' is develop and is available only in debug version of VM."
  • 1b756bf: 8236048: Cleanup use of Utils.normalizeNewlines
  • 97e2689: 8288121: [JVMCI] Re-export the TerminatingThreadLocal functionality to the graal compiler.
  • 833bf06: 8292608: [AIX] Broken build after 8291945
  • 62a7fc6: 8292315: Tests should not rely on specific JAR file names (hotspot)
  • ... and 12 more: https://git.openjdk.org/jdk/compare/e81210f5fe03ea3dc9c9fb0dba2be79e1dcc03bc...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 19, 2022
@openjdk openjdk bot closed this Aug 19, 2022
@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 Aug 19, 2022
@openjdk
Copy link

openjdk bot commented Aug 19, 2022

@tschatzl @xmas92 Pushed as commit 7d18ebd.

💡 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-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated
4 participants