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

8289745: JfrStructCopyFailed uses heap words instead of bytes for object sizes #2237

Closed

Conversation

schmelter-sap
Copy link
Contributor

@schmelter-sap schmelter-sap commented Oct 30, 2023

Hi,

This is a backport of JDK-8289745: JfrStructCopyFailed uses heap words instead of bytes for object sizes

Original patch does not apply cleanly to 11u, because the adaption to the G1 event is not
needed, since it is present in JDK 11.

Tested tier1-4 for all platforms without any issues.

Thanks,
-Ralf


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
  • JDK-8289745 needs maintainer approval

Issue

  • JDK-8289745: JfrStructCopyFailed uses heap words instead of bytes for object sizes (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2237

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 30, 2023

👋 Welcome back rschmelter! 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 changed the title Backport 7f0e9bd632198c7fd34d27b85ca51ea0e2442e4d 8289745: JfrStructCopyFailed uses heap words instead of bytes for object sizes Oct 30, 2023
@openjdk
Copy link

openjdk bot commented Oct 30, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Oct 30, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 30, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Oct 31, 2023

⚠️ @schmelter-sap This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the approval label Oct 31, 2023
@GoeLin
Copy link
Member

GoeLin commented Nov 1, 2023

/approve yes

Next time, please supply a coment for JBS with the approval command as in the past.

@openjdk
Copy link

openjdk bot commented Nov 1, 2023

@GoeLin
8289745: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Nov 1, 2023

@schmelter-sap This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8289745: JfrStructCopyFailed uses heap words instead of bytes for object sizes

Reviewed-by: phh

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

  • 32e63eb: 8312065: Socket.connect does not timeout when profiling
  • 2fbb4b9: 8318705: [macos] ProblemList java/rmi/registry/multipleRegistries/MultipleRegistries.java
  • 910e2c4: 8308910: Allow executeAndLog to accept running process
  • 46ce8cb: 8306765: Some client related jtreg problem list entries are malformed
  • 9f74d26: 8286707: JFR: Don't commit JFR internal jdk.JavaMonitorWait events
  • 53acd95: 8251177: [macosx] The text "big" is truncated in JTabbedPane
  • dd1994e: 8231931: [TESTBUG] serviceability/sa/TestUniverse.java looks for wrong string with Shenandoah
  • cf13e82: 8313691: use close after failing os::fdopen in vmError and ciEnv
  • b9936cd: 8221396: Clean up serviceability/sa/TestUniverse.java
  • 9be4d3f: 8289917: Metadata for regionsRefilled of G1EvacuationStatistics event is wrong
  • ... and 12 more: https://git.openjdk.org/jdk11u-dev/compare/639afbe61ac91ce7f926f01a0f8e63dd694723f5...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 and removed approval labels Nov 1, 2023
@schmelter-sap
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 6, 2023

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

  • 1f67ffb: 8318669: Target OS detection in 'test-prebuilt' makefile target is incorrect when running on MSYS2
  • f6bdbe8: 8317967: Enhance test/jdk/javax/net/ssl/TLSCommon/SSLEngineTestCase.java to handle default cases
  • feb051f: 8316906: Clarify TLABWasteTargetPercent flag
  • 9abfdde: 8314063: The socket is not closed in Connection::createSocket when the handshake failed for LDAP connection
  • 18d616d: 8306280: Open source several choice AWT tests
  • f993ef5: 8284331: Add sanity check for signal handler modification warning.
  • 92c5062: 8289238: Refactoring changes to PassFailJFrame Test Framework
  • d90b9ac: 8285612: Remove jtreg tag manual=yesno for java/awt/print/PrinterJob/ImagePrinting/ClippedImages.java
  • 3377127: 8183374: Refactor java/lang/Runtime shell tests to java
  • c73323b: 8240604: Rewrite sun/management/jmxremote/bootstrap/CustomLauncherTest.java test to make binaries from source file
  • ... and 27 more: https://git.openjdk.org/jdk11u-dev/compare/639afbe61ac91ce7f926f01a0f8e63dd694723f5...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 6, 2023

@schmelter-sap Pushed as commit 80d3bb4.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
3 participants