mstover1 2002/12/13 13:37:28
Modified: src/components/org/apache/jmeter/control
GenericController.java
src/core/org/apache/jmeter/control Controller.java
src/core/org/apache/jmeter/threads JMeterThread.java
ThreadGroup.java
Log:
Fixing bug in thread iteration management
Revision Changes Path
1.2 +10 -1
jakarta-jmeter/src/components/org/apache/jmeter/control/GenericController.java
Index: GenericController.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/GenericController.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GenericController.java 11 Aug 2002 19:24:40 -0000 1.1
+++ GenericController.java 13 Dec 2002 21:37:28 -0000 1.2
@@ -99,6 +99,15 @@
public GenericController()
{
}
+
+ public boolean isNextFirst()
+ {
+ if(current == 0)
+ {
+ return true;
+ }
+ return false;
+ }
/****************************************
* Gets the ConfigElements attribute of the GenericController object
1.2 +6 -1
jakarta-jmeter/src/core/org/apache/jmeter/control/Controller.java
Index: Controller.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/control/Controller.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Controller.java 11 Aug 2002 19:24:42 -0000 1.1
+++ Controller.java 13 Dec 2002 21:37:28 -0000 1.2
@@ -92,4 +92,9 @@
* of the test.
*/
public boolean isDone();
+
+ /**
+ * By using this method, one can ask the controller if the next Sampler is the
+ * first in the Controller's list.
* @return boolean
*/
+ public boolean isNextFirst();
}
1.12 +6 -3
jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterThread.java
Index: JMeterThread.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterThread.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- JMeterThread.java 17 Oct 2002 19:47:17 -0000 1.11
+++ JMeterThread.java 13 Dec 2002 21:37:28 -0000 1.12
@@ -129,10 +129,13 @@
rampUpDelay();
log.info("Thread "+Thread.currentThread().getName()+"
started");
while (running) {
- notifyThreadListeners();
while (controller.hasNext() && running) {
try
{
+ if(controller.isNextFirst())
+ {
+ notifyThreadListeners();
+ }
SamplePackage pack =
compiler.configureSampler(controller.next());
delay(pack.getTimers());
SampleResult result =
pack.getSampler().sample(null);
1.4 +8 -3
jakarta-jmeter/src/core/org/apache/jmeter/threads/ThreadGroup.java
Index: ThreadGroup.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/ThreadGroup.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ThreadGroup.java 29 Aug 2002 18:17:40 -0000 1.3
+++ ThreadGroup.java 13 Dec 2002 21:37:28 -0000 1.4
@@ -145,6 +145,11 @@
{
setProperty(RAMP_TIME,new Integer(rampUp));
}
+
+ public boolean isNextFirst()
+ {
+ return getSamplerController().isNextFirst();
+ }
/****************************************
* !ToDoo (Method description)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
