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

8276640: Use blessed modifier order in jfr code #6254

Closed
wants to merge 1 commit into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Nov 4, 2021

I ran bin/blessed-modifier-order.sh on source owned by the JFR team. This scripts verifies that modifiers are in the "blessed" order, and fixes it otherwise. I have manually checked the changes made by the script to make sure they are sound.


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/6254/head:pull/6254
$ git checkout pull/6254

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6254

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 4, 2021

👋 Welcome back ihse! 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 label Nov 4, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 4, 2021

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

  • hotspot-jfr

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-jfr label Nov 4, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 4, 2021

Webrevs

Copy link

@mgronlun mgronlun left a comment

Looks good.

@openjdk
Copy link

@openjdk openjdk bot commented Nov 4, 2021

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

8276640: Use blessed modifier order in jfr code

Reviewed-by: mgronlun

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

  • 19075b3: 8275788: Create code element with suitable attributes for code snippets
  • 7de653e: 8276301: G1: Refine implementation of G1CardSetFreePool::memory_sizes()
  • ee49963: 8275534: com.sun.net.httpserver.BasicAuthenticator should check whether "realm" is a quoted string
  • 3613ce7: 8275586: Zero: Simplify interpreter initialization

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 label Nov 4, 2021
@magicus
Copy link
Member Author

@magicus magicus commented Nov 4, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 4, 2021

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

  • a6fa6ed: 8268779: ZGC: runtime/InternalApi/ThreadCpuTimesDeadlock.java#id1 failed with "OutOfMemoryError: Java heap space"
  • 19075b3: 8275788: Create code element with suitable attributes for code snippets
  • 7de653e: 8276301: G1: Refine implementation of G1CardSetFreePool::memory_sizes()
  • ee49963: 8275534: com.sun.net.httpserver.BasicAuthenticator should check whether "realm" is a quoted string
  • 3613ce7: 8275586: Zero: Simplify interpreter initialization

Your commit was automatically rebased without conflicts.

@openjdk
Copy link

@openjdk openjdk bot commented Nov 4, 2021

@magicus An unexpected error occurred during integration. No push attempt will be made. The error has been logged and will be investigated. It is possible that this error is caused by a transient issue; feel free to retry the operation.

@magicus
Copy link
Member Author

@magicus magicus commented Nov 4, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 4, 2021

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

  • 5acff75: 8276429: CodeHeapState::print_names() fails with "assert(klass->is_loader_alive()) failed: must be alive"
  • a6fa6ed: 8268779: ZGC: runtime/InternalApi/ThreadCpuTimesDeadlock.java#id1 failed with "OutOfMemoryError: Java heap space"
  • 19075b3: 8275788: Create code element with suitable attributes for code snippets
  • 7de653e: 8276301: G1: Refine implementation of G1CardSetFreePool::memory_sizes()
  • ee49963: 8275534: com.sun.net.httpserver.BasicAuthenticator should check whether "realm" is a quoted string
  • 3613ce7: 8275586: Zero: Simplify interpreter initialization

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 4, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Nov 4, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 4, 2021

@magicus Pushed as commit 49b7b2e.

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

@magicus magicus deleted the jfr-blessed-order branch Nov 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-jfr integrated
2 participants