stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8257746: Regression introduced with JDK-8250984 - memory might be null in some machines

Browse Source 
Reviewed-by: hseigel
This commit is contained in:
Poonam Bajaj 2021-01-28 15:07:03 +00:00
parent 13ca433ff6
commit abc4300de9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java.base/linux/classes/jdk/internal/platform/cgroupv1/CgroupV1Subsystem.java
View File

@ -444,14 +444,14 @@ public class CgroupV1Subsystem implements CgroupSubsystem, CgroupV1Metrics {
} }
public long getMemoryAndSwapFailCount() { public long getMemoryAndSwapFailCount() {
if (!memory.isSwapEnabled()) { if (memory != null && !memory.isSwapEnabled()) {
return getMemoryFailCount(); return getMemoryFailCount();
} }
return getLongValue(memory, "memory.memsw.failcnt"); return getLongValue(memory, "memory.memsw.failcnt");
} }
public long getMemoryAndSwapLimit() { public long getMemoryAndSwapLimit() {
if (!memory.isSwapEnabled()) { if (memory != null && !memory.isSwapEnabled()) {
return getMemoryLimit(); return getMemoryLimit();
} }
long retval = getLongValue(memory, "memory.memsw.limit_in_bytes"); long retval = getLongValue(memory, "memory.memsw.limit_in_bytes");
@ -469,14 +469,14 @@ public class CgroupV1Subsystem implements CgroupSubsystem, CgroupV1Metrics {
} }
public long getMemoryAndSwapMaxUsage() { public long getMemoryAndSwapMaxUsage() {
if (!memory.isSwapEnabled()) { if (memory != null && !memory.isSwapEnabled()) {
return getMemoryMaxUsage(); return getMemoryMaxUsage();
} }
return getLongValue(memory, "memory.memsw.max_usage_in_bytes"); return getLongValue(memory, "memory.memsw.max_usage_in_bytes");
} }
public long getMemoryAndSwapUsage() { public long getMemoryAndSwapUsage() {
if (!memory.isSwapEnabled()) { if (memory != null && !memory.isSwapEnabled()) {
return getMemoryUsage(); return getMemoryUsage();
} }
return getLongValue(memory, "memory.memsw.usage_in_bytes"); return getLongValue(memory, "memory.memsw.usage_in_bytes");