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

8281015: Further simplify NMT backend #1820

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Oct 2, 2023

I backport this as prereq of some useful NMT improvements: JDK-8292072j, JDK-8292948, JDK-8292898.

I had to do some trivial resolves and adaptions to make it build. See also extra commits.

src/hotspot/share/runtime/os.cpp
Resolved because "8286519 Better memory handling." is in the context.

src/hotspot/share/services/mallocTracker.cpp
Deleted function release() uses check_block_integrity() which is named assert_block_integrity() in head.
This came with "8280289: Enhance debug pp() command with NMT info"

The change to MallocTracker::print_pointer_information() can not be applied.
The patched code is only introduced in "8281023: NMT integration into pp debug command does not work"
which is in 19 only. The code refactored into this function stems from debug.cpp and
was introduced there in "8280289: Enhance debug pp() command with NMT info".
Omitted.

src/hotspot/share/services/mallocTracker.hpp
Also naming difference of check_block_integrity() because "8280289: Enhance debug pp() command with NMT info" not in 19.

src/hotspot/share/services/memTracker.hpp
Resolved #include.

The new code brought two calls to assert_block_integrity() which I changed to call check_block_integrity().


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-8281015 needs maintainer approval

Issue

  • JDK-8281015: Further simplify NMT backend (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1820

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

Using diff file

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

Webrev

Link to Webrev Comment

@GoeLin GoeLin changed the title Goetz backport 8281015 Backport b96b743727a628c1b33cc9b3374f010c2ea30b78 Oct 2, 2023
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 2, 2023

👋 Welcome back goetz! 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 b96b743727a628c1b33cc9b3374f010c2ea30b78 8281015: Further simplify NMT backend Oct 2, 2023
@openjdk
Copy link

openjdk bot commented Oct 2, 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 2, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 2, 2023

Webrevs

@GoeLin GoeLin marked this pull request as draft October 2, 2023 08:55
@openjdk openjdk bot removed the rfr Pull request is ready for review label Oct 2, 2023
@GoeLin GoeLin marked this pull request as ready for review October 2, 2023 10:36
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 2, 2023
Copy link

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented Oct 4, 2023

⚠️ @GoeLin 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 4, 2023
@openjdk
Copy link

openjdk bot commented Oct 4, 2023

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

8281015: Further simplify NMT backend

Reviewed-by: lucy

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

  • 2589bf3: 8316514: Better diagnostic header for VtableStub
  • cde511d: 8316743: RISC-V: Change UseVectorizedMismatchIntrinsic option result to warning
  • ceafbb7: 8295424: adjust timeout for another JLI GetObjectSizeIntrinsicsTest.java subtest
  • 26fb0f8: 8299748: java/util/zip/Deinflate.java failing on s390x
  • 91332e2: 8298869: Update ConnectionTest.java for changes to TLS implementation
  • 28adafc: 8298873: Update IllegalRecordVersion.java for changes to TLS implementation
  • fca2792: 8198668: MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001/TestDescription.java still failing
  • 54533e5: 8271887: mark hotspot runtime/CDSCompressedKPtrs tests which ignore external VM flags
  • 644e410: 8271828: mark hotspot runtime/classFileParserBug tests which ignore external VM flags
  • 003f4f4: 8271829: mark hotspot runtime/Throwable tests which ignore external VM flags

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 and removed approval labels Oct 4, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Oct 4, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Oct 4, 2023

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

  • fa40b5f: 8315766: Parallelize gc/stress/TestStressIHOPMultiThread.java test
  • 2589bf3: 8316514: Better diagnostic header for VtableStub
  • cde511d: 8316743: RISC-V: Change UseVectorizedMismatchIntrinsic option result to warning
  • ceafbb7: 8295424: adjust timeout for another JLI GetObjectSizeIntrinsicsTest.java subtest
  • 26fb0f8: 8299748: java/util/zip/Deinflate.java failing on s390x
  • 91332e2: 8298869: Update ConnectionTest.java for changes to TLS implementation
  • 28adafc: 8298873: Update IllegalRecordVersion.java for changes to TLS implementation
  • fca2792: 8198668: MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001/TestDescription.java still failing
  • 54533e5: 8271887: mark hotspot runtime/CDSCompressedKPtrs tests which ignore external VM flags
  • 644e410: 8271828: mark hotspot runtime/classFileParserBug tests which ignore external VM flags
  • ... and 1 more: https://git.openjdk.org/jdk17u-dev/compare/174c32911d3ca563e98f0303b5eee45d66f97ece...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 4, 2023

@GoeLin Pushed as commit aa54750.

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

@GoeLin GoeLin deleted the goetz_backport_8281015 branch October 4, 2023 19:13
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
2 participants