Skip to content

Commit 7b2e2db

Browse files
committed
[GR-64222] Adopt "JDK-8349988: Change cgroup version detection logic to not depend on /proc/cgroups" in libsvm_container
PullRequest: graal/20570
2 parents c35cd9d + ec1c9a7 commit 7b2e2db

File tree

10 files changed

+227
-152
lines changed

10 files changed

+227
-152
lines changed

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -48,46 +48,46 @@
4848
@CContext(ContainerLibraryDirectives.class)
4949
@CLibrary(value = "svm_container", requireStatic = true, dependsOn = "m")
5050
// The following annotations are for files in `src/hotspot`, which are copied from the JDK
51-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/java.base/share/native/include/jni.h")
52-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+6/src/java.base/unix/native/include/jni_md.h")
51+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/java.base/share/native/include/jni.h")
52+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/java.base/unix/native/include/jni_md.h")
5353
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupSubsystem_linux.cpp")
5454
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupSubsystem_linux.hpp")
55-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/os/linux/cgroupUtil_linux.cpp")
56-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/os/linux/cgroupUtil_linux.hpp")
57-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp")
58-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp")
59-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp")
60-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp")
61-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/os/linux/osContainer_linux.cpp")
62-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/os/linux/osContainer_linux.hpp")
63-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+17/src/hotspot/os/linux/os_linux.cpp")
64-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/os/linux/os_linux.hpp")
65-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/os/linux/os_linux.inline.hpp")
66-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/os/posix/include/jvm_md.h")
55+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupUtil_linux.cpp")
56+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupUtil_linux.hpp")
57+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp")
58+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp")
59+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp")
60+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp")
61+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/osContainer_linux.cpp")
62+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/osContainer_linux.hpp")
63+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/os_linux.cpp")
64+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/os_linux.hpp")
65+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/os_linux.inline.hpp")
66+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/posix/include/jvm_md.h")
6767
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/posix/os_posix.cpp")
68-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/os/posix/os_posix.hpp")
69-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/os/posix/os_posix.inline.hpp")
70-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/share/memory/allocation.hpp")
71-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/share/memory/allocation.inline.hpp")
72-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/share/memory/allStatic.hpp")
73-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/share/nmt/memTag.hpp")
74-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+17/src/hotspot/share/runtime/os.cpp")
75-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/share/runtime/os.hpp")
76-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/share/runtime/os.inline.hpp")
77-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/share/utilities/checkedCast.hpp")
78-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/share/utilities/compilerWarnings_gcc.hpp")
79-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/share/utilities/compilerWarnings.hpp")
80-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+16/src/hotspot/share/utilities/globalDefinitions_gcc.hpp")
81-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+16/src/hotspot/share/utilities/globalDefinitions.hpp")
82-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/share/utilities/macros.hpp")
68+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/posix/os_posix.hpp")
69+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/posix/os_posix.inline.hpp")
70+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/memory/allocation.hpp")
71+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/memory/allocation.inline.hpp")
72+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/memory/allStatic.hpp")
73+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/nmt/memTag.hpp")
74+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/runtime/os.cpp")
75+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/runtime/os.hpp")
76+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/runtime/os.inline.hpp")
77+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/checkedCast.hpp")
78+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/compilerWarnings_gcc.hpp")
79+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/compilerWarnings.hpp")
80+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/globalDefinitions_gcc.hpp")
81+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/globalDefinitions.hpp")
82+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/macros.hpp")
8383
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/ostream.cpp")
8484
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/ostream.hpp")
8585
// The following annotations are for files in `src/svm`, which are completely customized for SVM
86-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/share/logging/log.hpp")
87-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/share/memory/allocation.cpp")
88-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+15/src/hotspot/share/runtime/globals.hpp")
89-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/share/utilities/debug.cpp")
90-
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+13/src/hotspot/share/utilities/debug.hpp")
86+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/logging/log.hpp")
87+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/memory/allocation.cpp")
88+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/runtime/globals.hpp")
89+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/debug.cpp")
90+
@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/share/utilities/debug.hpp")
9191
public class ContainerLibrary {
9292
static final int VERSION = 240100;
9393

0 commit comments

Comments
 (0)