Merge pull request #904 from JasonFengJ9/mergestaging

Merge master HEAD into openj9-staging

Author: keithc-ca

make/ModuleWrapper.gmk

@@ -51,7 +51,7 @@ ifeq ($(MAKEFILE_PREFIX), Lib)
   # which static library files to include. The variable $(MODULE)_INCLUDED_LIBS is
   # added to for each call to SetupJdkLibrary. The file module-included-libs.txt is then
   # read in StaticLibs.gmk.
-  ifneq ($($(MODULE)_JDK_LIBS), )
+  ifneq ($($(MODULE)_INCLUDED_LIBS), )
     LIBLIST := $(SUPPORT_OUTPUTDIR)/modules_static-libs/$(MODULE)/module-included-libs.txt
 
     $(LIBLIST): $(TARGETS)

make/autoconf/util.m4

@@ -562,7 +562,7 @@ AC_DEFUN([UTIL_CHECK_TYPE_directory],
 
   if test "[x]ARG_CHECK_FOR_FILES" != "x:"; then
     for file in ARG_CHECK_FOR_FILES; do
-      found_files=$($ECHO $(ls $1/$file 2> /dev/null))
+      found_files=$($ECHO $($LS -d $1/$file 2> /dev/null))
       if test "x$found_files" = x; then
         FAILURE="Directory $1 does not contain $file"
         break

make/test/BuildMicrobenchmark.gmk

@@ -89,6 +89,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \
     SRC := $(MICROBENCHMARK_SRC), \
     BIN := $(MICROBENCHMARK_CLASSES), \
     JAVAC_FLAGS := \
+        --add-exports java.base/jdk.internal.classfile.components=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.classfile.impl=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.event=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \

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

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020, 2022, Red Hat Inc.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,8 +29,8 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.math.BigInteger;
+import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -61,13 +62,13 @@ public interface CgroupSubsystemController {
     public static String getStringValue(CgroupSubsystemController controller, String param) {
         if (controller == null) return null;
 
-        try {
-            return CgroupUtil.readStringValue(controller, param);
-        }
-        catch (IOException e) {
+        Path filePath = Path.of(controller.path(), param);
+        try (Stream<String> lines = Files.lines(filePath)) {
+            Optional<String> firstLine = lines.findFirst();
+            return firstLine.orElse(null);
+        } catch (UncheckedIOException | IOException e) {
             return null;
         }
-
     }
 
     /**
@@ -92,8 +93,8 @@ public static long getLongValueMatchingLine(CgroupSubsystemController controller
             return retval;
         }
         try {
-            Path filePath = Paths.get(controller.path(), param);
-            List<String> lines = CgroupUtil.readAllLinesPrivileged(filePath);
+            Path filePath = Path.of(controller.path(), param);
+            List<String> lines = Files.readAllLines(filePath);
             for (String line : lines) {
                 if (line.startsWith(match)) {
                     retval = conversion.apply(line);
@@ -161,7 +162,7 @@ public static double getDoubleValue(CgroupSubsystemController controller, String
     public static long getLongEntry(CgroupSubsystemController controller, String param, String entryname, long defaultRetval) {
         if (controller == null) return defaultRetval;
 
-        try (Stream<String> lines = CgroupUtil.readFilePrivileged(Paths.get(controller.path(), param))) {
+        try (Stream<String> lines = Files.lines(Path.of(controller.path(), param))) {
 
             Optional<String> result = lines.map(line -> line.split(" "))
                                            .filter(line -> (line.length == 2 &&

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

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020, 2022, Red Hat Inc.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,8 +30,8 @@
 import java.io.UncheckedIOException;
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -140,7 +141,7 @@ public static Optional<CgroupTypeResult> determineType(String mountInfo,
                                                            String cgroups,
                                                            String selfCgroup) throws IOException {
         final Map<String, CgroupInfo> infos = new HashMap<>();
-        List<String> lines = CgroupUtil.readAllLinesPrivileged(Paths.get(cgroups));
+        List<String> lines = Files.readAllLines(Path.of(cgroups));
         for (String line : lines) {
             if (line.startsWith("#")) {
                 continue;
@@ -180,7 +181,7 @@ public static Optional<CgroupTypeResult> determineType(String mountInfo,
         // However, continuing in that case does not make sense as we'd need
         // information from mountinfo for the mounted controller paths which we wouldn't
         // find anyway in that case.
-        lines = CgroupUtil.readAllLinesPrivileged(Paths.get(mountInfo));
+        lines = Files.readAllLines(Path.of(mountInfo));
         boolean anyCgroupMounted = false;
         for (String line: lines) {
             boolean cgroupsControllerFound = amendCgroupInfos(line, infos, isCgroupsV2);
@@ -196,8 +197,7 @@ public static Optional<CgroupTypeResult> determineType(String mountInfo,
         // See:
         //   setCgroupV1Path() for the action run for cgroups v1 systems
         //   setCgroupV2Path() for the action run for cgroups v2 systems
-        try (Stream<String> selfCgroupLines =
-             CgroupUtil.readFilePrivileged(Paths.get(selfCgroup))) {
+        try (Stream<String> selfCgroupLines = Files.lines(Path.of(selfCgroup))) {
             Consumer<String[]> action = (tokens -> setCgroupV1Path(infos, tokens));
             if (isCgroupsV2) {
                 action = (tokens -> setCgroupV2Path(infos, tokens));
@@ -311,7 +311,7 @@ private static boolean amendCgroupInfos(String mntInfoLine,
             String mountPath = lineMatcher.group(2);
             String fsType = lineMatcher.group(3);
             if (fsType.equals("cgroup")) {
-                Path p = Paths.get(mountPath);
+                Path p = Path.of(mountPath);
                 String[] controllerNames = p.getFileName().toString().split(",");
                 for (String controllerName: controllerNames) {
                     switch (controllerName) {

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

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020, 2022, Red Hat Inc.
+ * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,15 +28,16 @@
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import java.nio.file.Paths;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import jdk.internal.platform.CgroupInfo;
 import jdk.internal.platform.CgroupSubsystem;
 import jdk.internal.platform.CgroupSubsystemController;
-import jdk.internal.platform.CgroupUtil;
 
 public class CgroupV2Subsystem implements CgroupSubsystem {
 
@@ -328,10 +330,9 @@ public long getBlkIOServiced() {
     }
 
     private long sumTokensIOStat(Function<String, Long> mapFunc) {
-        try {
-            return CgroupUtil.readFilePrivileged(Paths.get(unified.path(), "io.stat"))
-                                .map(mapFunc)
-                                .collect(Collectors.summingLong(e -> e));
+        try (Stream<String> lines = Files.lines(Path.of(unified.path(), "io.stat"))) {
+            return lines.map(mapFunc)
+                        .collect(Collectors.summingLong(e -> e));
         } catch (UncheckedIOException | IOException e) {
             return CgroupSubsystem.LONG_RETVAL_UNLIMITED;
         }