Skip to content

Commit

Permalink
[GR-46420] Use cgroup support from JDK.
Browse files Browse the repository at this point in the history
PullRequest: graal/15231
  • Loading branch information
pejovica committed Aug 25, 2023
2 parents 414a4bb + d5a2018 commit 885bb0e
Show file tree
Hide file tree
Showing 27 changed files with 84 additions and 2,813 deletions.
1 change: 1 addition & 0 deletions substratevm/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ This changelog summarizes major changes to GraalVM Native Image.
* (GR-47647) Add `--color[=WHEN]` option to color the output WHEN ('always', 'never', or 'auto'). This API option supersedes the experimental option `-H:+BuildOutputColorful`.
* (GR-43920) Add support for executing native image bundles as jar files with extra options `--with-native-image-agent` and `--container`.
* (GR-43920) Add `,container[=<container-tool>]`, `,dockerfile=<dockerfile>` and `,dry-run` options to `--bundle-create`and `--bundle-apply`.
* (GR-46420) Switch to directly using cgroup support from the JDK.

## GraalVM for JDK 17 and GraalVM for JDK 20 (Internal Version 23.0.0)
* (GR-40187) Report invalid use of SVM specific classes on image class- or module-path as error. As a temporary workaround, `-H:+AllowDeprecatedBuilderClassesOnImageClasspath` allows turning the error into a warning.
Expand Down
3 changes: 3 additions & 0 deletions substratevm/mx.substratevm/mx_substratevm.py
Original file line number Diff line number Diff line change
Expand Up @@ -1304,6 +1304,9 @@ def _native_image_launcher_extra_jvm_args():

# URLClassLoader causes considerable increase of the libgraal image size and should be excluded.
'-H:ReportAnalysisForbiddenType=java.net.URLClassLoader',

# No need for container support in libgraal as HotSpot already takes care of it
'-H:-UseContainerSupport',
] + ([
# Force page size to support libgraal on AArch64 machines with a page size up to 64K.
'-H:PageSize=64K'
Expand Down
17 changes: 1 addition & 16 deletions substratevm/mx.substratevm/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@
"jdk.internal.misc",
"jdk.internal.module",
"jdk.internal.perf",
"jdk.internal.platform",
"jdk.internal.ref",
"jdk.internal.reflect",
"jdk.internal.vm",
Expand Down Expand Up @@ -306,21 +307,6 @@
"jacoco" : "exclude",
},

"com.oracle.svm.core.containers": {
"subDir": "src",
"sourceDirs": ["src"],
"dependencies": ["com.oracle.svm.core"],
"javaCompliance" : "17+",
"annotationProcessors": [
"compiler:GRAAL_PROCESSOR",
"SVM_PROCESSOR",
],
"workingSets": "SVM",
"spotbugs": "false",
"jacoco" : "exclude",
},


"com.oracle.svm.core.genscavenge": {
"subDir": "src",
"sourceDirs": [
Expand Down Expand Up @@ -1386,7 +1372,6 @@
"com.oracle.svm.core.posix",
"com.oracle.svm.core.windows",
"com.oracle.svm.core.genscavenge",
"com.oracle.svm.core.containers",
],
"distDependencies": [
"sdk:NATIVEIMAGE",
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 885bb0e

Please sign in to comment.