# HG changeset patch
# Parent  bdd554924bdcca80e927991151f92ce8a5b3600a

diff -r bdd554924bdc make/hotspot/gensrc/GensrcJfr.gmk
--- a/make/hotspot/gensrc/GensrcJfr.gmk	Mon Aug 03 11:35:24 2020 -0700
+++ b/make/hotspot/gensrc/GensrcJfr.gmk	Mon Aug 10 16:48:42 2020 +0200
@@ -57,15 +57,11 @@
 METADATA_XML := $(JFR_SRCDIR)/metadata.xml
 METADATA_XSD := $(JFR_SRCDIR)/metadata.xsd
 
-ifeq ($(call check-jvm-feature, shenandoahgc), true)
-  METADATA_SHENANDOAH_XML := $(JFR_SRCDIR)/metadata-shenandoah.xml
-endif
-
-$(JFR_OUTPUTDIR)/jfrEventClasses.hpp: $(METADATA_XSD) \
-    $(BUILD_JFR_TOOLS) $(METADATA_XML) $(METADATA_SHENANDOAH_XML)
+$(JFR_OUTPUTDIR)/jfrEventClasses.hpp: $(METADATA_XML) $(METADATA_XSD) \
+    $(BUILD_JFR_TOOLS)
 	$(call LogInfo, Generating $(@F))
 	$(call MakeDir, $(@D))
-	$(call ExecuteWithLog, $@, $(TOOL_JFR_GEN) $(METADATA_XSD) $(JFR_OUTPUTDIR) $(METADATA_XML) $(METADATA_SHENANDOAH_XML) )
+	$(call ExecuteWithLog, $@, $(TOOL_JFR_GEN) $(METADATA_XML) $(METADATA_XSD) $(JFR_OUTPUTDIR))
 	test -f $@
 
 TARGETS += $(JFR_OUTPUTDIR)/jfrEventClasses.hpp
diff -r bdd554924bdc make/src/classes/build/tools/jfr/GenerateJfrFiles.java
--- a/make/src/classes/build/tools/jfr/GenerateJfrFiles.java	Mon Aug 03 11:35:24 2020 -0700
+++ b/make/src/classes/build/tools/jfr/GenerateJfrFiles.java	Mon Aug 10 16:48:42 2020 +0200
@@ -28,20 +28,18 @@
 public class GenerateJfrFiles {
 
     public static void main(String... args) throws Exception {
-        if (args.length < 3) {
+        if (args.length != 3) {
             System.err.println("Incorrect number of command line arguments.");
             System.err.println("Usage:");
-            System.err.println("java GenerateJfrFiles[.java] <path-to-metadata.xsd> <output-directory> <path-to-metadata.xml> [<path-to-metadata.xml> ...]");
+            System.err.println("java GenerateJfrFiles[.java] <path-to-metadata.xml> <path-to-metadata.xsd> <output-directory>");
             System.exit(1);
         }
         try {
-            File metadataSchema = new File(args[0]);
-            File outputDirectory = new File(args[1]);
-            File[] metadataXml = new File[args.length - 2];
-            for (int i = 2; i < args.length; i++) {
-              metadataXml[i - 2] = new File(args[i]);
-            }
-            Metadata metadata = new Metadata(metadataSchema, metadataXml);
+            File metadataXml = new File(args[0]);
+            File metadataSchema = new File(args[1]);
+            File outputDirectory = new File(args[2]);
+
+            Metadata metadata = new Metadata(metadataXml, metadataSchema);
             metadata.verify();
             metadata.wireUpTypes();
 
@@ -77,14 +75,12 @@
     static class Metadata {
         final Map<String, TypeElement> types = new LinkedHashMap<>();
         final Map<String, XmlType> xmlTypes = new HashMap<>();
-        Metadata(File metadataSchema, File[] metadataXml) throws ParserConfigurationException, SAXException, FileNotFoundException, IOException {
+        Metadata(File metadataXml, File metadataSchema) throws ParserConfigurationException, SAXException, FileNotFoundException, IOException {
             SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
             SAXParserFactory factory = SAXParserFactory.newInstance();
             factory.setSchema(schemaFactory.newSchema(metadataSchema));
             SAXParser sp = factory.newSAXParser();
-            for (File file : metadataXml) {
-              sp.parse(file, new MetadataHandler(this));
-            }
+            sp.parse(metadataXml, new MetadataHandler(this));
         }
 
         List<EventElement> getEvents() {
diff -r bdd554924bdc src/hotspot/share/jfr/metadata/metadata-shenandoah.xml
--- a/src/hotspot/share/jfr/metadata/metadata-shenandoah.xml	Mon Aug 03 11:35:24 2020 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- Copyright (c) 2020, Red Hat, Inc. 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.
-
--->
-
-<Metadata>
-
-  <Event name="ShenandoahHeapRegionStateChange" category="Java Virtual Machine, GC, Detailed" label="Shenandoah Heap Region State Change" description="Information about a Shenandoah heap region state change"
-    startTime="false">
-    <Field type="uint" name="index" label="Index" />
-    <Field type="ShenandoahHeapRegionState" name="from" label="From" />
-    <Field type="ShenandoahHeapRegionState" name="to" label="To" />
-    <Field type="ulong" contentType="address" name="start" label="Start" />
-    <Field type="ulong" contentType="bytes" name="used" label="Used" />
-  </Event>
-
-  <Event name="ShenandoahHeapRegionInformation" category="Java Virtual Machine, GC, Detailed" label="Shenandoah Heap Region Information" description="Information about a specific heap region in the Shenandoah GC"
-    period="everyChunk">
-    <Field type="uint" name="index" label="Index" />
-    <Field type="ShenandoahHeapRegionState" name="state" label="State" />
-    <Field type="ulong" contentType="address" name="start" label="Start" />
-    <Field type="ulong" contentType="bytes" name="used" label="Used" />
-  </Event>
-
-  <Type name="ShenandoahHeapRegionState" label="Shenandoah Heap Region State">
-    <Field type="string" name="state" label="State" />
-  </Type>
-
-</Metadata>
diff -r bdd554924bdc src/hotspot/share/jfr/metadata/metadata.xml
--- a/src/hotspot/share/jfr/metadata/metadata.xml	Mon Aug 03 11:35:24 2020 -0700
+++ b/src/hotspot/share/jfr/metadata/metadata.xml	Mon Aug 10 16:48:42 2020 +0200
@@ -930,6 +930,27 @@
     <Field type="string" name="sampler" label="Sampler" />
   </Type>
 
+  <Event name="ShenandoahHeapRegionStateChange" category="Java Virtual Machine, GC, Detailed" label="Shenandoah Heap Region State Change" description="Information about a Shenandoah heap region state change"
+    startTime="false">
+    <Field type="uint" name="index" label="Index" />
+    <Field type="ShenandoahHeapRegionState" name="from" label="From" />
+    <Field type="ShenandoahHeapRegionState" name="to" label="To" />
+    <Field type="ulong" contentType="address" name="start" label="Start" />
+    <Field type="ulong" contentType="bytes" name="used" label="Used" />
+  </Event>
+
+  <Event name="ShenandoahHeapRegionInformation" category="Java Virtual Machine, GC, Detailed" label="Shenandoah Heap Region Information" description="Information about a specific heap region in the Shenandoah GC"
+    period="everyChunk">
+    <Field type="uint" name="index" label="Index" />
+    <Field type="ShenandoahHeapRegionState" name="state" label="State" />
+    <Field type="ulong" contentType="address" name="start" label="Start" />
+    <Field type="ulong" contentType="bytes" name="used" label="Used" />
+  </Event>
+
+  <Type name="ShenandoahHeapRegionState" label="Shenandoah Heap Region State">
+    <Field type="string" name="state" label="State" />
+  </Type>
+
   <Type name="NetworkInterfaceName" label="Network Interface">
     <Field type="string" name="networkInterface" label="Network Interface" description="Network Interface Name" />
   </Type>
diff -r bdd554924bdc src/hotspot/share/jfr/periodic/jfrPeriodic.cpp
--- a/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp	Mon Aug 03 11:35:24 2020 -0700
+++ b/src/hotspot/share/jfr/periodic/jfrPeriodic.cpp	Mon Aug 10 16:48:42 2020 +0200
@@ -578,11 +578,11 @@
   event.commit();
 }
 
+TRACE_REQUEST_FUNC(ShenandoahHeapRegionInformation) {
 #if INCLUDE_SHENANDOAHGC
-TRACE_REQUEST_FUNC(ShenandoahHeapRegionInformation) {
   if (UseShenandoahGC) {
     VM_ShenandoahSendHeapRegionInfoEvents op;
     VMThread::execute(&op);
   }
+#endif
 }
-#endif