8223147: JFR Backport

8199712: Flight Recorder
8203346: JFR: Inconsistent signature of jfr_add_string_constant
8195817: JFR.stop should require name of recording
8195818: JFR.start should increase autogenerated name by one
8195819: Remove recording=x from jcmd JFR.check output
8203921: JFR thread sampling is missing fixes from JDK-8194552
8203929: Limit amount of data for JFR.dump
8203664: JFR start failure after AppCDS archive created with JFR StartFlightRecording
8003209: JFR events for network utilization
8207392: [PPC64] Implement JFR profiling

Backport JFR from JDK11. Initial integration

Reviewed-by: neugens

Author: Andrey Petushkov

jdk/make/CopyFiles.gmk

@@ -594,4 +594,15 @@ COPY_FILES += $(JDK_OUTPUTDIR)/lib/sound.properties
 
 ##########################################################################################
 
+$(JDK_OUTPUTDIR)/lib/jfr/%: $(JDK_TOPDIR)/src/share/classes/jdk/jfr/conf/%
+	$(call install-file)
+
+ifeq ($(ENABLE_JFR), true)
+  COPY_FILES += $(subst $(JDK_TOPDIR)/src/share/classes/jdk/jfr/conf, \
+          $(JDK_OUTPUTDIR)/lib/jfr, \
+          $(wildcard $(JDK_TOPDIR)/src/share/classes/jdk/jfr/conf/*))
+endif
+
+##########################################################################################
+
 -include $(CUSTOM_MAKE_DIR)/CopyFiles.gmk

jdk/make/CopyIntoClasses.gmk

@@ -92,9 +92,11 @@ ifndef OPENJDK
 endif
 
 ifeq ($(ENABLE_JFR), true)
-  JFR_CONFIGURATION_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings
-  COPY_FILES += \
-      $(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd
+#  JFR_CONFIGURATION_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings
+#  COPY_FILES += \
+#      $(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd
+#  COPY_FILES += \
+#      $(HOTSPOT_DIST)/jre/lib/metadata.xml
 endif
 
 SWING_PLAF_BASIC_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic

jdk/make/CreateJars.gmk

@@ -211,8 +211,7 @@ RT_JAR_EXCLUDES += \
     sun/util/cldr/CLDRLocaleDataMetaInfo.class \
     sun/util/resources/cldr \
     $(LOCALEDATA_INCLUDES) \
-    com/oracle/jrockit/jfr \
-    oracle/jrockit/jfr \
+    jdk/management/jfr \
     jdk/jfr
 
 # Find all files in the classes dir to use as dependencies. This could be more fine granular.
@@ -400,20 +399,17 @@ $(eval $(call SetupArchive,BUILD_CHARSETS_JAR, , \
 
 ##########################################################################################
 
-ifndef OPENJDK
-  ifeq ($(ENABLE_JFR), true)
-    $(eval $(call SetupArchive,BUILD_JFR_JAR, , \
-        SRCS := $(JDK_OUTPUTDIR)/classes, \
-        SUFFIXES := .class .jfc .xsd, \
-        INCLUDES := com/oracle/jrockit/jfr \
-            oracle/jrockit/jfr \
-            jdk/jfr, \
-        JAR := $(IMAGES_OUTPUTDIR)/lib/jfr.jar, \
-        SKIP_METAINF := true, \
-        MANIFEST := $(MAINMANIFEST), \
-        CHECK_COMPRESS_JAR := true))
+ifeq ($(ENABLE_JFR), true)
+$(eval $(call SetupArchive,BUILD_JFR_JAR, , \
+SRCS := $(JDK_OUTPUTDIR)/classes $(HOTSPOT_DIST)/jre/lib, \
+SUFFIXES := .class .jfc .xsd .xml, \
+INCLUDES := jdk/management/jfr \
+jdk/jfr, \
+JAR := $(IMAGES_OUTPUTDIR)/lib/jfr.jar, \
+SKIP_METAINF := true, \
+MANIFEST := $(MAINMANIFEST), \
+CHECK_COMPRESS_JAR := true))
 
-  endif
 endif
 
 ##########################################################################################