-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
JDK-8324598: use mem_unit when working with sysinfo memory and swap related information #17550
Conversation
👋 Welcome back mbaesken! A progress list of the required criteria for merging this PR into |
Webrevs
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks fine.
Minor nit with lack of parentheses.
Thanks
src/hotspot/os/linux/os_linux.cpp
Outdated
@@ -417,7 +417,7 @@ pid_t os::Linux::gettid() { | |||
julong os::Linux::host_swap() { | |||
struct sysinfo si; | |||
sysinfo(&si); | |||
return (julong)si.totalswap; | |||
return (julong)si.totalswap * si.mem_unit; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion: `(julong)(si.totalswap * si.mem_unit);
@@ -54,5 +54,5 @@ Java_jdk_internal_platform_CgroupMetrics_getTotalSwapSize0 | |||
if (retval < 0) { | |||
return 0; // syinfo failed, treat as no swap | |||
} | |||
return (jlong)si.totalswap; | |||
return (jlong)si.totalswap * si.mem_unit; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion: `(julong)(si.totalswap * si.mem_unit);
@MBaesken 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:
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 18 new commits pushed to the
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 |
Thanks for the review! I followed your suggestions regarding parenthesis. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would have preferred the original version, but it's ok either way.
Hi Martin, thanks for the review ! /integrate |
Going to push as commit 7a798d3.
Your commit was automatically rebased without conflicts. |
According to the sysinfo manpage ( https://man7.org/linux/man-pages/man2/sysinfo.2.html ) the memory and swap related entries in the struct sysinfo are given as multiples of mem_unit bytes.
"In the above structure, sizes of the memory and swap fields are given as multiples of mem_unit bytes."
This is considered in most parts of the OpenJDK codebase when sysinfo is used but not all; should be added where it is missing.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/17550/head:pull/17550
$ git checkout pull/17550
Update a local copy of the PR:
$ git checkout pull/17550
$ git pull https://git.openjdk.org/jdk.git pull/17550/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 17550
View PR using the GUI difftool:
$ git pr show -t 17550
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17550.diff
Webrev
Link to Webrev Comment