Mercurial > hg > icedtea8-forest > jdk
changeset 14671:846d273beb26
8216283: Allow shorter method sampling interval than 10 ms
Reviewed-by: mgronlun
author | egahlin |
---|---|
date | Thu, 06 Jun 2019 20:19:03 +0200 |
parents | d9bdec02b548 |
children | 8310f9fb8d93 |
files | src/share/classes/jdk/jfr/conf/default.jfc src/share/classes/jdk/jfr/conf/profile.jfc |
diffstat | 2 files changed, 71 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/jdk/jfr/conf/default.jfc Fri May 10 20:56:37 2019 +0200 +++ b/src/share/classes/jdk/jfr/conf/default.jfc Thu Jun 06 20:19:03 2019 +0200 @@ -115,12 +115,12 @@ <event name="jdk.ExecutionSample"> <setting name="enabled" control="method-sampling-enabled">true</setting> - <setting name="period" control="method-sampling-interval">20 ms</setting> + <setting name="period" control="method-sampling-java-interval">20 ms</setting> </event> <event name="jdk.NativeMethodSample"> <setting name="enabled" control="method-sampling-enabled">true</setting> - <setting name="period" control="method-sampling-interval">20 ms</setting> + <setting name="period" control="method-sampling-native-interval">20 ms</setting> </event> <event name="jdk.SafepointBegin"> @@ -743,13 +743,42 @@ </condition> <selection name="method-sampling-interval" default="normal" label="Method Sampling"> - <option label="Off" name="off">999 d</option> - <option label="Normal" name="normal">20 ms</option> - <option label="Maximum" name="maximum">10 ms</option> + <option label="Off" name="off">off</option> + <option label="Normal" name="normal">normal</option> + <option label="High" name="high">high</option> + <option label="Ludicrous (High Overhead)" name="ludicrous">ludicrous</option> </selection> + + <condition name="method-sampling-java-interval" true="999 d"> + <test name="method-sampling-interval" operator="equal" value="off"/> + </condition> + + <condition name="method-sampling-java-interval" true="20 ms"> + <test name="method-sampling-interval" operator="equal" value="normal"/> + </condition> + + <condition name="method-sampling-java-interval" true="10 ms"> + <test name="method-sampling-interval" operator="equal" value="high"/> + </condition> + + <condition name="method-sampling-java-interval" true="1 ms"> + <test name="method-sampling-interval" operator="equal" value="ludicrous"/> + </condition> + + <condition name="method-sampling-native-interval" true="999 d"> + <test name="method-sampling-interval" operator="equal" value="off"/> + </condition> + + <condition name="method-sampling-native-interval" true="20 ms"> + <or> + <test name="method-sampling-interval" operator="equal" value="normal"/> + <test name="method-sampling-interval" operator="equal" value="high"/> + <test name="method-sampling-interval" operator="equal" value="ludicrous"/> + </or> + </condition> <condition name="method-sampling-enabled" true="false" false="true"> - <test name="method-sampling-interval" operator="equal" value="999 d"/> + <test name="method-sampling-interval" operator="equal" value="off"/> </condition> <selection name="thread-dump-interval" default="normal" label="Thread Dump">
--- a/src/share/classes/jdk/jfr/conf/profile.jfc Fri May 10 20:56:37 2019 +0200 +++ b/src/share/classes/jdk/jfr/conf/profile.jfc Thu Jun 06 20:19:03 2019 +0200 @@ -115,12 +115,12 @@ <event name="jdk.ExecutionSample"> <setting name="enabled" control="method-sampling-enabled">true</setting> - <setting name="period" control="method-sampling-interval">10 ms</setting> + <setting name="period" control="method-sampling-java-interval">10 ms</setting> </event> <event name="jdk.NativeMethodSample"> <setting name="enabled" control="method-sampling-enabled">true</setting> - <setting name="period" control="method-sampling-interval">10 ms</setting> + <setting name="period" control="method-sampling-native-interval">20 ms</setting> </event> <event name="jdk.SafepointBegin"> @@ -743,14 +743,43 @@ <test name="compiler-level" operator="equal" value="all"/> </condition> - <selection name="method-sampling-interval" default="maximum" label="Method Sampling"> - <option label="Off" name="off">999 d</option> - <option label="Normal" name="normal">20 ms</option> - <option label="Maximum" name="maximum">10 ms</option> + <selection name="method-sampling-interval" default="normal" label="Method Sampling"> + <option label="Off" name="off">off</option> + <option label="Normal" name="normal">normal</option> + <option label="High" name="high">high</option> + <option label="Ludicrous (High Overhead)" name="ludicrous">ludicrous</option> </selection> + + <condition name="method-sampling-java-interval" true="999 d"> + <test name="method-sampling-interval" operator="equal" value="off"/> + </condition> + <condition name="method-sampling-java-interval" true="20 ms"> + <test name="method-sampling-interval" operator="equal" value="normal"/> + </condition> + + <condition name="method-sampling-java-interval" true="10 ms"> + <test name="method-sampling-interval" operator="equal" value="high"/> + </condition> + + <condition name="method-sampling-java-interval" true="1 ms"> + <test name="method-sampling-interval" operator="equal" value="ludicrous"/> + </condition> + + <condition name="method-sampling-native-interval" true="999 d"> + <test name="method-sampling-interval" operator="equal" value="off"/> + </condition> + + <condition name="method-sampling-native-interval" true="20 ms"> + <or> + <test name="method-sampling-interval" operator="equal" value="normal"/> + <test name="method-sampling-interval" operator="equal" value="high"/> + <test name="method-sampling-interval" operator="equal" value="ludicrous"/> + </or> + </condition> + <condition name="method-sampling-enabled" true="false" false="true"> - <test name="method-sampling-interval" operator="equal" value="999 d"/> + <test name="method-sampling-interval" operator="equal" value="off"/> </condition> <selection name="thread-dump-interval" default="everyMinute" label="Thread Dump">