--- old/src/java.base/linux/classes/jdk/internal/platform/CgroupMetrics.java 2020-02-11 18:27:57.215476729 +0100 +++ new/src/java.base/linux/classes/jdk/internal/platform/CgroupMetrics.java 2020-02-11 18:27:57.082476289 +0100 @@ -29,9 +29,9 @@ public class CgroupMetrics implements Metrics { - private final CgroupSubsystem subsystem; + protected final CgroupSubsystem subsystem; - private CgroupMetrics(CgroupSubsystem subsystem) { + CgroupMetrics(CgroupSubsystem subsystem) { this.subsystem = Objects.requireNonNull(subsystem); } @@ -115,17 +115,6 @@ return subsystem.getEffectiveCpuSetMems(); } - @Override - public double getCpuSetMemoryPressure() { - return subsystem.getCpuSetMemoryPressure(); - } - - @Override - public Boolean isCpuSetMemoryPressureEnabled() { - return subsystem.isCpuSetMemoryPressureEnabled(); - } - - @Override public long getMemoryFailCount() { return subsystem.getMemoryFailCount(); } @@ -136,81 +125,26 @@ } @Override - public long getMemoryMaxUsage() { - return subsystem.getMemoryMaxUsage(); - } - - @Override public long getMemoryUsage() { return subsystem.getMemoryUsage(); } @Override - public long getKernelMemoryFailCount() { - return subsystem.getKernelMemoryFailCount(); - } - - @Override - public long getKernelMemoryLimit() { - return subsystem.getKernelMemoryLimit(); - } - - @Override - public long getKernelMemoryMaxUsage() { - return subsystem.getKernelMemoryMaxUsage(); - } - - @Override - public long getKernelMemoryUsage() { - return subsystem.getKernelMemoryUsage(); - } - - @Override - public long getTcpMemoryFailCount() { - return subsystem.getTcpMemoryFailCount(); - } - - @Override - public long getTcpMemoryLimit() { - return subsystem.getTcpMemoryLimit(); - } - - @Override - public long getTcpMemoryMaxUsage() { - return subsystem.getTcpMemoryMaxUsage(); - } - - @Override public long getTcpMemoryUsage() { return subsystem.getTcpMemoryUsage(); } @Override - public long getMemoryAndSwapFailCount() { - return subsystem.getMemoryAndSwapFailCount(); - } - - @Override public long getMemoryAndSwapLimit() { return subsystem.getMemoryAndSwapLimit(); } @Override - public long getMemoryAndSwapMaxUsage() { - return subsystem.getMemoryAndSwapMaxUsage(); - } - - @Override public long getMemoryAndSwapUsage() { return subsystem.getMemoryAndSwapUsage(); } @Override - public Boolean isMemoryOOMKillEnabled() { - return subsystem.isMemoryOOMKillEnabled(); - } - - @Override public long getMemorySoftLimit() { return subsystem.getMemorySoftLimit(); } @@ -226,8 +160,7 @@ } public static Metrics getInstance() { - CgroupSubsystem subsystem = CgroupSubsystemFactory.create(); - return new CgroupMetrics(subsystem); + return CgroupSubsystemFactory.create(); } } \ No newline at end of file