From 3a9970930127ab123bc9d947cf7d887d3ebbf68a Mon Sep 17 00:00:00 2001
From: Denghui Dong <denghui.ddh@alibaba-inc.com>
Date: Mon, 2 Mar 2020 13:26:46 +0800
Subject: [PATCH] [Backport] 8236263: Remove experimental streaming events

Summary:

Test Plan: jdk/jfr

Reviewed-by: yuleil

Issue: https://github.com/alibaba/dragonwell8/issues/112
---
 src/share/classes/jdk/jfr/conf/default.jfc | 27 +---------------------
 src/share/classes/jdk/jfr/conf/profile.jfc | 27 +---------------------
 2 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/src/share/classes/jdk/jfr/conf/default.jfc b/src/share/classes/jdk/jfr/conf/default.jfc
index 447fc83d0..871949601 100644
--- a/src/share/classes/jdk/jfr/conf/default.jfc
+++ b/src/share/classes/jdk/jfr/conf/default.jfc
@@ -602,32 +602,7 @@
     </event>
 
     <event name="jdk.Flush">
-      <setting name="enabled">true</setting>
-      <setting name="threshold">0 ns</setting>
-    </event>
-
-    <event name="jdk.FlushStorage">
-      <setting name="enabled">true</setting>
-      <setting name="threshold">0 ns</setting>
-    </event>
-
-    <event name="jdk.FlushStacktrace">
-      <setting name="enabled">true</setting>
-      <setting name="threshold">0 ns</setting>
-    </event>
-
-    <event name="jdk.FlushStringPool">
-      <setting name="enabled">true</setting>
-      <setting name="threshold">0 ns</setting>
-    </event>
-
-    <event name="jdk.FlushMetadata">
-      <setting name="enabled">true</setting>
-      <setting name="threshold">0 ns</setting>
-    </event>
-
-    <event name="jdk.FlushTypeSet">
-      <setting name="enabled">true</setting>
+      <setting name="enabled">false</setting>
       <setting name="threshold">0 ns</setting>
     </event>
 
diff --git a/src/share/classes/jdk/jfr/conf/profile.jfc b/src/share/classes/jdk/jfr/conf/profile.jfc
index 32ad9160b..03e7e4b1e 100644
--- a/src/share/classes/jdk/jfr/conf/profile.jfc
+++ b/src/share/classes/jdk/jfr/conf/profile.jfc
@@ -602,32 +602,7 @@
     </event>
 
     <event name="jdk.Flush">
-      <setting name="enabled">true</setting>
-      <setting name="threshold">0 ns</setting>
-    </event>
-
-    <event name="jdk.FlushStorage">
-      <setting name="enabled">true</setting>
-      <setting name="threshold">0 ns</setting>
-    </event>
-
-    <event name="jdk.FlushStacktrace">
-      <setting name="enabled">true</setting>
-      <setting name="threshold">0 ns</setting>
-    </event>
-
-    <event name="jdk.FlushStringPool">
-      <setting name="enabled">true</setting>
-      <setting name="threshold">0 ns</setting>
-    </event>
-
-    <event name="jdk.FlushMetadata">
-      <setting name="enabled">true</setting>
-      <setting name="threshold">0 ns</setting>
-    </event>
-
-    <event name="jdk.FlushTypeSet">
-      <setting name="enabled">true</setting>
+      <setting name="enabled">false</setting>
       <setting name="threshold">0 ns</setting>
     </event>
 
-- 
GitLab