8182701: Modify JVMCI to allow Graal Compiler to expose platform MBean
Reviewed-by: dnsimon, kvn, alanb, mchung, dfuchs
This commit is contained in:
parent
c56b6c1c4f
commit
d72e093a74
make/common
src
java.management/share/classes
jdk.internal.vm.ci/share/classes
jdk.internal.vm.compiler.management/share/classes
jdk.internal.vm.compiler/share/classes
module-info.java
org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot
@ -113,6 +113,7 @@ PLATFORM_MODULES += \
|
||||
jdk.crypto.ec \
|
||||
jdk.dynalink \
|
||||
jdk.incubator.httpclient \
|
||||
jdk.internal.vm.compiler.management \
|
||||
jdk.jsobject \
|
||||
jdk.localedata \
|
||||
jdk.naming.dns \
|
||||
@ -215,6 +216,7 @@ endif
|
||||
|
||||
ifeq ($(INCLUDE_GRAAL), false)
|
||||
MODULES_FILTER += jdk.internal.vm.compiler
|
||||
MODULES_FILTER += jdk.internal.vm.compiler.management
|
||||
endif
|
||||
|
||||
################################################################################
|
||||
|
@ -64,7 +64,8 @@ module java.management {
|
||||
exports sun.management.counter.perf to
|
||||
jdk.management.agent;
|
||||
exports sun.management.spi to
|
||||
jdk.management;
|
||||
jdk.management,
|
||||
jdk.internal.vm.compiler.management;
|
||||
|
||||
uses javax.management.remote.JMXConnectorProvider;
|
||||
uses javax.management.remote.JMXConnectorServerProvider;
|
||||
|
@ -25,6 +25,9 @@
|
||||
|
||||
module jdk.internal.vm.ci {
|
||||
exports jdk.vm.ci.services to jdk.internal.vm.compiler;
|
||||
exports jdk.vm.ci.runtime to
|
||||
jdk.internal.vm.compiler,
|
||||
jdk.internal.vm.compiler.management;
|
||||
|
||||
uses jdk.vm.ci.services.JVMCIServiceLocator;
|
||||
uses jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;
|
||||
|
@ -0,0 +1,41 @@
|
||||
/*
|
||||
* Copyright (c) 2017, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation. Oracle designates this
|
||||
* particular file as subject to the "Classpath" exception as provided
|
||||
* by Oracle in the LICENSE file that accompanied this code.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Registers Graal Compiler specific management interfaces for the JVM.
|
||||
*
|
||||
* @moduleGraph
|
||||
* @since 10
|
||||
*/
|
||||
module jdk.internal.vm.compiler.management {
|
||||
requires java.management;
|
||||
requires jdk.management;
|
||||
requires jdk.internal.vm.ci;
|
||||
requires jdk.internal.vm.compiler;
|
||||
|
||||
provides sun.management.spi.PlatformMBeanProvider with
|
||||
org.graalvm.compiler.hotspot.jmx.GraalMBeans;
|
||||
}
|
||||
|
91
src/jdk.internal.vm.compiler.management/share/classes/org/graalvm/compiler/hotspot/jmx/GraalMBeans.java
Normal file
91
src/jdk.internal.vm.compiler.management/share/classes/org/graalvm/compiler/hotspot/jmx/GraalMBeans.java
Normal file
@ -0,0 +1,91 @@
|
||||
/*
|
||||
* Copyright (c) 2017, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
package org.graalvm.compiler.hotspot.jmx;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import jdk.vm.ci.runtime.JVMCI;
|
||||
import jdk.vm.ci.runtime.JVMCICompiler;
|
||||
import jdk.vm.ci.runtime.JVMCIRuntime;
|
||||
import org.graalvm.compiler.hotspot.HotSpotGraalCompiler;
|
||||
import sun.management.spi.PlatformMBeanProvider;
|
||||
import sun.management.spi.PlatformMBeanProvider.PlatformComponent;
|
||||
|
||||
public final class GraalMBeans extends PlatformMBeanProvider {
|
||||
@Override
|
||||
public List<PlatformComponent<?>> getPlatformComponentList() {
|
||||
List<PlatformComponent<?>> components = new ArrayList<>();
|
||||
try {
|
||||
Object bean = findGraalRuntimeBean();
|
||||
if (bean != null) {
|
||||
components.add(new HotSpotRuntimeMBeanComponent(bean));
|
||||
}
|
||||
} catch (InternalError | LinkageError err) {
|
||||
// go on and ignore
|
||||
}
|
||||
return components;
|
||||
}
|
||||
|
||||
public static Object findGraalRuntimeBean() {
|
||||
JVMCIRuntime r = JVMCI.getRuntime();
|
||||
JVMCICompiler c = r.getCompiler();
|
||||
if (c instanceof HotSpotGraalCompiler) {
|
||||
return ((HotSpotGraalCompiler) c).mbean();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static final class HotSpotRuntimeMBeanComponent implements PlatformComponent<Object> {
|
||||
|
||||
private final String name;
|
||||
private final Object mbean;
|
||||
|
||||
HotSpotRuntimeMBeanComponent(Object mbean) {
|
||||
this.name = "org.graalvm.compiler.hotspot:type=Options";
|
||||
this.mbean = mbean;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<Class<?>> mbeanInterfaces() {
|
||||
return Collections.emptySet();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<String> mbeanInterfaceNames() {
|
||||
return Collections.emptySet();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getObjectNamePattern() {
|
||||
return name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> nameToMBeanMap() {
|
||||
return Collections.<String, Object>singletonMap(name, mbean);
|
||||
}
|
||||
}
|
||||
}
|
@ -50,7 +50,9 @@ module jdk.internal.vm.compiler {
|
||||
exports org.graalvm.compiler.core.target to jdk.aot;
|
||||
exports org.graalvm.compiler.debug to jdk.aot;
|
||||
exports org.graalvm.compiler.graph to jdk.aot;
|
||||
exports org.graalvm.compiler.hotspot to jdk.aot;
|
||||
exports org.graalvm.compiler.hotspot to
|
||||
jdk.aot,
|
||||
jdk.internal.vm.compiler.management;
|
||||
exports org.graalvm.compiler.hotspot.meta to jdk.aot;
|
||||
exports org.graalvm.compiler.hotspot.replacements to jdk.aot;
|
||||
exports org.graalvm.compiler.hotspot.stubs to jdk.aot;
|
||||
|
@ -282,6 +282,13 @@ public class HotSpotGraalCompiler implements GraalJVMCICompiler {
|
||||
return suite;
|
||||
}
|
||||
|
||||
public Object mbean() {
|
||||
if (graalRuntime instanceof HotSpotGraalRuntime) {
|
||||
return ((HotSpotGraalRuntime)graalRuntime).mbean();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts {@code method} to a String with {@link JavaMethod#format(String)} and the format
|
||||
* string {@code "%H.%n(%p)"}.
|
||||
|
@ -316,4 +316,8 @@ public final class HotSpotGraalRuntime implements HotSpotGraalRuntimeProvider {
|
||||
public Map<ExceptionAction, Integer> getCompilationProblemsPerAction() {
|
||||
return compilationProblemsPerAction;
|
||||
}
|
||||
|
||||
final Object mbean() {
|
||||
return mBean;
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user