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

8237542: JMapHeapConfigTest.java doesn't work with negative jlong values #15368

Closed

Conversation

plummercj
Copy link
Contributor

@plummercj plummercj commented Aug 21, 2023

The test tries to match up various GC -XX:+PrintFlagsFinal values with the output of jhsdb -jmap --pid --heap. With ZGC, MaxNewSize set to (size_t)-1, but PrintFlagsFinal prints it as an unsigned long:

size_t MaxNewSize = 18446744073709551615 {product} {default} 

jmap normally prints out both the raw size and the MB size. For example:

MaxHeapSize = 805306368 (768.0MB)

But as part of the fix for JDK-6718125, it stopped printing the raw value for negative values an only printed the MB value. So for MaxNewSize we had:

 MaxNewSize = 17592186044415 MB

Instead of:

MaxNewSize = 18446744073709551615 (17592186044415 MB)

So the test fails to find 18446744073709551615 in the output. I fixed jmap to include the raw value as an unsigned long, even if negative as a signed long (to be consistent with PrintFlagsFinal output), so now the test passes even when MaxNewSize is included in the list.


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-8237542: JMapHeapConfigTest.java doesn't work with negative jlong values (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15368

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 21, 2023

👋 Welcome back cjplummer! 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 8237542 8237542: JMapHeapConfigTest.java doesn't work with negative jlong values Aug 21, 2023
@openjdk
Copy link

openjdk bot commented Aug 21, 2023

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

  • core-libs
  • hotspot-gc
  • 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 core-libs core-libs-dev@openjdk.org hotspot-gc hotspot-gc-dev@openjdk.org labels Aug 21, 2023
@plummercj
Copy link
Contributor Author

/label remove core-libs

@openjdk openjdk bot removed the core-libs core-libs-dev@openjdk.org label Aug 21, 2023
@openjdk
Copy link

openjdk bot commented Aug 21, 2023

@plummercj
The core-libs label was successfully removed.

@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 21, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 21, 2023

Webrevs

Copy link
Contributor

@sspitsyn sspitsyn 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.
Thanks,
Serguei

@openjdk
Copy link

openjdk bot commented Aug 23, 2023

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

8237542: JMapHeapConfigTest.java doesn't work with negative jlong values

Reviewed-by: sspitsyn, shade

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

  • c418933: 8313530: VM build without C2 fails after JDK-8312579
  • de0e46c: 8303815: Improve Metaspace test speed
  • 3699666: 8313319: [linux] mmap should use MAP_FIXED_NOREPLACE if available
  • 3285a1e: 8314555: Build with mawk fails on Windows
  • 4a50e87: 8303852: current_stack_region() gets called twice unnecessarily
  • c077be4: 8314694: Separate checked_cast from globalDefinitions.hpp
  • 68815d5: 8314734: Remove unused field TypeVariableImpl.EMPTY_ANNOTATION_ARRAY
  • 57a322d: 8308042: [macos] Developer ID Application Certificate not picked up by jpackage if it contains UNICODE characters
  • 38a9edf: 8314679: SA fails to properly attach to JVM after having just detached from a different JVM
  • 2c60cad: 8280743: HSDB "Monitor Cache Dump" command might throw NPE
  • ... and 30 more: https://git.openjdk.org/jdk/compare/78f74bc8ff1e673991d91a55ef70880d9fb3f6b5...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 the ready Pull request is ready to be integrated label Aug 23, 2023
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

(size_t)-1 is a weird value to pass, which requires this gymnastics in the output code.
But I guess this is as good as it gets for the test-side fix.

Please test with all current GCs? We have seen regressions in this test with Shenandoah previously.

@plummercj
Copy link
Contributor Author

Please test with all current GCs? We have seen regressions in this test with Shenandoah previously.

Passed with G1, Z, ZGenerational, Shenandoah, Serial, and Parallel.

@plummercj
Copy link
Contributor Author

thanks you for the reviews Serguei and Aleksey!

/integrate

@openjdk
Copy link

openjdk bot commented Aug 25, 2023

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

  • d0cc043: 8314550: [macosx-aarch64] serviceability/sa/TestJmapCore.java fails with "sun.jvm.hotspot.debugger.UnmappedAddressException: 801000800"
  • 837d2e1: 8314483: Optionally override copyright header in generated source
  • 3201623: 8310454: Introduce static-libs-graal bundle
  • e9ba8d5: 8314960: Add Certigna Root CA - 2
  • 837cf85: 8312547: Max/Min nodes Value implementation could be improved
  • 7342f5a: 8314333: Update com/sun/jdi/ProcessAttachTest.java to use ProcessTools.createTestJvm(..)
  • f139f30: 8315033: Problemlist java/lang/template/StringTemplateTest.java
  • f2383b3: 8314063: The socket is not closed in Connection::createSocket when the handshake failed for LDAP connection
  • dcd6e75: 8314990: Generational ZGC: Strong OopStorage stats reported as weak roots
  • 002b594: 8312749: Generational ZGC: Tests crash with assert(index == 0 || is_power_of_2(index))
  • ... and 49 more: https://git.openjdk.org/jdk/compare/78f74bc8ff1e673991d91a55ef70880d9fb3f6b5...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 25, 2023

@plummercj Pushed as commit 8a5db6b.

💡 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
hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

3 participants