Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Jun 14, 2023

Unclean backport to fix the important JFR bug and matches 17.0.9-oracle. There are a number of contextual differences: NULL -> nullptr renames are not there, Object Sampling is not there. I just reapplied the conflicting chunks to yield the similar diff.

Additional testing:

  • macos-aarch64-server-fastdebug, jdk/jfr

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8309862: Unsafe list operations in JfrStringPool (Bug - P2)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1439

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 14, 2023

👋 Welcome back shade! 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.

@shipilev
Copy link
Member Author

@mgronlun, would you like to take a look?

@openjdk openjdk bot changed the title Backport 05f896a153ee950b21bae251d2870a8adfe4f04a 8309862: Unsafe list operations in JfrStringPool Jun 14, 2023
@openjdk
Copy link

openjdk bot commented Jun 14, 2023

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Jun 14, 2023
@openjdk
Copy link

openjdk bot commented Jun 14, 2023

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

8309862: Unsafe list operations in JfrStringPool

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

  • f9a6075: 8302150: Speed up compiler/codegen/Test7100757.java
  • 954bbaa: 8282651: ZGC: vmTestbase/gc/ArrayJuggle/ tests fails intermittently with exit code 97
  • 30d0484: 8299962: Speed up compiler/intrinsics/unsafe/DirectByteBufferTest.java and HeapByteBufferTest.java
  • 31a7fd3: 8298921: Create a regression test for JDK-8139581
  • faafe22: 8305858: Resolve multiple definition of 'handleSocketError' when statically linking with JDK native libraries
  • 01ac9cb: 8309138: Fix container tests for jdks with symlinked conf dir
  • 6991372: 8305995: Footprint regression from JDK-8224957
  • 2570e72: 8308300: enhance exceptions in MappedMemoryUtils.c
  • ebb9a36: 8309297: Adjust ShenandoahHeap print_heap_regions_on
  • 8ac9c57: Merge
  • ... and 23 more: https://git.openjdk.org/jdk17u-dev/compare/6287df05cee5781da1c223ed6084d0b2fcc6959b...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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 14, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 14, 2023

Webrevs

Copy link

@mgronlun mgronlun 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, thank you, Aleksey.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed ready Pull request is ready to be integrated labels Jun 15, 2023
@shipilev
Copy link
Member Author

Seems to be stable in current testing. Push approval is here.

/integrate

@openjdk
Copy link

openjdk bot commented Jun 23, 2023

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

  • 19acd07: 8307301: Update HarfBuzz to 7.2.0
  • f8e0f6e: 8307604: gcc12 based Alpine build broken build after JDK-8307301
  • c8e9c91: 8307569: Build with gcc8 is broken after JDK-8307301
  • 09fdf1d: 8292182: [TESTLIB] Enhance JAXPPolicyManager to setup required permissions for jtreg version 7 jar
  • 031a5ed: 8306435: Juggle04/TestDescription.java should be a booleanArr test and not a byteArr one
  • ee6fc5a: 8304845: Update PCSC-Lite for Suse Linux to 1.9.9 and fix incomplete license wording
  • 37d943e: 8040793: vmTestbase/nsk/monitoring/stress/lowmem fails on calling isCollectionUsageThresholdExceeded()
  • 781df52: 8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values
  • ab27843: 8283056: show abstract machine code in hs-err for all VM crashes
  • 9a49698: 8267188: gc/stringdedup/TestStringDeduplicationInterned.java fails with Shenandoah
  • ... and 67 more: https://git.openjdk.org/jdk17u-dev/compare/6287df05cee5781da1c223ed6084d0b2fcc6959b...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 23, 2023

@shipilev Pushed as commit 7c97df2.

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

@shipilev shipilev deleted the JDK-8309862-jfr-unsafe-list branch July 20, 2023 11:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants