8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values

[jerboaa]

Please review this refactoring of a container test. It now uses WhiteBox to retrieve the host values it asserts for. In terms of functionality this is basically a no-op except for the now more precise assertion on systems with swap accounting disabled at the kernel level.

Testing

• Container tests on Linux x86_64 cgv1 and cgv2
• Container tests on Linux x86_64 cgv1 and cgv2 on systems with swapaccount=0
• GHA in progress

Thoughts?

---

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-8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values

Reviewers

• Matthias Baesken (@MBaesken - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12097

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

Using diff file

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

[bridgekeeper]

👋 Welcome back sgehwolf! 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]

@jerboaa The following label will be automatically applied to this pull request:

• hotspot

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

[mlbridge]

Webrevs

• 03: Full - Incremental (9d72dbae)
• 02: Full - Incremental (06ab3d80)
• 01: Full (2f8225e5)
• 00: Full (84134b6f)

[jerboaa]

/label add serviceability

[openjdk]

@jerboaa
The serviceability label was successfully added.

[openjdk]

@jerboaa Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

[jerboaa]

GHA test failures seem unrelated.

[jerboaa]

@MBaesken Hi! Could you please help review this as you've touched this area a bit? Thanks.

[MBaesken]

Hi Severin, what do you think about renaming the methods to WB_HostPhysicalMemory / WB_HostPhysicalSwap to make it even more clear that the host values are meant ? On Linux we have values
_physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE);
and
julong os::physical_memory() from os_linux.cpp (including OSContainer::memory_limit_in_bytes()) so these could be 2 different values .

And please adjust the COPYRIGHT years to 2023.

[jerboaa]

@MBaesken Thanks for the review!

what do you think about renaming the methods to WB_HostPhysicalMemory / WB_HostPhysicalSwap to make it even more clear that the host values are meant?

Sure, done.

On Linux we have values _physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE); and julong os::physical_memory() from os_linux.cpp (including OSContainer::memory_limit_in_bytes()) so these could be 2 different values .

Yes. os::Linux::physical_memory() returns the host physical memory. Added with JDK-8292083. os::physical_memory() returns the container memory (if run with a limit). In this case we want the former.

And please adjust the COPYRIGHT years to 2023.

Done.

[MBaesken]

LGTM

[openjdk]

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

8300659: Refactor TestMemoryAwareness to use WhiteBox api for host values

Reviewed-by: mbaesken

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

• 048705c: 8300910: Remove metaprogramming/integralConstant.hpp
• 544c16e: 8300266: Detect Virtualization on Linux aarch64
• 57f2d48: 8300863: Remove C-style array declarations in java.io
• 2292ce1: 8294677: chunklevel::MAX_CHUNK_WORD_SIZE too small for some applications
• 6dd8723: 8290918: Initial nroff manpage generation for JDK 21
• b3822f5: 8300589: Use @snippet and @linkplain in java.text.CollationKey and java.text.CompactNumberFormat
• afd5921: 8298610: Refactor archiving of ConstantPool::resolved_references()
• 937ba1c: 8300111: Add rpath for common lib locations for jpackageapplauncher
• 2da2e5a: 8300946: Add sun/security/provider/certpath/OCSP/OCSPNoContentLength to ProblemList
• 0323609: 8300706: Use @snippet in java.text
• ... and 58 more: https://git.openjdk.org/jdk/compare/d85243f02b34d03bd7af63a5bcbc73f500f720df...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.

[jerboaa]

/integrate

[openjdk]

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

• b2071f7: 8300657: Remove null filtering in CLD oop handle area
• 95fafd0: 8300644: Remove gc/shenandoah/jni/TestStringCriticalWithDedup.java
• 5a478ef: 8297730: C2: Arraycopy intrinsic throws incorrect exception
• 7465de4: 6603771: Nimbus L&F: Ctrl+F7 keybinding for Jinternal Frame throws a NPE.
• fbe5ab0: 8300830: Remove redundant assertion in src/hotspot/share/runtime/javaCalls.cpp
• 1339461: 8300981: Build failure on 32-bit platforms after JDK-8281213
• 81d523d: Merge
• 60b8a98: 8300591: @SuppressWarnings option "lossy-conversions" missing from jdk.compiler module javadoc
• a3ed7e9: 8300623: Lambda deserialization regression involving Enum method reference
• cf46004: 8300272: Improve readability of the test JarWithOneNonDisabledDigestAlg
• ... and 71 more: https://git.openjdk.org/jdk/compare/d85243f02b34d03bd7af63a5bcbc73f500f720df...master

Your commit was automatically rebased without conflicts.

[openjdk]

@jerboaa Pushed as commit 3c61d5a.

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