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

8279011: JFR: JfrChunkWriter incorrectly handles int64_t chunk size as size_t #24

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Dec 21, 2021

Clean backport to fix JFR bug manifesting on 32-bit platforms. This PR would stay open a bit to get the change tested in mainline first.

Additional testing:

  • Linux x86_64 fastdebug jdk_jfr (passes)
  • Linux x86_32 fastdebug jdk_jfr (used to fail, now passes with 1 unrelated failure)

Progress

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

Issue

  • JDK-8279011: JFR: JfrChunkWriter incorrectly handles int64_t chunk size as size_t

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u-dev pull/24/head:pull/24
$ git checkout pull/24

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u-dev/pull/24.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 21, 2021

👋 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.

@openjdk
Copy link

openjdk bot commented Dec 21, 2021

⚠️ @shipilev could not find any commit with hash 467f654916764751746934f80877d49a5f107194. Please update the title with the hash for an existing commit.

@openjdk openjdk bot changed the title Backport 467f654916764751746934f80877d49a5f107194 8279011: JFR: JfrChunkWriter incorrectly handles int64_t chunk size as size_t Dec 21, 2021
@openjdk
Copy link

openjdk bot commented Dec 21, 2021

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

@openjdk
Copy link

openjdk bot commented Dec 21, 2021

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

8279011: JFR: JfrChunkWriter incorrectly handles int64_t chunk size as size_t

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

  • 5ea8f48: 8277385: Zero: Enable CompactStrings support
  • cb06a20: 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 21, 2021
@mlbridge
Copy link

mlbridge bot commented Dec 21, 2021

Webrevs

@shipilev
Copy link
Member Author

shipilev commented Jan 3, 2022

Got the push approval.

/integrate

@openjdk
Copy link

openjdk bot commented Jan 3, 2022

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

  • 0a538a0: 8276662: Scalability bottleneck in SymbolTable::lookup_common()
  • 38f01a7: 8275536: Add test to check that File::lastModified returns same time stamp as Files.getLastModifiedTime
  • 611a0ea: 8273895: compiler/ciReplay/TestVMNoCompLevel.java fails due to wrong data size with TieredStopAtLevel=2,3
  • dcd9821: 8272167: AbsPathsInImage.java should skip *.dSYM directories
  • 493a78a: 8270874: JFrame paint artifacts when dragged from standard monitor to HiDPI monitor
  • f016e60: 8275610: C2: Object field load floats above its null check resulting in a segfault
  • 3adb3dd: 8278099: two sun/security/pkcs11/Signature tests failed with AssertionError
  • 38fdf4f: 8276623: JDK-8275650 accidentally pushed "out" file
  • d30b6e4: 8277328: jdk/jshell/CommandCompletionTest.java failures on Windows
  • 6aa60ac: 8277441: CompileQueue::add fails with assert(_last->next() == __null) failed: not last
  • ... and 19 more: https://git.openjdk.java.net/jdk17u-dev/compare/c0ab12db5d1f8234ca97ced6a4943ef3dd4266b4...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 3, 2022

@shipilev Pushed as commit 8ce6877.

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

@shipilev shipilev deleted the JDK-8279011-jfr-chunksize branch January 4, 2022 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant