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

8291753: Add JFR event for GC CPU Time #2270

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 6, 2024

I backport this as proposed before in #1900. Prereq changes are already done.

The backport has been tested by releaseing it in SapMachine in 17.0.10. This patch here is identical to the one in SapMachine. It will go to 17.0.12 giving enough time to settle.

The g1 files needed several trivial resolves due to context differences. Especially variable do_maximum_compaction was renamed to do_maximal_compaction. This appears several times in the context.

Further trivial resolves in
src/hotspot/share/gc/serial/defNewGeneration.hpp
src/hotspot/share/gc/shared/gcTrace.hpp
src/hotspot/share/gc/shared/genCollectedHeap.cpp

src/jdk.jfr/share/conf/jfr/profile.jfc
The whitespace fix is not needed in 17. Omitted.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • JDK-8291753 needs maintainer approval
  • Commit message must refer to an issue

Issue

  • JDK-8291753: Add JFR event for GC CPU Time (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/2270/head:pull/2270
$ git checkout pull/2270

Update a local copy of the PR:
$ git checkout pull/2270
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/2270/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2270

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2270.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 6, 2024

👋 Welcome back goetz! 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 Backport 14eb5ad0dc987ffe3621f4eeeebeb6b5a2cd691b 8291753: Add JFR event for GC CPU Time Mar 6, 2024
@openjdk
Copy link

openjdk bot commented Mar 6, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Mar 6, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 6, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Mar 6, 2024

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@GoeLin
Copy link
Member Author

GoeLin commented Mar 7, 2024

GHA failure: Risc-V build issue, unrelated.
This change changes C++ code which would be good to be built in that test build. But the exact same code passed testing in #1900, so it should be fine.

@openjdk openjdk bot added the approval label Mar 7, 2024
@openjdk
Copy link

openjdk bot commented Mar 7, 2024

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

8291753: Add JFR event for GC CPU Time

Reviewed-by: phh

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

  • fa8a159: 8282094: [REDO] Parallel: Refactor PSCardTable::scavenge_contents_parallel
  • 3c05a02: 8326638: Crash in PhaseIdealLoop::remix_address_expressions due to unexpected Region instead of Loop
  • f423686: 8325972: Add -x to bash for building with LOG=debug
  • 385731f: 8320303: Allow PassFailJFrame to accept single window creator
  • 30ead33: 8318580: "javax/swing/MultiMonitor/MultimonVImage.java failing with Error. Can't find library: /open/test/jdk/java/awt/regtesthelpers" after JDK-8316053
  • 5421bb6: 8278893: Parallel: Remove GCWorkerDelayMillis

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 ready Pull request is ready to be integrated and removed approval labels Mar 7, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Mar 11, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 11, 2024

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

  • f221ff3: 8310031: Parallel: Implement better work distribution for large object arrays in old gen
  • 08f1b35: 8320712: Rewrite BadFactoryTest in pure Java
  • 6e73b11: 8316563: test tools/jpackage/linux/LinuxResourceTest.java fails on CentOS Linux release 8.5.2111 and Fedora 27
  • 48327c3: 8309763: Move tests in test/jdk/sun/misc/URLClassPath directory to test/jdk/jdk/internal/loader
  • fa8a159: 8282094: [REDO] Parallel: Refactor PSCardTable::scavenge_contents_parallel
  • 3c05a02: 8326638: Crash in PhaseIdealLoop::remix_address_expressions due to unexpected Region instead of Loop
  • f423686: 8325972: Add -x to bash for building with LOG=debug
  • 385731f: 8320303: Allow PassFailJFrame to accept single window creator
  • 30ead33: 8318580: "javax/swing/MultiMonitor/MultimonVImage.java failing with Error. Can't find library: /open/test/jdk/java/awt/regtesthelpers" after JDK-8316053
  • 5421bb6: 8278893: Parallel: Remove GCWorkerDelayMillis

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 11, 2024

@GoeLin Pushed as commit 833e2bb.

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

@GoeLin GoeLin deleted the goetz_backport_8291753 branch March 11, 2024 09:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants