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

8316454: JFR break locale settings #17018

Closed
wants to merge 2 commits into from
Closed

Conversation

egahlin
Copy link
Member

@egahlin egahlin commented Dec 7, 2023

Could I have a review of PR that prevents locale settings from not working.

Testing: jdk/jdk/jfr/* + jdk/java/util/Local/ with -XX:FlightRecorderOptions=repository=jfrrep

Thanks
Erik


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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17018

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 7, 2023

👋 Welcome back egahlin! 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 Dec 7, 2023

@egahlin 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 hotspot-jfr-dev@openjdk.org label Dec 7, 2023
@egahlin egahlin marked this pull request as ready for review December 7, 2023 11:57
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 7, 2023
@openjdk
Copy link

openjdk bot commented Dec 7, 2023

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

8316454: JFR break locale settings

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

  • ead4fb1: 8321519: Typo in exception message
  • b5933b1: 8320805: JFR: Create view for deprecated methods
  • 29d7a22: 8321270: Virtual Thread.yield consumes parking permit
  • 0b0fa47: 8319925: CSS.BackgroundImage incorrectly uses double-checked locking
  • 0048f1d: 8263256: Test java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java fails due to dynamic reconfigurations of network interface during test
  • 49fff01: 8211238: @deprecated JFR event

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 Pull request is ready to be integrated label Dec 7, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 7, 2023

Webrevs

@egahlin
Copy link
Member Author

egahlin commented Dec 7, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Dec 7, 2023

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

  • c42535f: 8321470: ThreadLocal.nextHashCode can be static final
  • 42bb852: 8321467: MemorySegment.setString(long, String, Charset) throws IAE(Misaligned access)
  • c087e91: 8321505: JFR: Update views
  • ead4fb1: 8321519: Typo in exception message
  • b5933b1: 8320805: JFR: Create view for deprecated methods
  • 29d7a22: 8321270: Virtual Thread.yield consumes parking permit
  • 0b0fa47: 8319925: CSS.BackgroundImage incorrectly uses double-checked locking
  • 0048f1d: 8263256: Test java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java fails due to dynamic reconfigurations of network interface during test
  • 49fff01: 8211238: @deprecated JFR event

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 7, 2023

@egahlin Pushed as commit de95259.

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

Comment on lines +118 to +123
private static NumberFormat numberFormatInstance() {
if (NUMBER_FORMAT == null) {
NUMBER_FORMAT = NumberFormat.getNumberInstance();
}
return NUMBER_FORMAT;
}
Copy link
Member

Choose a reason for hiding this comment

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

Is this initialization thread-safe?

Copy link
Member Author

Choose a reason for hiding this comment

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

It should be fine if we end up with more than one object. In practise, only one thread will access the field, the Attach thread when using jcmd, or the main thread when using the jfr tool. In theory, you could do 'jcmd JFR.view' on a 'jfr view' process, but at worst, we will get two objects.

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