You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2011/01/15 04:00:16 UTC
svn commit: r1059242 - in /jakarta/jmeter/trunk:
src/components/org/apache/jmeter/visualizers/
src/core/org/apache/jmeter/visualizers/
src/jorphan/org/apache/jorphan/math/ xdocs/
Author: sebb
Date: Sat Jan 15 03:00:16 2011
New Revision: 1059242
URL: http://svn.apache.org/viewvc?rev=1059242&view=rev
Log:
Bug 50579 - Error count is long, sample count is int.
Changed sample count to long.
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java?rev=1059242&r1=1059241&r2=1059242&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java Sat Jan 15 03:00:16 2011
@@ -168,7 +168,7 @@ public class DistributionGraph extends J
Number ninety = p_model.getPercentPoint(0.90);
Number fifty = p_model.getPercentPoint(0.50);
- int total = p_model.getCount();
+ long total = p_model.getCount();
Collection<Number[]> values = p_model.getDistribution().values();
Number[][] objval = values.toArray(new Number[][]{});
// we sort the objects
Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java?rev=1059242&r1=1059241&r2=1059242&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java Sat Jan 15 03:00:16 2011
@@ -169,7 +169,7 @@ public class Graph extends JComponent im
repaint();
return;
}
- final int xPos = model.getCount();
+ final long xPos = model.getCount();
SwingUtilities.invokeLater(new Runnable() {
public void run() {
@@ -199,10 +199,11 @@ public class Graph extends JComponent im
}
}
- private void drawSample(int x, Sample oneSample, Graphics g) {
+ private void drawSample(long x, Sample oneSample, Graphics g) {
// int width = getWidth();
int height = getHeight();
log.debug("Drawing a sample at " + x);
+ int adjustedWidth = (int)(x % width); // will always be within range of an int: as must be < width
if (wantData) {
int data = (int) (oneSample.getData() * height / graphMax);
@@ -211,9 +212,9 @@ public class Graph extends JComponent im
} else {
g.setColor(JMeterColor.YELLOW);
}
- g.drawLine(x % width, height - data, x % width, height - data - 1);
+ g.drawLine(adjustedWidth, height - data, adjustedWidth, height - data - 1);
if (log.isDebugEnabled()) {
- log.debug("Drawing coords = " + (x % width) + "," + (height - data));
+ log.debug("Drawing coords = " + adjustedWidth + "," + (height - data));
}
}
@@ -221,27 +222,27 @@ public class Graph extends JComponent im
int average = (int) (oneSample.getAverage() * height / graphMax);
g.setColor(Color.blue);
- g.drawLine(x % width, height - average, x % width, (height - average - 1));
+ g.drawLine(adjustedWidth, height - average, adjustedWidth, (height - average - 1));
}
if (wantMedian) {
int median = (int) (oneSample.getMedian() * height / graphMax);
g.setColor(JMeterColor.purple);
- g.drawLine(x % width, height - median, x % width, (height - median - 1));
+ g.drawLine(adjustedWidth, height - median, adjustedWidth, (height - median - 1));
}
if (wantDeviation) {
int deviation = (int) (oneSample.getDeviation() * height / graphMax);
g.setColor(Color.red);
- g.drawLine(x % width, height - deviation, x % width, (height - deviation - 1));
+ g.drawLine(adjustedWidth, height - deviation, adjustedWidth, (height - deviation - 1));
}
if (wantThroughput) {
int throughput = (int) (oneSample.getThroughput() * height / throughputMax);
g.setColor(JMeterColor.dark_green);
- g.drawLine(x % width, height - throughput, x % width, (height - throughput - 1));
+ g.drawLine(adjustedWidth, height - throughput, adjustedWidth, (height - throughput - 1));
}
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java?rev=1059242&r1=1059241&r2=1059242&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java Sat Jan 15 03:00:16 2011
@@ -127,7 +127,7 @@ public class SamplingStatCalculator {
* @return average page size in bytes (0 if sample count is zero)
*/
public double getAvgPageBytes() {
- int count = calculator.getCount();
+ long count = calculator.getCount();
if (count == 0) {
return 0;
}
@@ -170,7 +170,7 @@ public class SamplingStatCalculator {
rbool = res.isSuccessful();
}
- int count = calculator.getCount();
+ long count = calculator.getCount();
Sample s =
new Sample( null, rtime, cmean, cstdv, cmedian, cpercent, throughput, eCount, rbool, count, endTime );
currentSample = s;
@@ -252,7 +252,7 @@ public class SamplingStatCalculator {
return calculator.getPercentPoint(percent);
}
- public int getCount() {
+ public long getCount() {
return calculator.getCount();
}
Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java?rev=1059242&r1=1059241&r2=1059242&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java (original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java Sat Jan 15 03:00:16 2011
@@ -46,7 +46,7 @@ public abstract class StatCalculator<T e
private double deviation = 0;
- private int count = 0;
+ private long count = 0;
private T min;
@@ -187,7 +187,7 @@ public abstract class StatCalculator<T e
return max;
}
- public int getCount() {
+ public long getCount() {
return count;
}
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1059242&r1=1059241&r2=1059242&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Sat Jan 15 03:00:16 2011
@@ -161,6 +161,7 @@ Also enable reversion to using System.cu
<li>View Results Tree - Add a dialog's text box on "Sampler result tab > Parsed" to display the long value with a double click on cell</li>
<li>Bug 37156 - Formatted view of Request in Results Tree</li>
<li>Bug 49365 - Allow result set to be written to file in a path relative to the loaded script</li>
+<li>Bug 50579 - Error count is long, sample count is int. Changed sample count to long.</li>
</ul>
<h3>Timers, Assertions, Config, Pre- & Post-Processors</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org