--- a/hotspot/.mx.jvmci/mx_jvmci.py Thu Jan 14 13:24:03 2016 +0100
+++ b/hotspot/.mx.jvmci/mx_jvmci.py Thu Jan 14 14:34:36 2016 +0100
@@ -153,6 +153,13 @@
def deploy(self, jdkDir):
mx.nyi('deploy', self)
+ def post_parse_cmd_line(self):
+ self.set_archiveparticipant()
+
+ def set_archiveparticipant(self):
+ dist = self.dist()
+ dist.set_archiveparticipant(JVMCIArchiveParticipant(dist))
+
class ExtJDKDeployedDist(JvmciJDKDeployedDist):
def __init__(self, name):
JvmciJDKDeployedDist.__init__(self, name)
@@ -668,15 +675,10 @@
def __opened__(self, arc, srcArc, services):
self.services = services
+ self.jvmciServices = services
self.arc = arc
def __add__(self, arcname, contents):
- if arcname.startswith('META-INF/jvmci.providers/'):
- provider = arcname[len('META-INF/jvmci.providers/'):]
- for service in contents.strip().split(os.linesep):
- assert service
- self.services.setdefault(service, []).append(provider)
- return True
return False
def __addsrc__(self, arcname, contents):
@@ -864,6 +866,4 @@
_vm.update(jvmVariant, debugLevel, jvmciMode)
for jdkDist in jdkDeployedDists:
- dist = jdkDist.dist()
- if isinstance(jdkDist, JvmciJDKDeployedDist):
- dist.set_archiveparticipant(JVMCIArchiveParticipant(dist))
+ jdkDist.post_parse_cmd_line()
--- a/hotspot/.mx.jvmci/suite.py Thu Jan 14 13:24:03 2016 +0100
+++ b/hotspot/.mx.jvmci/suite.py Thu Jan 14 14:34:36 2016 +0100
@@ -59,28 +59,19 @@
# ------------- JVMCI:Service -------------
- "jdk.vm.ci.service" : {
+ "jdk.vm.ci.services" : {
"subDir" : "src/jdk.vm.ci/share/classes",
"sourceDirs" : ["src"],
"javaCompliance" : "1.8",
"workingSets" : "API,JVMCI",
},
- "jdk.vm.ci.service.processor" : {
- "subDir" : "src/jdk.vm.ci/share/classes",
- "sourceDirs" : ["src"],
- "dependencies" : ["jdk.vm.ci.service"],
- "checkstyle" : "jdk.vm.ci.service",
- "javaCompliance" : "1.8",
- "workingSets" : "JVMCI,Codegen,HotSpot",
- },
-
# ------------- JVMCI:API -------------
"jdk.vm.ci.common" : {
"subDir" : "src/jdk.vm.ci/share/classes",
"sourceDirs" : ["src"],
- "checkstyle" : "jdk.vm.ci.service",
+ "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "1.8",
"workingSets" : "API,JVMCI",
},
@@ -88,7 +79,7 @@
"jdk.vm.ci.meta" : {
"subDir" : "src/jdk.vm.ci/share/classes",
"sourceDirs" : ["src"],
- "checkstyle" : "jdk.vm.ci.service",
+ "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "1.8",
"workingSets" : "API,JVMCI",
},
@@ -97,7 +88,7 @@
"subDir" : "src/jdk.vm.ci/share/classes",
"sourceDirs" : ["src"],
"dependencies" : ["jdk.vm.ci.meta"],
- "checkstyle" : "jdk.vm.ci.service",
+ "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "1.8",
"workingSets" : "API,JVMCI",
},
@@ -108,7 +99,7 @@
"dependencies" : [
"jdk.vm.ci.code",
],
- "checkstyle" : "jdk.vm.ci.service",
+ "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "1.8",
"workingSets" : "API,JVMCI",
},
@@ -121,7 +112,7 @@
"jdk.vm.ci.common",
"jdk.vm.ci.runtime",
],
- "checkstyle" : "jdk.vm.ci.service",
+ "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "1.8",
"workingSets" : "API,JVMCI",
},
@@ -129,7 +120,7 @@
"jdk.vm.ci.inittimer" : {
"subDir" : "src/jdk.vm.ci/share/classes",
"sourceDirs" : ["src"],
- "checkstyle" : "jdk.vm.ci.service",
+ "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "1.8",
"workingSets" : "JVMCI",
},
@@ -140,7 +131,7 @@
"subDir" : "src/jdk.vm.ci/share/classes",
"sourceDirs" : ["src"],
"dependencies" : ["jdk.vm.ci.code"],
- "checkstyle" : "jdk.vm.ci.service",
+ "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "1.8",
"workingSets" : "JVMCI,AArch64",
},
@@ -149,7 +140,7 @@
"subDir" : "src/jdk.vm.ci/share/classes",
"sourceDirs" : ["src"],
"dependencies" : ["jdk.vm.ci.code"],
- "checkstyle" : "jdk.vm.ci.service",
+ "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "1.8",
"workingSets" : "JVMCI,AMD64",
},
@@ -158,7 +149,7 @@
"subDir" : "src/jdk.vm.ci/share/classes",
"sourceDirs" : ["src"],
"dependencies" : ["jdk.vm.ci.code"],
- "checkstyle" : "jdk.vm.ci.service",
+ "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "1.8",
"workingSets" : "JVMCI,SPARC",
},
@@ -171,9 +162,9 @@
"jdk.vm.ci.common",
"jdk.vm.ci.inittimer",
"jdk.vm.ci.runtime",
- "jdk.vm.ci.service",
+ "jdk.vm.ci.services",
],
- "checkstyle" : "jdk.vm.ci.service",
+ "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "1.8",
"workingSets" : "JVMCI",
},
@@ -181,7 +172,7 @@
"jdk.vm.ci.hotspotvmconfig" : {
"subDir" : "src/jdk.vm.ci/share/classes",
"sourceDirs" : ["src"],
- "checkstyle" : "jdk.vm.ci.service",
+ "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "1.8",
"workingSets" : "JVMCI,HotSpot",
},
@@ -193,10 +184,7 @@
"jdk.vm.ci.aarch64",
"jdk.vm.ci.hotspot",
],
- "checkstyle" : "jdk.vm.ci.service",
- "annotationProcessors" : [
- "JVMCI_SERVICE_PROCESSOR",
- ],
+ "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "1.8",
"workingSets" : "JVMCI,HotSpot,AArch64",
},
@@ -208,10 +196,7 @@
"jdk.vm.ci.amd64",
"jdk.vm.ci.hotspot",
],
- "checkstyle" : "jdk.vm.ci.service",
- "annotationProcessors" : [
- "JVMCI_SERVICE_PROCESSOR",
- ],
+ "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "1.8",
"workingSets" : "JVMCI,HotSpot,AMD64",
},
@@ -223,10 +208,7 @@
"jdk.vm.ci.sparc",
"jdk.vm.ci.hotspot",
],
- "checkstyle" : "jdk.vm.ci.service",
- "annotationProcessors" : [
- "JVMCI_SERVICE_PROCESSOR",
- ],
+ "checkstyle" : "jdk.vm.ci.services",
"javaCompliance" : "1.8",
"workingSets" : "JVMCI,HotSpot,SPARC",
},
@@ -241,9 +223,9 @@
# ------------- Distributions -------------
- "JVMCI_SERVICE" : {
+ "JVMCI_SERVICES" : {
"subDir" : "src/jdk.vm.ci/share/classes",
- "dependencies" : ["jdk.vm.ci.service"],
+ "dependencies" : ["jdk.vm.ci.services"],
},
"JVMCI_API" : {
@@ -257,7 +239,7 @@
"jdk.vm.ci.sparc",
],
"distDependencies" : [
- "JVMCI_SERVICE",
+ "JVMCI_SERVICES",
],
},
@@ -277,7 +259,7 @@
],
"distDependencies" : [
"JVMCI_HOTSPOTVMCONFIG",
- "JVMCI_SERVICE",
+ "JVMCI_SERVICES",
"JVMCI_API",
],
},
@@ -293,28 +275,18 @@
"exclude" : ["mx:JUNIT"],
},
-
- "JVMCI_SERVICE_PROCESSOR" : {
- "subDir" : "src/jdk.vm.ci/share/classes",
- "dependencies" : ["jdk.vm.ci.service.processor"],
- "distDependencies" : [
- "JVMCI_SERVICE",
- ],
- },
-
# This exists to have a monolithic jvmci.jar file which simplifies
# using the -Xoverride option in JDK9.
"JVMCI" : {
"subDir" : "src/jdk.vm.ci/share/classes",
"overlaps" : [
"JVMCI_API",
- "JVMCI_SERVICE",
+ "JVMCI_SERVICES",
"JVMCI_HOTSPOT",
"JVMCI_HOTSPOTVMCONFIG",
- "JVMCI_SERVICE_PROCESSOR",
],
"dependencies" : [
- "jdk.vm.ci.service",
+ "jdk.vm.ci.services",
"jdk.vm.ci.inittimer",
"jdk.vm.ci.runtime",
"jdk.vm.ci.common",
@@ -325,7 +297,6 @@
"jdk.vm.ci.hotspot.aarch64",
"jdk.vm.ci.hotspot.amd64",
"jdk.vm.ci.hotspot.sparc",
- "jdk.vm.ci.service.processor"
],
},
},
--- a/hotspot/make/gensrc/Gensrc-jdk.vm.ci.gmk Thu Jan 14 13:24:03 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-#
-# Copyright (c) 2015, 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.
-#
-
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-include SetupJavaCompilers.gmk
-
-GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.vm.ci
-SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes
-
-################################################################################
-# Compile the annotation processor
-
-$(eval $(call SetupJavaCompilation, BUILD_JVMCI_SERVICE, \
- SETUP := GENERATE_OLDBYTECODE, \
- SRC := $(SRC_DIR)/jdk.vm.ci.service/src \
- $(SRC_DIR)/jdk.vm.ci.service.processor/src, \
- BIN := $(BUILDTOOLS_OUTPUTDIR)/jvmci_service, \
- JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.ci.service.jar, \
-))
-
-################################################################################
-
-PROC_SRC_SUBDIRS := \
- jdk.vm.ci.hotspot \
- jdk.vm.ci.hotspot.aarch64 \
- jdk.vm.ci.hotspot.amd64 \
- jdk.vm.ci.hotspot.sparc \
- jdk.vm.ci.runtime \
- #
-
-PROC_SRC_DIRS := $(patsubst %, $(SRC_DIR)/%/src, $(PROC_SRC_SUBDIRS))
-
-PROC_SRCS := $(filter %.java, $(call CacheFind, $(PROC_SRC_DIRS)))
-
-ALL_SRC_DIRS := $(wildcard $(SRC_DIR)/*/src)
-SOURCEPATH := $(call PathList, $(ALL_SRC_DIRS))
-PROCESSOR_PATH := $(call PathList, \
- $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.ci.service.jar)
-
-$(GENSRC_DIR)/_gensrc_proc_done: $(PROC_SRCS) \
- $(BUILD_JVMCI_SERVICE)
- $(MKDIR) -p $(@D)
- $(eval $(call ListPathsSafely,PROC_SRCS,$(@D)/_gensrc_proc_files))
- $(JAVA_SMALL) $(NEW_JAVAC) \
- -XDignore.symbol.file \
- -sourcepath $(SOURCEPATH) \
- -implicit:none \
- -proc:only \
- -processorpath $(PROCESSOR_PATH) \
- -d $(GENSRC_DIR) \
- -s $(GENSRC_DIR) \
- @$(@D)/_gensrc_proc_files
- $(TOUCH) $@
-
-TARGETS += $(GENSRC_DIR)/_gensrc_proc_done
-
-################################################################################
-
-$(GENSRC_DIR)/_providers_converted: $(GENSRC_DIR)/_gensrc_proc_done
- $(MKDIR) -p $(GENSRC_DIR)/META-INF/services
- ($(CD) $(GENSRC_DIR)/META-INF/jvmci.providers && \
- for i in $$($(LS)); do \
- c=$$($(CAT) $$i | $(TR) -d '\n\r'); \
- $(ECHO) $$i >> $(GENSRC_DIR)/META-INF/services/$$c.tmp; \
- done)
- ($(CD) $(GENSRC_DIR)/META-INF/services && \
- for i in $$($(LS) *.tmp); do \
- $(MV) $$i $${i%.tmp}; \
- done)
- $(TOUCH) $@
-
-TARGETS += $(GENSRC_DIR)/_providers_converted
-
-################################################################################
-
-all: $(TARGETS)
-
-.PHONY: default all
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/jdk.vm.ci/share/classes/META-INF/services/jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory Thu Jan 14 14:34:36 2016 +0100
@@ -0,0 +1,3 @@
+jdk.vm.ci.hotspot.aarch64.AArch64HotSpotJVMCIBackendFactory
+jdk.vm.ci.hotspot.amd64.AMD64HotSpotJVMCIBackendFactory
+jdk.vm.ci.hotspot.sparc.SPARCHotSpotJVMCIBackendFactory
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java Thu Jan 14 13:24:03 2016 +0100
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.aarch64/src/jdk/vm/ci/hotspot/aarch64/AArch64HotSpotJVMCIBackendFactory.java Thu Jan 14 14:34:36 2016 +0100
@@ -41,9 +41,7 @@
import jdk.vm.ci.inittimer.InitTimer;
import jdk.vm.ci.meta.ConstantReflectionProvider;
import jdk.vm.ci.runtime.JVMCIBackend;
-import jdk.vm.ci.service.ServiceProvider;
-@ServiceProvider(HotSpotJVMCIBackendFactory.class)
public class AArch64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFactory {
protected EnumSet<AArch64.CPUFeature> computeFeatures(@SuppressWarnings("unused") HotSpotVMConfig config) {
@@ -124,8 +122,7 @@
}
}
- protected JVMCIBackend createBackend(HotSpotMetaAccessProvider metaAccess, HotSpotCodeCacheProvider codeCache, ConstantReflectionProvider constantReflection,
- StackIntrospection stackIntrospection) {
+ protected JVMCIBackend createBackend(HotSpotMetaAccessProvider metaAccess, HotSpotCodeCacheProvider codeCache, ConstantReflectionProvider constantReflection, StackIntrospection stackIntrospection) {
return new JVMCIBackend(metaAccess, codeCache, constantReflection, stackIntrospection);
}
}
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java Thu Jan 14 13:24:03 2016 +0100
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.amd64/src/jdk/vm/ci/hotspot/amd64/AMD64HotSpotJVMCIBackendFactory.java Thu Jan 14 14:34:36 2016 +0100
@@ -41,9 +41,7 @@
import jdk.vm.ci.inittimer.InitTimer;
import jdk.vm.ci.meta.ConstantReflectionProvider;
import jdk.vm.ci.runtime.JVMCIBackend;
-import jdk.vm.ci.service.ServiceProvider;
-@ServiceProvider(HotSpotJVMCIBackendFactory.class)
public class AMD64HotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFactory {
protected EnumSet<AMD64.CPUFeature> computeFeatures(HotSpotVMConfig config) {
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java Thu Jan 14 13:24:03 2016 +0100
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot.sparc/src/jdk/vm/ci/hotspot/sparc/SPARCHotSpotJVMCIBackendFactory.java Thu Jan 14 14:34:36 2016 +0100
@@ -39,11 +39,9 @@
import jdk.vm.ci.hotspot.HotSpotVMConfig;
import jdk.vm.ci.inittimer.InitTimer;
import jdk.vm.ci.runtime.JVMCIBackend;
-import jdk.vm.ci.service.ServiceProvider;
import jdk.vm.ci.sparc.SPARC;
import jdk.vm.ci.sparc.SPARC.CPUFeature;
-@ServiceProvider(HotSpotJVMCIBackendFactory.class)
public class SPARCHotSpotJVMCIBackendFactory implements HotSpotJVMCIBackendFactory {
protected TargetDescription createTarget(HotSpotVMConfig config) {
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java Thu Jan 14 13:24:03 2016 +0100
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCICompilerConfig.java Thu Jan 14 14:34:36 2016 +0100
@@ -27,7 +27,7 @@
import jdk.vm.ci.runtime.JVMCICompiler;
import jdk.vm.ci.runtime.JVMCICompilerFactory;
import jdk.vm.ci.runtime.JVMCIRuntime;
-import jdk.vm.ci.service.Services;
+import jdk.vm.ci.services.Services;
final class HotSpotJVMCICompilerConfig {
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java Thu Jan 14 13:24:03 2016 +0100
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java Thu Jan 14 14:34:36 2016 +0100
@@ -48,7 +48,7 @@
import jdk.vm.ci.runtime.JVMCI;
import jdk.vm.ci.runtime.JVMCIBackend;
import jdk.vm.ci.runtime.JVMCICompiler;
-import jdk.vm.ci.service.Services;
+import jdk.vm.ci.services.Services;
import sun.misc.VM;
//JaCoCo Exclude
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.service.processor/src/META-INF/services/javax.annotation.processing.Processor Thu Jan 14 13:24:03 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-jdk.vm.ci.service.processor.ServiceProviderProcessor
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.service.processor/src/jdk/vm/ci/service/processor/ServiceProviderProcessor.java Thu Jan 14 13:24:03 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2013, 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 jdk.vm.ci.service.processor;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.annotation.processing.AbstractProcessor;
-import javax.annotation.processing.RoundEnvironment;
-import javax.annotation.processing.SupportedAnnotationTypes;
-import javax.lang.model.SourceVersion;
-import javax.lang.model.element.Element;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.type.MirroredTypeException;
-import javax.lang.model.type.TypeMirror;
-import javax.tools.Diagnostic.Kind;
-import javax.tools.FileObject;
-import javax.tools.StandardLocation;
-
-import jdk.vm.ci.service.ServiceProvider;
-
-@SupportedAnnotationTypes("jdk.vm.ci.service.ServiceProvider")
-public class ServiceProviderProcessor extends AbstractProcessor {
-
- private final Set<TypeElement> processed = new HashSet<>();
-
- @Override
- public SourceVersion getSupportedSourceVersion() {
- return SourceVersion.latest();
- }
-
- private boolean verifyAnnotation(TypeMirror serviceInterface, TypeElement serviceProvider) {
- if (!processingEnv.getTypeUtils().isSubtype(serviceProvider.asType(), serviceInterface)) {
- String msg = String.format("Service provider class %s must implement service interface %s", serviceProvider.getSimpleName(), serviceInterface);
- processingEnv.getMessager().printMessage(Kind.ERROR, msg, serviceProvider);
- return false;
- }
-
- return true;
- }
-
- private void processElement(TypeElement serviceProvider) {
- if (processed.contains(serviceProvider)) {
- return;
- }
-
- processed.add(serviceProvider);
- ServiceProvider annotation = serviceProvider.getAnnotation(ServiceProvider.class);
- if (annotation != null) {
- try {
- annotation.value();
- } catch (MirroredTypeException ex) {
- TypeMirror serviceInterface = ex.getTypeMirror();
- if (verifyAnnotation(serviceInterface, serviceProvider)) {
- String interfaceName = ex.getTypeMirror().toString();
- createProviderFile(serviceProvider, interfaceName);
- }
- }
- }
- }
-
- private void createProviderFile(TypeElement serviceProvider, String interfaceName) {
- if (serviceProvider.getNestingKind().isNested()) {
- // This is a simplifying constraint that means we don't have to
- // processed the qualified name to insert '$' characters at
- // the relevant positions.
- String msg = String.format("Service provider class %s must be a top level class", serviceProvider.getSimpleName());
- processingEnv.getMessager().printMessage(Kind.ERROR, msg, serviceProvider);
- return;
- }
-
- String filename = "META-INF/jvmci.providers/" + serviceProvider.getQualifiedName();
- try {
- FileObject file = processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", filename, serviceProvider);
- PrintWriter writer = new PrintWriter(new OutputStreamWriter(file.openOutputStream(), "UTF-8"));
- writer.println(interfaceName);
- writer.close();
- } catch (IOException e) {
- processingEnv.getMessager().printMessage(Kind.ERROR, e.getMessage(), serviceProvider);
- }
- }
-
- @Override
- public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
- if (roundEnv.processingOver()) {
- return true;
- }
-
- for (Element element : roundEnv.getElementsAnnotatedWith(ServiceProvider.class)) {
- assert element.getKind().isClass();
- processElement((TypeElement) element);
- }
-
- return true;
- }
-}
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.service/.checkstyle_checks.xml Thu Jan 14 13:24:03 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-<!--
- Checkstyle-Configuration: Checks
- Description: none
--->
-<module name="Checker">
- <property name="severity" value="error"/>
- <module name="TreeWalker">
- <property name="tabWidth" value="4"/>
- <module name="FileContentsHolder"/>
- <module name="JavadocStyle">
- <property name="checkHtml" value="false"/>
- </module>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName">
- <property name="format" value="^(([a-z][a-zA-Z0-9]*$)|(_[A-Z][a-zA-Z0-9]*_[a-z][a-zA-Z0-9]*$))"/>
- </module>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="TypeName">
- <property name="format" value="^[A-Z][_a-zA-Z0-9]*$"/>
- </module>
- <module name="RedundantImport"/>
- <module name="LineLength">
- <property name="max" value="250"/>
- </module>
- <module name="MethodParamPad"/>
- <module name="NoWhitespaceAfter">
- <property name="tokens" value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
- </module>
- <module name="AvoidStarImport">
- <property name="allowClassImports" value="false"/>
- <property name="allowStaticMemberImports" value="false"/>
- </module>
- <module name="NoWhitespaceBefore">
- <property name="tokens" value="SEMI,DOT,POST_DEC,POST_INC"/>
- </module>
- <module name="ParenPad"/>
- <module name="TypecastParenPad">
- <property name="tokens" value="RPAREN,TYPECAST"/>
- </module>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround">
- <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/>
- </module>
- <module name="RedundantModifier"/>
- <module name="AvoidNestedBlocks">
- <property name="allowInSwitchCase" value="true"/>
- </module>
- <module name="EmptyBlock">
- <property name="option" value="text"/>
- <property name="tokens" value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_TRY,LITERAL_WHILE,STATIC_INIT"/>
- </module>
- <module name="LeftCurly"/>
- <module name="NeedBraces"/>
- <module name="RightCurly"/>
- <module name="EmptyStatement"/>
- <module name="HiddenField">
- <property name="severity" value="ignore"/>
- <property name="ignoreConstructorParameter" value="true"/>
- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
- </module>
- <module name="FinalClass"/>
- <module name="HideUtilityClassConstructor">
- <property name="severity" value="ignore"/>
- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
- </module>
- <module name="ArrayTypeStyle"/>
- <module name="UpperEll"/>
- <module name="FallThrough"/>
- <module name="FinalLocalVariable">
- <property name="severity" value="ignore"/>
- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
- </module>
- <module name="MultipleVariableDeclarations"/>
- <module name="StringLiteralEquality">
- <property name="severity" value="error"/>
- </module>
- <module name="SuperFinalize"/>
- <module name="UnnecessaryParentheses">
- <property name="severity" value="ignore"/>
- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
- </module>
- <module name="Indentation">
- <property name="severity" value="ignore"/>
- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
- </module>
- <module name="StaticVariableName">
- <property name="format" value="^[A-Za-z][a-zA-Z0-9]*$"/>
- </module>
- <module name="EmptyForInitializerPad"/>
- <module name="EmptyForIteratorPad"/>
- <module name="ModifierOrder"/>
- <module name="DefaultComesLast"/>
- <module name="InnerAssignment">
- <property name="severity" value="ignore"/>
- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
- </module>
- <module name="ModifiedControlVariable"/>
- <module name="MutableException">
- <property name="severity" value="ignore"/>
- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
- </module>
- <module name="ParameterAssignment">
- <property name="severity" value="ignore"/>
- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
- </module>
- <module name="RegexpSinglelineJava">
- <metadata name="net.sf.eclipsecs.core.comment" value="Illegal trailing whitespace(s) at the end of the line."/>
- <property name="format" value="\s$"/>
- <property name="message" value="Illegal trailing whitespace(s) at the end of the line."/>
- <property name="ignoreComments" value="true"/>
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Checks for trailing spaces at the end of a line"/>
- </module>
- <module name="RegexpSinglelineJava">
- <metadata name="net.sf.eclipsecs.core.comment" value="illegal space before a comma"/>
- <property name="format" value=" ,"/>
- <property name="message" value="illegal space before a comma"/>
- <property name="ignoreComments" value="true"/>
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Checks for whitespace before a comma."/>
- <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Illegal whitespace before a comma."/>
- </module>
- <module name="RegexpSinglelineJava">
- <property name="format" value="[^\x00-\x7F]"/>
- <property name="message" value="Only use ASCII characters."/>
- </module>
- <module name="RegexpSinglelineJava">
- <property name="format" value="new (Hashtable|Vector|Stack|StringBuffer)[^\w]"/>
- <property name="message" value="Don't use old synchronized collection classes"/>
- </module>
- </module>
- <module name="RegexpHeader">
- <property name="header" value="/\*\n \* Copyright \(c\) (20[0-9][0-9], )?20[0-9][0-9], Oracle and/or its affiliates. All rights reserved.\n \* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n \*\n \* This code is free software; you can redistribute it and/or modify it\n \* under the terms of the GNU General Public License version 2 only, as\n \* published by the Free Software Foundation.\n \*\n \* This code is distributed in the hope that it will be useful, but WITHOUT\n \* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\n \* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License\n \* version 2 for more details \(a copy is included in the LICENSE file that\n \* accompanied this code\).\n \*\n \* You should have received a copy of the GNU General Public License version\n \* 2 along with this work; if not, write to the Free Software Foundation,\n \* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.\n \*\n \* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA\n \* or visit www.oracle.com if you need additional information or have any\n \* questions.\n \*/\n"/>
- <property name="fileExtensions" value="java"/>
- </module>
- <module name="FileTabCharacter">
- <property name="severity" value="error"/>
- <property name="fileExtensions" value="java"/>
- </module>
- <module name="NewlineAtEndOfFile">
- <property name="lineSeparator" value="lf"/>
- </module>
- <module name="Translation"/>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="Checkstyle: stop constant name check"/>
- <property name="onCommentFormat" value="Checkstyle: resume constant name check"/>
- <property name="checkFormat" value="ConstantNameCheck"/>
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Allow non-conforming constant names"/>
- </module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="Checkstyle: stop method name check"/>
- <property name="onCommentFormat" value="Checkstyle: resume method name check"/>
- <property name="checkFormat" value="MethodName"/>
- <property name="checkC" value="false"/>
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable method name checks"/>
- </module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CheckStyle: stop parameter assignment check"/>
- <property name="onCommentFormat" value="CheckStyle: resume parameter assignment check"/>
- <property name="checkFormat" value="ParameterAssignment"/>
- <property name="checkC" value="false"/>
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable Parameter Assignment"/>
- </module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="Checkstyle: stop final variable check"/>
- <property name="onCommentFormat" value="Checkstyle: resume final variable check"/>
- <property name="checkFormat" value="FinalLocalVariable"/>
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable final variable checks"/>
- </module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="Checkstyle: stop"/>
- <property name="onCommentFormat" value="Checkstyle: resume"/>
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable all checks"/>
- </module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CheckStyle: stop inner assignment check"/>
- <property name="onCommentFormat" value="CheckStyle: resume inner assignment check"/>
- <property name="checkFormat" value="InnerAssignment"/>
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable inner assignment checks"/>
- </module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="Checkstyle: stop field name check"/>
- <property name="onCommentFormat" value="Checkstyle: resume field name check"/>
- <property name="checkFormat" value="MemberName"/>
- <property name="checkC" value="false"/>
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable field name checks"/>
- </module>
- <module name="RegexpMultiline">
- <metadata name="net.sf.eclipsecs.core.comment" value="illegal Windows line ending"/>
- <property name="format" value="\r\n"/>
- <property name="message" value="illegal Windows line ending"/>
- </module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CheckStyle: stop header check"/>
- <property name="onCommentFormat" value="CheckStyle: resume header check"/>
- <property name="checkFormat" value=".*Header"/>
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable header checks"/>
- </module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CheckStyle: stop line length check"/>
- <property name="onCommentFormat" value="CheckStyle: resume line length check"/>
- <property name="checkFormat" value="LineLength"/>
- </module>
- <module name="SuppressionCommentFilter">
- <property name="offCommentFormat" value="CheckStyle: start generated"/>
- <property name="onCommentFormat" value="CheckStyle: stop generated"/>
- <property name="checkFormat" value=".*Name|.*LineLength|.*Header"/>
- </module>
-</module>
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.service/src/jdk/vm/ci/service/ServiceProvider.java Thu Jan 14 13:24:03 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2013, 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 jdk.vm.ci.service;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotates a service provider than can be loaded via {@linkplain Services#load(Class)} or
- * {@link Services#loadSingle(Class, boolean)}.
- */
-@Retention(RetentionPolicy.CLASS)
-@Target(ElementType.TYPE)
-public @interface ServiceProvider {
-
- Class<?> value();
-}
--- a/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.service/src/jdk/vm/ci/service/Services.java Thu Jan 14 13:24:03 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2014, 2015, 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 jdk.vm.ci.service;
-
-import java.util.Formatter;
-import java.util.Iterator;
-import java.util.ServiceConfigurationError;
-import java.util.ServiceLoader;
-
-/**
- * A mechanism for accessing service providers via JVMCI.
- */
-public final class Services {
-
- private Services() {
- }
-
- /**
- * Gets an {@link Iterable} of the JVMCI providers available for a given service.
- */
- public static <S> Iterable<S> load(Class<S> service) {
- return ServiceLoader.load(service);
- }
-
- /**
- * Gets the JVMCI provider for a given service for which at most one provider must be available.
- *
- * @param service the service whose provider is being requested
- * @param required specifies if an {@link InternalError} should be thrown if no provider of
- * {@code service} is available
- */
- public static <S> S loadSingle(Class<S> service, boolean required) {
- Iterable<S> providers = ServiceLoader.load(service);
- S singleProvider = null;
- try {
- for (Iterator<S> it = providers.iterator(); it.hasNext();) {
- singleProvider = it.next();
- if (it.hasNext()) {
- throw new InternalError(String.format("Multiple %s providers found", service.getName()));
- }
- }
- } catch (ServiceConfigurationError e) {
- // If the service is required we will bail out below.
- }
- if (singleProvider == null && required) {
- String javaHome = System.getProperty("java.home");
- String vmName = System.getProperty("java.vm.name");
- Formatter errorMessage = new Formatter();
- errorMessage.format("The VM does not expose required service %s.%n", service.getName());
- errorMessage.format("Currently used Java home directory is %s.%n", javaHome);
- errorMessage.format("Currently used VM configuration is: %s", vmName);
- throw new UnsupportedOperationException(errorMessage.toString());
- }
- return singleProvider;
- }
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.services/src/jdk/vm/ci/services/Services.java Thu Jan 14 14:34:36 2016 +0100
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2014, 2015, 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 jdk.vm.ci.services;
+
+import java.util.Formatter;
+import java.util.Iterator;
+import java.util.ServiceConfigurationError;
+import java.util.ServiceLoader;
+
+/**
+ * A mechanism for accessing service providers via JVMCI.
+ */
+public final class Services {
+
+ private Services() {
+ }
+
+ /**
+ * Gets an {@link Iterable} of the JVMCI providers available for a given service.
+ */
+ public static <S> Iterable<S> load(Class<S> service) {
+ return ServiceLoader.load(service);
+ }
+
+ /**
+ * Gets the JVMCI provider for a given service for which at most one provider must be available.
+ *
+ * @param service the service whose provider is being requested
+ * @param required specifies if an {@link InternalError} should be thrown if no provider of
+ * {@code service} is available
+ */
+ public static <S> S loadSingle(Class<S> service, boolean required) {
+ Iterable<S> providers = ServiceLoader.load(service);
+ S singleProvider = null;
+ try {
+ for (Iterator<S> it = providers.iterator(); it.hasNext();) {
+ singleProvider = it.next();
+ if (it.hasNext()) {
+ throw new InternalError(String.format("Multiple %s providers found", service.getName()));
+ }
+ }
+ } catch (ServiceConfigurationError e) {
+ // If the service is required we will bail out below.
+ }
+ if (singleProvider == null && required) {
+ String javaHome = System.getProperty("java.home");
+ String vmName = System.getProperty("java.vm.name");
+ Formatter errorMessage = new Formatter();
+ errorMessage.format("The VM does not expose required service %s.%n", service.getName());
+ errorMessage.format("Currently used Java home directory is %s.%n", javaHome);
+ errorMessage.format("Currently used VM configuration is: %s", vmName);
+ throw new UnsupportedOperationException(errorMessage.toString());
+ }
+ return singleProvider;
+ }
+}