You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2017/02/18 21:10:09 UTC
svn commit: r1783590 - in /jmeter/trunk: bin/
src/components/org/apache/jmeter/visualizers/
src/core/org/apache/jmeter/gui/ xdocs/usermanual/
Author: fschumacher
Date: Sat Feb 18 21:10:09 2017
New Revision: 1783590
URL: http://svn.apache.org/viewvc?rev=1783590&view=rev
Log:
Make the interval period configurable by one property for all listeners.
Bugzilla Id: 60687
Modified:
jmeter/trunk/bin/jmeter.properties
jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java
jmeter/trunk/xdocs/usermanual/properties_reference.xml
Modified: jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1783590&r1=1783589&r2=1783590&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Sat Feb 18 21:10:09 2017
@@ -133,8 +133,8 @@ jmeter.laf.mac=System
# 0 means no limit
#jmeter.loggerpanel.maxlength=1000
-# Interval in ms to refresh the log entries in the panel.
-#jmeter.loggerpanel.refresh_period=500
+# Interval period in ms to process the queue of events of the listeners
+#jmeter.gui.refresh_period=500
# HiDPI mode (default: false)
# Activate a 'pseudo'-hidpi mode. Allows to increase size of some UI elements
@@ -1219,4 +1219,4 @@ jmeter.reportgenerator.apdex_tolerated_t
# Implementation of interface org.apache.jmeter.gui.action.TreeNodeNamingPolicy
#naming_policy.impl=org.apache.jmeter.gui.action.impl.DefaultTreeNodeNamingPolicy
-
\ No newline at end of file
+
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java?rev=1783590&r1=1783589&r2=1783590&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java Sat Feb 18 21:10:09 2017
@@ -75,6 +75,8 @@ public class GraphVisualizer extends Abs
private final String minute = JMeterUtils.getResString("minute"); // $NON-NLS-1$
+ private final int REFRESH_PERIOD = JMeterUtils.getPropDefault("jmeter.gui.refresh_period", 500); // $NON-NLS-1$
+
private final Graph graph;
private JCheckBox data;
@@ -234,7 +236,7 @@ public class GraphVisualizer extends Abs
this.add(makeTitlePanel(), BorderLayout.NORTH);
this.add(graphPanel, BorderLayout.CENTER);
- new Timer(500, e -> collectSamplesFromQueue()).start();
+ new Timer(REFRESH_PERIOD, e -> collectSamplesFromQueue()).start();
}
// Methods used in creating the GUI
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java?rev=1783590&r1=1783589&r2=1783590&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatGraphVisualizer.java Sat Feb 18 21:10:09 2017
@@ -103,7 +103,7 @@ public class StatGraphVisualizer extends
private static final String PCT1_LABEL = JMeterUtils.getPropDefault("aggregate_rpt_pct1", "90");
private static final String PCT2_LABEL = JMeterUtils.getPropDefault("aggregate_rpt_pct2", "95");
private static final String PCT3_LABEL = JMeterUtils.getPropDefault("aggregate_rpt_pct3", "99");
-
+
private static final Float PCT1_VALUE = new Float(Float.parseFloat(PCT1_LABEL)/100);
private static final Float PCT2_VALUE = new Float(Float.parseFloat(PCT2_LABEL)/100);
private static final Float PCT3_VALUE = new Float(Float.parseFloat(PCT3_LABEL)/100);
@@ -141,6 +141,8 @@ public class StatGraphVisualizer extends
private static final Font FONT_SMALL = new Font("SansSerif", Font.PLAIN, (int) Math.round(FONT_DEFAULT.getSize() * 0.8)); //$NON-NLS-1$
+ private static final int REFRESH_PERIOD = JMeterUtils.getPropDefault("jmeter.gui.refresh_period", 500);
+
private JTable myJTable;
private JScrollPane myScrollPane;
@@ -151,7 +153,7 @@ public class StatGraphVisualizer extends
* Lock used to protect tableRows update + model update
*/
private final transient Object lock = new Object();
-
+
private final Map<String, SamplingStatCalculator> tableRows = new ConcurrentHashMap<>();
private AxisGraph graphPanel = null;
@@ -517,7 +519,7 @@ public class StatGraphVisualizer extends
this.add(mainPanel, BorderLayout.NORTH);
this.add(spane, BorderLayout.CENTER);
- new Timer(500, e -> {
+ new Timer(REFRESH_PERIOD, e -> {
synchronized (lock) {
while (!newRows.isEmpty()) {
model.insertRow(newRows.pop(), model.getRowCount() - 1);
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java?rev=1783590&r1=1783589&r2=1783590&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java Sat Feb 18 21:10:09 2017
@@ -86,6 +86,8 @@ public class StatVisualizer extends Abst
private final JCheckBox useGroupName = new JCheckBox(
JMeterUtils.getResString("aggregate_graph_use_group_name")); //$NON-NLS-1$
+ private final int REFRESH_PERIOD = JMeterUtils.getPropDefault("jmeter.gui.refresh_period", 500); // $NON-NLS-1$
+
private transient ObjectTableModel model;
/**
@@ -183,7 +185,7 @@ public class StatVisualizer extends Abst
opts.add(saveHeaders, BorderLayout.EAST);
this.add(opts,BorderLayout.SOUTH);
- new Timer(500, e -> {
+ new Timer(REFRESH_PERIOD, e -> {
synchronized (lock) {
while (!newRows.isEmpty()) {
model.insertRow(newRows.pop(), model.getRowCount() - 1);
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java?rev=1783590&r1=1783589&r2=1783590&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java Sat Feb 18 21:10:09 2017
@@ -67,6 +67,8 @@ public class TableVisualizer extends Abs
private static final String ICON_SIZE = JMeterUtils.getPropDefault(JMeter.TREE_ICON_SIZE, JMeter.DEFAULT_TREE_ICON_SIZE);
+ private static final int REFRESH_PERIOD = JMeterUtils.getPropDefault("jmeter.gui.refresh_period", 500);
+
// Note: the resource string won't respond to locale-changes,
// however this does not matter as it is only used when pasting to the clipboard
private static final ImageIcon imageSuccess = JMeterUtils.getImage(
@@ -320,7 +322,7 @@ public class TableVisualizer extends Abs
// Add the main panel and the graph
this.add(mainPanel, BorderLayout.NORTH);
this.add(tablePanel, BorderLayout.CENTER);
- new Timer(500, e -> collectNewSamples()).start();
+ new Timer(REFRESH_PERIOD, e -> collectNewSamples()).start();
}
private void collectNewSamples() {
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java?rev=1783590&r1=1783589&r2=1783590&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java Sat Feb 18 21:10:09 2017
@@ -129,7 +129,7 @@ implements ActionListener, TreeSelection
private static final String VIEWERS_ORDER =
JMeterUtils.getPropDefault("view.results.tree.renderers_order", ""); // $NON-NLS-1$ //$NON-NLS-2$
- private static final int REFRESH_PERIOD = JMeterUtils.getPropDefault("view.results.tree.refresh_period", 500);
+ private static final int REFRESH_PERIOD = JMeterUtils.getPropDefault("jmeter.gui.refresh_period", 500);
private ResultRenderer resultsRender = null;
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java?rev=1783590&r1=1783589&r2=1783590&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/LoggerPanel.java Sat Feb 18 21:10:09 2017
@@ -56,7 +56,7 @@ public class LoggerPanel extends JPanel
JMeterUtils.getPropDefault("jmeter.loggerpanel.enable_when_closed", true); // $NON-NLS-1$
private static final int LOGGER_PANEL_REFRESH_PERIOD =
- JMeterUtils.getPropDefault("jmeter.loggerpanel.refresh_period", 500); // $NON-NLS-1$
+ JMeterUtils.getPropDefault("jmeter.gui.refresh_period", 500); // $NON-NLS-1$
private final Buffer events;
Modified: jmeter/trunk/xdocs/usermanual/properties_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/properties_reference.xml?rev=1783590&r1=1783589&r2=1783590&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/properties_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/properties_reference.xml Sat Feb 18 21:10:09 2017
@@ -160,8 +160,8 @@ The <code>system.properties</code> file
<property name="jmeter.loggerpanel.maxlength">
Max lines kept in LoggerPanel, <code>0</code> means no limit.<br/>
Defaults to: <code>1000</code></property>
-<property name="jmeter.loggerpanel.refresh_period">
- Interval in <code>ms</code> to refresh the log entries in the panel.<br/>
+<property name="jmeter.gui.refresh_period">
+ Interval period in <code>ms</code> to process the events of the listeners.<br/>
Defaults to: <code>500</code></property>
</properties>
</section>
@@ -1406,9 +1406,6 @@ JMETER-SERVER</source>
Defaults to:
<source>.RenderAsText,.RenderAsRegexp,.RenderAsCssJQuery,.RenderAsXPath,.RenderAsHTML,.RenderAsHTMLWithEmbedded,.RenderAsDocument,.RenderAsJSON,.RenderAsXML</source>
</property>
-<property name="view.results.tree.refresh_period">
- Interval in <code>ms</code> after which the results should be updated.<br/>
- Defaults to: <code>500</code></property>
<property name="document.max_size">
Maximum size (in bytes) of Document that can be parsed by Tika engine<br/>
Set to zero to disable the size check.<br/>