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

8319875: Add macOS implementation for jcmd System.map #20953

Closed
wants to merge 35 commits into from

Conversation

stooke
Copy link
Contributor

@stooke stooke commented Sep 11, 2024

This is a port of #16301 to macOS.

System.map and System.dump_map are implemented using the macOS API and provide roughly the same information in the same format. Most of the heavy lifting was implemented by @tstuefe in #16301 - this PR adds the macOS implementation and enables the common code for macOS 64 bit.

The System.map tests are also reworked to be cleaner for the three implementations.

sample output using G1GC
sample output using ZGC


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

  • JDK-8319875: Add macOS implementation for jcmd System.map (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20953

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 11, 2024

👋 Welcome back stooke! 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 Sep 11, 2024

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

8319875: Add macOS implementation for jcmd System.map

Reviewed-by: stuefe, szaldana

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

  • 266e3d0: 8345590: AIX 'make all' fails after JDK-8339480
  • 1d2ccae: 8345569: [ubsan] adjustments to filemap.cpp and virtualspace.cpp for macOS aarch64
  • a9a5f7c: 8345323: Parallel GC does not handle UseLargePages and UseNUMA gracefully
  • 367c304: 8346059: [ASAN] awt_LoadLibrary.c reported compile warning ignoring return value of function by clang17
  • 31ceec7: 8346055: javax/swing/text/StyledEditorKit/4506788/bug4506788.java fails in ubuntu22.04
  • 09c29d1: 8346069: Add missing Classpath exception statements
  • 28e49e9: 8345505: Fix -Wzero-as-null-pointer-constant warnings in zero code
  • db9eab3: 8311542: Consolidate the native stack printing code
  • 18e0b34: 8344137: Update XML Security for Java to 3.0.5
  • e9ad27f: 8339313: 32-bit build broken
  • ... and 55 more: https://git.openjdk.org/jdk/compare/a6277bb521e07e569cd75a4641b2a05a26f47b0a...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@tstuefe, @SoniaZaldana) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk
Copy link

openjdk bot commented Sep 11, 2024

@stooke The following labels will be automatically applied to this pull request:

  • core-libs
  • hotspot-runtime
  • serviceability

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added serviceability serviceability-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Sep 11, 2024
@AlanBateman
Copy link
Contributor

/label remove core-libs

@openjdk openjdk bot removed the core-libs core-libs-dev@openjdk.org label Sep 12, 2024
@openjdk
Copy link

openjdk bot commented Sep 12, 2024

@AlanBateman
The core-libs label was successfully removed.

@openjdk
Copy link

openjdk bot commented Sep 18, 2024

@stooke this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout pr_macos_system_dump
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Sep 18, 2024
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Sep 18, 2024
@openjdk openjdk bot removed the rfr Pull request is ready for review label Dec 5, 2024
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 5, 2024
@stooke
Copy link
Contributor Author

stooke commented Dec 5, 2024

@tstuefe , I've actually added the combining code here, and reconfirmed that both the System.map and System.dump_map tests pass on my arm M2, and an ancient x86_64 Macbook.

@openjdk openjdk bot removed the rfr Pull request is ready for review label Dec 6, 2024
Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

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

Okay!

Needs a second review. @ashu-mehra, maybe?

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 9, 2024
@tstuefe
Copy link
Member

tstuefe commented Dec 10, 2024

BTW make sure you merge and test again before integrating. Your branch is quite old. In fact, you should merge upstream often (The rule with merge vs rebase is: you merge after the patch has been un-drafted und RFR mail has been set out; before that, you can rebase).

@stooke
Copy link
Contributor Author

stooke commented Dec 10, 2024

@tstuefe it looks like the aarch64 runner has been fixed. After merging, all tests have passed.

Copy link
Member

@SoniaZaldana SoniaZaldana left a comment

Choose a reason for hiding this comment

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

I am not a Reviewer but this looks good to me. I left a small comment inline. Thanks Simon!

Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

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

Still good. Ship it!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 13, 2024
@stooke
Copy link
Contributor Author

stooke commented Dec 13, 2024

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 13, 2024
@openjdk
Copy link

openjdk bot commented Dec 13, 2024

@stooke
Your change (at version c5cb0f9) is now ready to be sponsored by a Committer.

@tstuefe
Copy link
Member

tstuefe commented Dec 14, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 14, 2024

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 14, 2024

@tstuefe @stooke Pushed as commit 3b9de11.

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

@stooke stooke deleted the pr_macos_system_dump branch January 8, 2025 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

4 participants