src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemFactory.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
~

*** 43,53 ****
      private static final String CPUACCT_CTRL = "cpuacct";
      private static final String CPUSET_CTRL = "cpuset";
      private static final String BLKIO_CTRL = "blkio";
      private static final String MEMORY_CTRL = "memory";
  
!     static CgroupSubsystem create() {
          Map<String, CgroupInfo> infos = new HashMap<>();
          try {
              List<String> lines = CgroupUtil.readAllLinesPrivileged(Paths.get("/proc/cgroups"));
              for (String line : lines) {
                  if (line.startsWith("#")) {
--- 43,53 ----
      private static final String CPUACCT_CTRL = "cpuacct";
      private static final String CPUSET_CTRL = "cpuset";
      private static final String BLKIO_CTRL = "blkio";
      private static final String MEMORY_CTRL = "memory";
  
!     static CgroupMetrics create() {
          Map<String, CgroupInfo> infos = new HashMap<>();
          try {
              List<String> lines = CgroupUtil.readAllLinesPrivileged(Paths.get("/proc/cgroups"));
              for (String line : lines) {
                  if (line.startsWith("#")) {
*** 122,132 ****
                  return null;
              }
              CgroupSubsystemController unified = new CgroupV2SubsystemController(
                      mountPath,
                      cgroupPath);
!             return new CgroupV2Subsystem(unified);
          } else {
!             return CgroupV1Subsystem.getInstance();
          }
      }
  }
--- 122,132 ----
                  return null;
              }
              CgroupSubsystemController unified = new CgroupV2SubsystemController(
                      mountPath,
                      cgroupPath);
!             return new CgroupMetrics(new CgroupV2Subsystem(unified));
          } else {
!             return new CgroupV1Metrics(CgroupV1Subsystem.getInstance());
          }
      }
  }