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

8325883: Move Monitor Deflation reporting out of safepoint cleanup #18528

Closed
wants to merge 3 commits into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Mar 27, 2024

Moved monitor logging out of the safepoint cleanup code to intervals in the MonitorDeflationThread, and made logging come out at the specified level (Info, Debug or Trace).

Tested with tier1-4.


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-8325883: Move Monitor Deflation reporting out of safepoint cleanup (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18528

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 27, 2024

👋 Welcome back coleenp! 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 Mar 27, 2024

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

8325883: Move Monitor Deflation reporting out of safepoint cleanup

Reviewed-by: eosterlund, dcubed

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

  • 7ac2f91: 8329210: Delete Redundant Printer Dialog Modality Test
  • 85cb4a9: 8247449: Revisit the argument processing logic for MetaspaceShared::disable_optimized_module_handling()
  • aa595db: 8328507: Move StackWatermark code from safepoint cleanup
  • 2af0312: 8328619: sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java failed with BindException: Address already in use
  • 7c7b961: 8329191: JVMCI compiler warning is truncated
  • 2b79c22: 8327505: Test com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java fails
  • 47f33a5: 8327986: ASAN reports use-after-free in DirectivesParserTest.empty_object_vm
  • d580bcf: 8329178: Clean up jdk.accessibility native compilation
  • 4fa77a2: 8329096: G1: Change the type of G1BlockOffsetTable::_offset_base to uint8_t*
  • 3eb1d05: 8328986: Deprecate UseRTM* flags for removal
  • ... and 3 more: https://git.openjdk.org/jdk/compare/892b8bb6d1725119e4c9ada8f2617c15f8af674e...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 rfr Pull request is ready for review label Mar 27, 2024
@openjdk
Copy link

openjdk bot commented Mar 27, 2024

@coleenp The following label will be automatically applied to this pull request:

  • hotspot-runtime

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-runtime hotspot-runtime-dev@openjdk.org label Mar 27, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 27, 2024

Webrevs

Copy link
Contributor

@fisk fisk 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, just need to fix a comment before pushing. Don't need to see the new version.

src/hotspot/share/runtime/synchronizer.cpp Show resolved Hide resolved
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 28, 2024
Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Choose a reason for hiding this comment

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

Thumbs up. I think I only have nit comments here.

Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Choose a reason for hiding this comment

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

Thumbs up.

@coleenp
Copy link
Contributor Author

coleenp commented Mar 28, 2024

Thanks for reviewing Dan and Erik!

@coleenp
Copy link
Contributor Author

coleenp commented Mar 28, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 28, 2024

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

  • 7ac2f91: 8329210: Delete Redundant Printer Dialog Modality Test
  • 85cb4a9: 8247449: Revisit the argument processing logic for MetaspaceShared::disable_optimized_module_handling()
  • aa595db: 8328507: Move StackWatermark code from safepoint cleanup
  • 2af0312: 8328619: sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.java failed with BindException: Address already in use
  • 7c7b961: 8329191: JVMCI compiler warning is truncated
  • 2b79c22: 8327505: Test com/sun/jmx/remote/NotificationMarshalVersions/TestSerializationMismatch.java fails
  • 47f33a5: 8327986: ASAN reports use-after-free in DirectivesParserTest.empty_object_vm
  • d580bcf: 8329178: Clean up jdk.accessibility native compilation
  • 4fa77a2: 8329096: G1: Change the type of G1BlockOffsetTable::_offset_base to uint8_t*
  • 3eb1d05: 8328986: Deprecate UseRTM* flags for removal
  • ... and 3 more: https://git.openjdk.org/jdk/compare/892b8bb6d1725119e4c9ada8f2617c15f8af674e...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 28, 2024

@coleenp Pushed as commit 341dd57.

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

@coleenp coleenp deleted the deflate-logging branch March 28, 2024 19:31
@mmyxym
Copy link

mmyxym commented May 10, 2024

/backport jdk21u-dev

@openjdk
Copy link

openjdk bot commented May 10, 2024

@mmyxym Could not automatically backport 341dd57f to openjdk/jdk21u-dev due to conflicts in the following files:

  • src/hotspot/share/runtime/safepoint.cpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk21u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk21u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-mmyxym-341dd57f

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 341dd57fa1393baadb3fec417a18ad0e981f8b0f

# Backport the commit
$ git cherry-pick --no-commit 341dd57fa1393baadb3fec417a18ad0e981f8b0f
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 341dd57fa1393baadb3fec417a18ad0e981f8b0f'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk21u-dev with the title Backport 341dd57fa1393baadb3fec417a18ad0e981f8b0f.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 341dd57f from the openjdk/jdk repository.

The commit being backported was authored by Coleen Phillimore on 28 Mar 2024 and was reviewed by Erik Österlund and Daniel D. Daugherty.

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants