[GR-38950] Removed deprecated HotSpotGraalRuntime management bean.

PullRequest: graal/12511
oldcwj · Aug 28, 2022 · 6249223 · 6249223
2 parents 99ceb46 + 79fe2ca
commit 6249223
Show file tree

Hide file tree

Showing 24 changed files with 10 additions and 4,042 deletions.
diff --git a/compiler/CHANGELOG.md b/compiler/CHANGELOG.md
@@ -5,6 +5,7 @@ This changelog summarizes newly introduced optimizations that may be relevant to
 ## Version 22.3.0
 * (GR-32382): Added a dedicated Native Image GC policy for libgraal that will adjust the eden space aggressively to
 minimize RSS memory usage.
+* (GR-38950): Removed deprecated JMX `HotSpotGraalRuntime` management bean from both `libgraal` and `jargraal`.
 
 ## Version 22.2.0
 * (GR-23737): New global value numbering optimization for fixed nodes early in the compilation pipeline.

diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
@@ -612,23 +612,6 @@
       "workingSets" : "Graal,HotSpot",
     },
 
-    "org.graalvm.compiler.hotspot.management" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.compiler.hotspot",
-      ],
-      "requires" : [
-        "java.management",
-      ],
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "annotationProcessors" : [
-        "GRAAL_PROCESSOR",
-      ],
-      "javaCompliance" : "11+",
-      "workingSets" : "Graal,HotSpot",
-    },
-
     "org.graalvm.compiler.management" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
@@ -646,54 +629,6 @@
       "workingSets" : "Graal,HotSpot",
     },
 
-    "org.graalvm.compiler.hotspot.management.libgraal.annotation" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.libgraal.jni.annotation",
-      ],
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "javaCompliance" : "11+",
-      "workingSets" : "Graal",
-    },
-
-    "org.graalvm.compiler.hotspot.management.libgraal.processor" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.compiler.hotspot.management.libgraal.annotation",
-        "org.graalvm.libgraal.jni.processor",
-      ],
-      "requires" : [
-        "java.compiler" # javax.annotation.processing.*
-      ],
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "javaCompliance" : "11+",
-      "workingSets" : "Graal",
-    },
-
-    "org.graalvm.compiler.hotspot.management.libgraal" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.libgraal",
-        "org.graalvm.libgraal.jni",
-        "org.graalvm.compiler.hotspot.management",
-        "org.graalvm.compiler.hotspot.management.libgraal.annotation",
-      ],
-      "requires" : [
-        "java.management",
-      ],
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "checkPackagePrefix" : "false",
-      "annotationProcessors" : [
-        "GRAAL_PROCESSOR",
-        "GRAAL_LIBGRAAL_PROCESSOR",
-      ],
-      "javaCompliance" : "11+",
-      "workingSets" : "Graal,HotSpot",
-    },
-
     "org.graalvm.compiler.hotspot.aarch64" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
@@ -2039,7 +1974,6 @@
       "dependencies" : [
         "org.graalvm.libgraal.jni.processor",
         "org.graalvm.compiler.truffle.compiler.hotspot.libgraal.processor",
-        "org.graalvm.compiler.hotspot.management.libgraal.processor"
       ],
       "distDependencies" : ["GRAAL_PROCESSOR"],
       "maven": False,
@@ -2073,7 +2007,6 @@
           "org.graalvm.compiler.debug.DebugHandlersFactory",
           "org.graalvm.compiler.debug.TTYStreamProvider",
           "org.graalvm.compiler.debug.PathUtilitiesProvider",
-          "org.graalvm.compiler.hotspot.HotSpotGraalManagementRegistration",
           "org.graalvm.compiler.hotspot.HotSpotCodeCacheListener",
           "org.graalvm.compiler.hotspot.HotSpotBackendFactory",
           "org.graalvm.compiler.hotspot.meta.HotSpotInvocationPluginProvider",
@@ -2151,7 +2084,6 @@
       "subDir" : "src",
       "dependencies" : [
         "org.graalvm.compiler.management",
-        "org.graalvm.compiler.hotspot.management",
       ],
       "distDependencies" : [
         "GRAAL",
@@ -2168,22 +2100,6 @@
       },
     },
 
-    "GRAAL_MANAGEMENT_LIBGRAAL": {
-      "subDir" : "src",
-      "dependencies" : [
-        "org.graalvm.compiler.hotspot.management.libgraal",
-      ],
-      "overlaps" : [
-        "GRAAL_LIBGRAAL_PROCESSOR"
-      ],
-      "distDependencies" : [
-        "GRAAL_MANAGEMENT",
-        "GRAAL",
-      ],
-      "maven": False,
-      "javaCompliance" : "11+",
-    },
-
     "GRAAL_COMPILER_WHITEBOX_MICRO_BENCHMARKS" : {
       "subDir" : "src",
       "dependencies" : [

diff --git a/...tion/src/org/graalvm/compiler/hotspot/management/libgraal/annotation/JMXFromLibGraal.java b/...tion/src/org/graalvm/compiler/hotspot/management/libgraal/annotation/JMXFromLibGraal.java
diff --git a/.../org/graalvm/compiler/hotspot/management/libgraal/annotation/JMXFromLibGraalRepeated.java b/.../org/graalvm/compiler/hotspot/management/libgraal/annotation/JMXFromLibGraalRepeated.java
diff --git a/...tation/src/org/graalvm/compiler/hotspot/management/libgraal/annotation/JMXToLibGraal.java b/...tation/src/org/graalvm/compiler/hotspot/management/libgraal/annotation/JMXToLibGraal.java
diff --git a/...management.libgraal.processor/src/META-INF/services/javax.annotation.processing.Processor b/...management.libgraal.processor/src/META-INF/services/javax.annotation.processing.Processor
diff --git a/.../org/graalvm/compiler/hotspot/management/libgraal/processor/JMXFromLibGraalProcessor.java b/.../org/graalvm/compiler/hotspot/management/libgraal/processor/JMXFromLibGraalProcessor.java