GH-242 - Allow to use a sampling period of 1ms for the Polyglot Sampler

jisedlac · jisedlac · commit 4e3f7998631b · 2020-10-23T16:03:09.000+02:00
diff --git a/visualvm/profiling/manifest.mf b/visualvm/profiling/manifest.mf
@@ -5,5 +5,5 @@ AutoUpdate-Essential-Module: true
 OpenIDE-Module-Layer: org/graalvm/visualvm/profiling/resources/layer.xml
 OpenIDE-Module-Install: org/graalvm/visualvm/profiling/Installer.class
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/profiling/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.1
+OpenIDE-Module-Specification-Version: 2.2
 
diff --git a/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/SamplerCPUPanel.java b/visualvm/profiling/src/org/graalvm/visualvm/profiling/presets/SamplerCPUPanel.java
@@ -285,7 +285,7 @@ public void setEnabled(boolean enabled) {
         add(sampleRateLabel, constraints);
 
         Integer[] samplingRates =
-            new Integer[] { 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000 };
+            new Integer[] { 1, 2, 5, 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000 };
         sampleRateCombo = new JComboBox(samplingRates) {
             public Dimension getMinimumSize() { return getPreferredSize(); }
             public Dimension getMaximumSize() { return getPreferredSize(); }
diff --git a/visualvm/sampler.truffle/nbproject/project.xml b/visualvm/sampler.truffle/nbproject/project.xml
@@ -93,7 +93,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/AbstractSamplerSupport.java b/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/AbstractSamplerSupport.java
@@ -28,6 +28,8 @@
 import org.graalvm.visualvm.core.ui.components.DataViewComponent;
 import java.util.Timer;
 import org.graalvm.visualvm.lib.common.ProfilingSettings;
+import org.graalvm.visualvm.lib.profiler.api.ProfilerDialogs;
+import org.openide.util.NbBundle;
 
 /**
  *
@@ -45,6 +47,16 @@ public abstract class AbstractSamplerSupport {
 
 
     protected abstract Timer getTimer();
+    
+    
+    protected final void checkCPUSamplingRate(int samplingRate) {
+        if (samplingRate < 20)
+            ProfilerDialogs.displayWarningDNSA(NbBundle.getMessage(AbstractSamplerSupport.class, "MSG_High_Sampling_Frequency"), // NOI18N
+                                               NbBundle.getMessage(AbstractSamplerSupport.class, "CAP_High_Sampling_Frequency"), // NOI18N
+                                               null,
+                                               "org.graalvm.visualvm.sampler.truffle.AbstractSamplerSupport.checkCPUSamplingRate", // NOI18N
+                                               false);
+    }
 
 
     public static abstract class Refresher {
diff --git a/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/Bundle.properties b/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/Bundle.properties
@@ -122,3 +122,7 @@ MSG_ThreadMemory_unsupported=thread memory allocation not supported
 MSG_Incorrect_CPU_settings=Provided CPU settings are invalid.
 
 MSG_Incorrect_Memory_settings=Provided Memory settings are invalid.
+
+MSG_High_Sampling_Frequency=<html><br><b>Configured sampling frequency is high.</b><br><br>This may affect performance of the target application<br>and bias the collected results.<br><br></html>
+
+CAP_High_Sampling_Frequency=High Sampling Frequency
diff --git a/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/cpu/CPUSamplerSupport.java b/visualvm/sampler.truffle/src/org/graalvm/visualvm/sampler/truffle/cpu/CPUSamplerSupport.java
@@ -121,6 +121,8 @@ public void setOptions(String mode, boolean trackFlags) {
     }
 
     public boolean startSampling(ProfilingSettings settings, int samplingRate, int refreshRate) {
+        checkCPUSamplingRate(samplingRate);
+        
         GenericFilter sf = settings.getInstrumentationFilter();
         InstrumentationFilter filter = new InstrumentationFilter(sf);
         builder = snapshotDumper.getNewBuilder(filter);
diff --git a/visualvm/sampler/nbproject/project.xml b/visualvm/sampler/nbproject/project.xml
@@ -93,7 +93,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/sampler/src/org/graalvm/visualvm/sampler/AbstractSamplerSupport.java b/visualvm/sampler/src/org/graalvm/visualvm/sampler/AbstractSamplerSupport.java
@@ -28,6 +28,8 @@
 import org.graalvm.visualvm.core.ui.components.DataViewComponent;
 import java.util.Timer;
 import org.graalvm.visualvm.lib.common.ProfilingSettings;
+import org.graalvm.visualvm.lib.profiler.api.ProfilerDialogs;
+import org.openide.util.NbBundle;
 
 /**
  *
@@ -45,6 +47,16 @@ public abstract class AbstractSamplerSupport {
 
 
     protected abstract Timer getTimer();
+    
+    
+    protected final void checkCPUSamplingRate(int samplingRate) {
+        if (samplingRate < 20)
+            ProfilerDialogs.displayWarningDNSA(NbBundle.getMessage(AbstractSamplerSupport.class, "MSG_High_Sampling_Frequency"), // NOI18N
+                                               NbBundle.getMessage(AbstractSamplerSupport.class, "CAP_High_Sampling_Frequency"), // NOI18N
+                                               null,
+                                               "org.graalvm.visualvm.sampler.AbstractSamplerSupport.checkCPUSamplingRate", // NOI18N
+                                               false);
+    }
 
 
     public static abstract class Refresher {
diff --git a/visualvm/sampler/src/org/graalvm/visualvm/sampler/Bundle.properties b/visualvm/sampler/src/org/graalvm/visualvm/sampler/Bundle.properties
@@ -118,3 +118,7 @@ MSG_ThreadMemory_unsupported=thread memory allocation not supported
 MSG_Incorrect_CPU_settings=Provided CPU settings are invalid.
 
 MSG_Incorrect_Memory_settings=Provided Memory settings are invalid.
+
+MSG_High_Sampling_Frequency=<html><br><b>Configured sampling frequency is high.</b><br><br>This may affect performance of the target application<br>and bias the collected results.<br><br></html>
+
+CAP_High_Sampling_Frequency=High Sampling Frequency
diff --git a/visualvm/sampler/src/org/graalvm/visualvm/sampler/cpu/CPUSamplerSupport.java b/visualvm/sampler/src/org/graalvm/visualvm/sampler/cpu/CPUSamplerSupport.java
@@ -155,6 +155,8 @@ public DataViewComponent.DetailsView[] getDetailsView() {
     }
 
     public boolean startSampling(ProfilingSettings settings, int samplingRate, int refreshRate) {
+        checkCPUSamplingRate(samplingRate);
+        
         GenericFilter sf = settings.getInstrumentationFilter();
         InstrumentationFilter filter = new InstrumentationFilter(sf);
         builder = snapshotDumper.getNewBuilder(filter, samplingRate);

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,8 @@ public void setOptions(String mode, boolean trackFlags) {`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`public boolean startSampling(ProfilingSettings settings, int samplingRate, int refreshRate) {`
	`124`	`+ checkCPUSamplingRate(samplingRate);`
	`125`	`+`
`124`	`126`	`GenericFilter sf = settings.getInstrumentationFilter();`
`125`	`127`	`InstrumentationFilter filter = new InstrumentationFilter(sf);`
`126`	`128`	`builder = snapshotDumper.getNewBuilder(filter);`
Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,8 @@ public DataViewComponent.DetailsView[] getDetailsView() {`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`public boolean startSampling(ProfilingSettings settings, int samplingRate, int refreshRate) {`
	`158`	`+ checkCPUSamplingRate(samplingRate);`
	`159`	`+`
`158`	`160`	`GenericFilter sf = settings.getInstrumentationFilter();`
`159`	`161`	`InstrumentationFilter filter = new InstrumentationFilter(sf);`
`160`	`162`	`builder = snapshotDumper.getNewBuilder(filter, samplingRate);`