Throughput Controller was not working for "all thread" counts

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/trunk@581434 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: e1bff9ee9b

src/components/org/apache/jmeter/control/ThroughputController.java

@@ -18,7 +18,6 @@
 
 package org.apache.jmeter.control;
 
-import java.io.IOException;
 import java.io.Serializable;
 
 import org.apache.jmeter.engine.event.LoopIterationEvent;
@@ -32,12 +31,13 @@ import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jmeter.testelement.property.StringProperty;
 
 /**
- * This class represents a controller that can controll the number of times that
+ * This class represents a controller that can control the number of times that
  * it is executed, either by the total number of times the user wants the
  * controller executed (BYNUMBER) or by the percentage of time it is called
  * (BYPERCENT)
  * 
- * @author Thad Smith
+ * The current implementation executes the first N samples (BYNUMBER)
+ * or the last N% of samples (BYPERCENT).
  */
 public class ThroughputController extends GenericController implements Serializable, LoopIterationListener,
 		TestListener {
@@ -54,11 +54,11 @@ public class ThroughputController extends GenericController implements Serializa
 
 	private static final String PERCENTTHROUGHPUT = "ThroughputController.percentThroughput";// $NON-NLS-1$
 
-	private int globalNumExecutions;
+	private static int globalNumExecutions;
 
-	private int globalIteration;
+	private static int globalIteration;
 
-	private transient Object counterLock;
+	private static Object counterLock; // ensure counts are updated correctly
 
 	/**
 	 * Number of iterations on which we've chosen to deliver samplers.
@@ -76,9 +76,6 @@ public class ThroughputController extends GenericController implements Serializa
 	private boolean runThisTime;
 
 	public ThroughputController() {
-		globalNumExecutions = 0;
-		globalIteration = -1;
-		counterLock = new Object();
 		setStyle(BYNUMBER);
 		setPerThread(true);
 		setMaxThroughput(1);
@@ -154,42 +151,13 @@ public class ThroughputController extends GenericController implements Serializa
 		return retVal;
 	}
 
-	protected void setExecutions(int executions) {
+	private int getExecutions() {
-		if (!isPerThread()) {
-			globalNumExecutions = executions;
-		}
-		this.numExecutions = executions;
-	}
-
-	protected int getExecutions() {
 		if (!isPerThread()) {
 			return globalNumExecutions;
 		}
 		return numExecutions;
 	}
 
-	private void increaseExecutions() {
-		setExecutions(getExecutions() + 1);
-	}
-
-	protected void setIteration(int iteration) {
-		if (!isPerThread()) {
-			globalIteration = iteration;
-		}
-		this.iteration = iteration;
-	}
-
-	protected int getIteration() {
-		if (!isPerThread()) {
-			return globalIteration;
-		}
-		return iteration;
-	}
-
-	private void increaseIteration() {
-		setIteration(getIteration() + 1);
-	}
-
 	/**
 	 * @see org.apache.jmeter.control.Controller#next()
 	 */
@@ -203,11 +171,7 @@ public class ThroughputController extends GenericController implements Serializa
 	/**
 	 * Decide whether to return any samplers on this iteration.
 	 */
-	private boolean decide() {
+	private boolean decide(int executions, int iterations) {
-		int executions, iterations;
-
-		executions = getExecutions();
-		iterations = getIteration();
 		if (getStyle() == BYNUMBER) {
 			return executions < getMaxThroughputAsInt();
 		}
@@ -232,78 +196,42 @@ public class ThroughputController extends GenericController implements Serializa
 		ThroughputController clone = (ThroughputController) super.clone();
 		clone.numExecutions = numExecutions;
 		clone.iteration = iteration;
-		clone.globalNumExecutions = globalNumExecutions;
-		clone.globalIteration = globalIteration;
-		clone.counterLock = counterLock;
 		clone.runThisTime = false;
 		return clone;
 	}
 
-	private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
-		in.defaultReadObject();
-		counterLock = new Object();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see LoopIterationListener#iterationStart(LoopIterationEvent)
-	 */
 	public void iterationStart(LoopIterationEvent iterEvent) {
 		if (!isPerThread()) {
 			synchronized (counterLock) {
-				increaseIteration();
+				globalIteration++;
-				runThisTime = decide();
+				runThisTime = decide(globalNumExecutions, globalIteration);
 				if (runThisTime)
-					increaseExecutions();
+					globalNumExecutions++;
 			}
 		} else {
-			increaseIteration();
+			iteration++;
-			runThisTime = decide();
+			runThisTime = decide(numExecutions, iteration);
 			if (runThisTime)
-				increaseExecutions();
+				numExecutions++;
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.jmeter.testelement.TestListener#testStarted()
-	 */
 	public void testStarted() {
-		setExecutions(0);
+		globalNumExecutions = 0;
-		setIteration(-1);
+		globalIteration = -1;
+		counterLock = new Object();
+	}
+
+	public void testStarted(String host) {
+		testStarted();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.apache.jmeter.testelement.TestListener#testEnded()
-	 */
 	public void testEnded() {
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see TestListener#testStarted(String)
-	 */
-	public void testStarted(String host) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see TestListener#testEnded(String)
-	 */
 	public void testEnded(String host) {
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see TestListener#testIterationStart(LoopIterationEvent)
-	 */
 	public void testIterationStart(LoopIterationEvent event) {
 	}
 }

xdocs/changes.xml

@@ -32,6 +32,7 @@
 <h4>Bug fixes</h4>
 <ul>
 <li>Bug 43430 - Count of active threads is incorrect for remote samples</li>
+<li>Throughput Controller was not working for "all thread" counts</li>
 </ul>
 
 <h4>Improvements</h4>