mstover1 02/05/28 11:23:47
Modified: src_1/org/apache/jmeter/engine StandardJMeterEngine.java
TreeCloner.java
src_1/org/apache/jmeter/protocol/java/test SleepTest.java
src_1/org/apache/jmeter/testelement AbstractTestElement.java
src_1/org/apache/jmeter/threads JMeterThread.java
src_1/org/apache/jmeter/timers RandomTimer.java
Log:
Fixing timer bug
Revision Changes Path
1.8 +3 -2
jakarta-jmeter/src_1/org/apache/jmeter/engine/StandardJMeterEngine.java
Index: StandardJMeterEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/engine/StandardJMeterEngine.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StandardJMeterEngine.java 28 May 2002 17:30:18 -0000 1.7
+++ StandardJMeterEngine.java 28 May 2002 18:23:46 -0000 1.8
@@ -73,8 +73,8 @@
* !ToDo (Class description)
*
*@author $Author: mstover1 $
- *@created $Date: 2002/05/28 17:30:18 $
- *@version $Revision: 1.7 $
+ *@created $Date: 2002/05/28 18:23:46 $
+ *@version $Revision: 1.8 $
***********************************************************/
public class StandardJMeterEngine implements JMeterEngine,JMeterThreadMonitor
{
@@ -214,6 +214,7 @@
***********************************************************/
public void stopTest()
{
+ System.out.println("Stopping test");
running = false;
Iterator iter = new HashSet(allThreads).iterator();
while(iter.hasNext())
1.3 +0 -1 jakarta-jmeter/src_1/org/apache/jmeter/engine/TreeCloner.java
Index: TreeCloner.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/engine/TreeCloner.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TreeCloner.java 28 May 2002 17:30:18 -0000 1.2
+++ TreeCloner.java 28 May 2002 18:23:46 -0000 1.3
@@ -28,7 +28,6 @@
}
public void addNode(Object node,ListedHashTree subTree)
{
- System.out.println("Cloning object: "+node);
if(node instanceof PerThreadClonable)
{
node = ((PerThreadClonable)node).clone();
1.3 +0 -1
jakarta-jmeter/src_1/org/apache/jmeter/protocol/java/test/SleepTest.java
Index: SleepTest.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/java/test/SleepTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SleepTest.java 28 May 2002 17:30:18 -0000 1.2
+++ SleepTest.java 28 May 2002 18:23:46 -0000 1.3
@@ -154,7 +154,6 @@
long end = System.currentTimeMillis();
results.setTime(end - start);
results.setSuccessful(true);
- System.out.println("Sleep Test: time = "+(end-start));
results.setSampleLabel("Sleep Test: time = "+getSleepTime() +
ct);
} catch (Exception e) {
}
1.9 +3 -1
jakarta-jmeter/src_1/org/apache/jmeter/testelement/AbstractTestElement.java
Index: AbstractTestElement.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/testelement/AbstractTestElement.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractTestElement.java 28 May 2002 17:30:19 -0000 1.8
+++ AbstractTestElement.java 28 May 2002 18:23:46 -0000 1.9
@@ -3,11 +3,13 @@
import java.util.*;
import java.io.Serializable;
+import org.apache.jmeter.control.LoopController;
+
/****************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
*@author Michael Stover
- *@created $Date: 2002/05/28 17:30:19 $
+ *@created $Date: 2002/05/28 18:23:46 $
*@version 1.0
***************************************/
1.11 +3 -4 jakarta-jmeter/src_1/org/apache/jmeter/threads/JMeterThread.java
Index: JMeterThread.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/threads/JMeterThread.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JMeterThread.java 28 May 2002 17:30:19 -0000 1.10
+++ JMeterThread.java 28 May 2002 18:23:46 -0000 1.11
@@ -70,8 +70,8 @@
* timing, add listeners for sampling events and to stop the sampling process.
*
*@author $Author: mstover1 $
- *@created $Date: 2002/05/28 17:30:19 $
- *@version $Revision: 1.10 $
+ *@created $Date: 2002/05/28 18:23:46 $
+ *@version $Revision: 1.11 $
***************************************/
public class JMeterThread implements Runnable, java.io.Serializable {
static Map samplers = new HashMap();
@@ -108,7 +108,7 @@
rampUpDelay();
System.out.println("Thread "+Thread.currentThread().getName()+"
started");
while (running) {
- while (controller.hasNext()) {
+ while (controller.hasNext() && running) {
SamplePackage pack =
compiler.configureSampler(controller.next());
delay(pack.getTimers());
SampleResult result = pack.getSampler().sample(null);
@@ -157,7 +157,6 @@
Iterator iter = listeners.iterator();
while (iter.hasNext()) {
SampleListener lis = (SampleListener)iter.next();
- System.out.println("notifying listener: "+lis);
SampleListener item = lis;
item.sampleOccurred(event);
}
1.4 +3 -11 jakarta-jmeter/src_1/org/apache/jmeter/timers/RandomTimer.java
Index: RandomTimer.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/timers/RandomTimer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RandomTimer.java 29 Apr 2002 17:08:14 -0000 1.3
+++ RandomTimer.java 28 May 2002 18:23:47 -0000 1.4
@@ -66,8 +66,8 @@
* method, is abstract and must be extended to provide full functionality.
*
*@author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- *@created $Date: 2002/04/29 17:08:14 $
- *@version $Revision: 1.3 $ $Date: 2002/04/29 17:08:14 $
+ *@created $Date: 2002/05/28 18:23:47 $
+ *@version $Revision: 1.4 $ $Date: 2002/05/28 18:23:47 $
***********************************************************/
public abstract class RandomTimer extends ConstantTimer implements
Timer,Serializable
@@ -101,14 +101,6 @@
***********************************************************/
public double getRange()
{
- Object delay = getProperty(DELAY);
- if(delay instanceof Double)
- {
- return ((Double)delay).longValue();
- }
- else
- {
- return Double.parseDouble((String)delay);
- }
+ return this.getPropertyAsDouble(RANGE);
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
