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 ms...@apache.org on 2003/05/01 17:56:06 UTC
cvs commit: jakarta-jmeter/src/core/org/apache/jmeter/threads JMeterThread.java
mstover1 2003/05/01 08:56:06
Modified: bin jmeter.properties
src/core/org/apache/jmeter/threads JMeterThread.java
Log:
Revamping internal contoller code
Revision Changes Path
1.70 +1 -1 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- jmeter.properties 1 May 2003 15:49:05 -0000 1.69
+++ jmeter.properties 1 May 2003 15:56:06 -0000 1.70
@@ -73,7 +73,7 @@
log_level.jmeter=WARN
log_level.jmeter.engine=WARN
log_level.jmeter.gui=WARN
-log_level.jmeter.elements=DEBUG
+log_level.jmeter.elements=WARN
log_level.jmeter.util=WARN
log_level.jmeter.util.classfinder=WARN
log_level.jmeter.test=DEBUG
1.25 +28 -14 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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- JMeterThread.java 1 May 2003 15:49:07 -0000 1.24
+++ JMeterThread.java 1 May 2003 15:56:06 -0000 1.25
@@ -63,7 +63,9 @@
import org.apache.jmeter.assertions.Assertion;
import org.apache.jmeter.assertions.AssertionResult;
import org.apache.jmeter.control.Controller;
+import org.apache.jmeter.engine.event.IterationDeliverEvent;
import org.apache.jmeter.engine.event.LoopIterationEvent;
+import org.apache.jmeter.engine.event.LoopIterationListener;
import org.apache.jmeter.processor.PostProcessor;
import org.apache.jmeter.samplers.SampleEvent;
import org.apache.jmeter.samplers.SampleResult;
@@ -144,7 +146,7 @@
rampUpDelay();
log.info("Thread " + Thread.currentThread().getName() + " started");
controller.initialize();
- int i=0;
+ controller.addIterationListener(new IterationListener());
while (running)
{
Sampler sam;
@@ -152,10 +154,6 @@
{
try
{
- if (i==0)
- {
- notifyTestListeners();
- }
threadContext.setCurrentSampler(sam);
SamplePackage pack = compiler.configureSampler(sam);
delay(pack.getTimers());
@@ -167,7 +165,6 @@
runPostProcessors(pack.getPostProcessors());
notifyListeners(pack.getSampleListeners(), result);
compiler.done(pack);
- i++;
}
catch (Exception e)
{
@@ -178,11 +175,6 @@
{
running = false;
}
- else
- {
- i=0;
- controller.initialize();
- }
}
}
finally
@@ -310,5 +302,27 @@
{
this.threadNum = threadNum;
}
+
+ private class IterationListener implements LoopIterationListener
+ {
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.engine.event.LoopIterationListener#iteration(org.apache.jmeter.engine.event.IterationDeliverEvent)
+ */
+ public void iteration(IterationDeliverEvent iterEvent)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.engine.event.LoopIterationListener#iterationStart(org.apache.jmeter.engine.event.LoopIterationEvent)
+ */
+ public void iterationStart(LoopIterationEvent iterEvent)
+ {
+ notifyTestListeners();
+ }
+
+}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org