src/java.base/linux/classes/jdk/internal/platform/CgroupMetrics.java

@  rev 57734 : Review feedback
|
o  rev 57733 : 8231111: Cgroups v2: Rework Metrics in java.base so as to recognize unified hierarchy
|  Reviewed-by: bobv, mchung
~
o  rev 56862 : 8231111: Cgroups v2: Rework Metrics in java.base so as to recognize unified hierarchy
|  Reviewed-by: bobv
~

*** 27,39 ****
  
  import java.util.Objects;
  
  public class CgroupMetrics implements Metrics {
  
!     private final CgroupSubsystem subsystem;
  
!     private CgroupMetrics(CgroupSubsystem subsystem) {
          this.subsystem = Objects.requireNonNull(subsystem);
      }
  
      @Override
      public String getProvider() {
--- 27,39 ----
  
  import java.util.Objects;
  
  public class CgroupMetrics implements Metrics {
  
!     protected final CgroupSubsystem subsystem;
  
!     CgroupMetrics(CgroupSubsystem subsystem) {
          this.subsystem = Objects.requireNonNull(subsystem);
      }
  
      @Override
      public String getProvider() {
*** 113,218 ****
      @Override
      public int[] getEffectiveCpuSetMems() {
          return subsystem.getEffectiveCpuSetMems();
      }
  
-     @Override
-     public double getCpuSetMemoryPressure() {
-         return subsystem.getCpuSetMemoryPressure();
-     }
- 
-     @Override
-     public Boolean isCpuSetMemoryPressureEnabled() {
-         return subsystem.isCpuSetMemoryPressureEnabled();
-     }
- 
-     @Override
      public long getMemoryFailCount() {
          return subsystem.getMemoryFailCount();
      }
  
      @Override
      public long getMemoryLimit() {
          return subsystem.getMemoryLimit();
      }
  
      @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();
      }
  
      @Override
--- 113,152 ----
*** 224,233 ****
      public long getBlkIOServiced() {
          return subsystem.getBlkIOServiced();
      }
  
      public static Metrics getInstance() {
!         CgroupSubsystem subsystem = CgroupSubsystemFactory.create();
!         return new CgroupMetrics(subsystem);
      }
  
  }
\ No newline at end of file
--- 158,166 ----
      public long getBlkIOServiced() {
          return subsystem.getBlkIOServiced();
      }
  
      public static Metrics getInstance() {
!         return CgroupSubsystemFactory.create();
      }
  
  }
\ No newline at end of file