Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GR-46420] Use cgroup support from JDK. #7265

Merged
merged 8 commits into from
Aug 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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