You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/11/15 00:35:24 UTC

svn commit: r595133 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java xdocs/changes.xml

Author: sebb
Date: Wed Nov 14 15:35:21 2007
New Revision: 595133

URL: http://svn.apache.org/viewvc?rev=595133&view=rev
Log:
Fix SamplingStatCalculator so it no longer adds elapsed time to endTime, as this is handled by SampleResult.
This corrects discrepancies between Summary Report and Aggregate Report throughput calculation.

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
    jakarta/jmeter/trunk/xdocs/changes.xml

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=595133&r1=595132&r2=595133&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 Wed Nov 14 15:35:21 2007
@@ -34,7 +34,6 @@
  * class, and then call {@link #addSample(SampleResult)} a few times, and pull
  * the stats out with whatever methods you prefer.
  * 
- * @author James Boutcher
  */
 public class SamplingStatCalculator implements Serializable {
 	private static final Logger log = LoggingManager.getLoggerForClass();
@@ -49,8 +48,6 @@
 
 	private String label;
 
-	// private int index;
-
 	public SamplingStatCalculator() {// Don't (can't) use this...
         log.warn("Constructor only intended for use in testing"); // $NON-NLS-1$
 	}
@@ -268,9 +265,6 @@
 	private long getEndTime(SampleResult res) {
 		long endTime = res.getEndTime();
 		long lastTime = getCurrentSample().getEndTime();
-		if (res.isStampedAtStart()) {
-			endTime += res.getTime();
-		}
 		if (lastTime < endTime) {
 			lastTime = endTime;
 		}
@@ -334,38 +328,22 @@
 		return maxThroughput;
 	}
 
-	/**
-	 * @return
-	 */
 	public HashMap getDistribution() {
 		return calculator.getDistribution();
 	}
 
-	/**
-	 * @param percent
-	 * @return
-	 */
 	public Number getPercentPoint(double percent) {
 		return calculator.getPercentPoint(percent);
 	}
 
-	/**
-	 * @return
-	 */
 	public int getCount() {
 		return calculator.getCount();
 	}
 
-	/**
-	 * @return
-	 */
 	public Number getMax() {
 		return calculator.getMax();
 	}
 
-	/**
-	 * @return
-	 */
 	public double getMean() {
 		return calculator.getMean();
 	}
@@ -374,16 +352,10 @@
 		return new Long((long) calculator.getMean());
 	}
 
-	/**
-	 * @return
-	 */
 	public Number getMedian() {
 		return calculator.getMedian();
 	}
 
-	/**
-	 * @return
-	 */
 	public Number getMin() {
 		if (calculator.getMin().longValue() < 0) {
 			return new Long(0);
@@ -392,17 +364,10 @@
 		}
 	}
 
-	/**
-	 * @param percent
-	 * @return
-	 */
 	public Number getPercentPoint(float percent) {
 		return calculator.getPercentPoint(percent);
 	}
 
-	/**
-	 * @return
-	 */
 	public double getStandardDeviation() {
 		return calculator.getStandardDeviation();
 	}

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=595133&r1=595132&r2=595133&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Wed Nov 14 15:35:21 2007
@@ -58,6 +58,10 @@
 <li>Ensure Listener nodes get own save configuration when copy-pasted</li>
 <li>Correct Proxy Server include and exclude matching description - port and query are included, contrary to previously documented.</li>
 <li>Aggregate Graph and Aggregate Report Column Header is KB/Sec; fixed the values to be KB rather than bytes</li>
+<li>
+Fix SamplingStatCalculator so it no longer adds elapsed time to endTime, as this is handled by SampleResult.
+This corrects discrepancies between Summary Report and Aggregate Report throughput calculation.
+</li>
 </ul>
 
 <h4>Improvements</h4>



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org