[jdk11u-dev] RFR: 8239785: Cgroups: Incorrect detection logic on old systems in hotspot

[Severin Gehwolf]

On Fri, 25 Mar 2022 10:17:45 GMT, Jonathan Dowland <jdowland at openjdk.org> wrote:

> This is a backport of 8239785 for jdk11u. The dependent backports have now all been integrated.
> 
> This PR replaces #881 which was stuck with a dependency on a superseded dependent PR.
> 
> It's not clean, but the only conflict was the copyright line in the
> comment header for src/hotspot/share/prims/whitebox.hpp.
> 
> I'm checking jtreg tests in test/hotspot/jtreg/containers on a mixture of cgroup v1 and v2 systems now.
> 
> ---------
> ### Progress
> - [x] Change must not contain extraneous whitespace
> - [x] Commit message must refer to an issue
> - [ ] Change must be properly reviewed
> 
> ### Error
>  ⚠️ The pull request body must not be empty.
> 
> 
> 
> ### Reviewing
> <details><summary>Using <code>git</code></summary>
> 
> Checkout this PR locally: \
> `$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/946/head:pull/946` \
> `$ git checkout pull/946`
> 
> Update a local copy of the PR: \
> `$ git checkout pull/946` \
> `$ git pull https://git.openjdk.java.net/jdk11u-dev pull/946/head`
> 
> </details>
> <details><summary>Using Skara CLI tools</summary>
> 
> Checkout this PR locally: \
> `$ git pr checkout 946`
> 
> View PR using the GUI difftool: \
> `$ git pr show -t 946`
> 
> </details>
> <details><summary>Using diff file</summary>
> 
> Download this PR as a diff file: \
> <a href="https://git.openjdk.java.net/jdk11u-dev/pull/946.diff">https://git.openjdk.java.net/jdk11u-dev/pull/946.diff</a>
> 
> </details>

[src/hotspot/share/prims/whitebox.hpp](https://github.com/openjdk/jdk11u-dev/pull/946/files#diff-0616ebadb392e16dc81358b7c8e2cdf30e171b91402bedee9aeeb0a4f57c25cc) Doesn't have the Copyright update unlike the original patch. Please add. `WhiteBox.java` on the other hand didn't have the copyright bumped in the original patch, so neither should we here.

Other than that. Looks fine.

test/lib/sun/hotspot/WhiteBox.java line 2:

> 1: /*
> 2:  * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.

This change isn't in the original patch. Please remove.

-------------

Changes requested by sgehwolf (Reviewer).

PR: https://git.openjdk.java.net/jdk11u-dev/pull/946