Author: sebb
Date: Tue Sep 27 09:43:38 2011
New Revision: 1176299
URL: http://svn.apache.org/viewvc?rev=1176299&view=rev
Log:
Bug 51880 - The shutdown command is not working if I invoke it before all the
thread are started
Part2 - fix to startUp delay (previous fix was to rampUp delay)
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=1176299&r1=1176298&r2=1176299&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
Tue Sep 27 09:43:38 2011
@@ -209,9 +209,23 @@ public class JMeterThread implements Run
private void startScheduler() {
long delay = (startTime - System.currentTimeMillis());
if (delay > 0) {
- try {
- Thread.sleep(delay);
- } catch (Exception e) {
+ long start = System.currentTimeMillis();
+ long end = start + delay;
+ long now=0;
+ long pause = RAMPUP_GRANULARITY;
+ while(running && (now = System.currentTimeMillis()) < end) {
+ long togo = end - now;
+ if (togo < pause) {
+ pause = togo;
+ }
+ try {
+ Thread.sleep(pause); // delay between checks
+ } catch (InterruptedException e) {
+ if (running) { // Don't bother reporting stop test
interruptions
+ log.warn("startScheduler delay for "+threadName+" was
interrupted. Waited "+(now - start)+" milli-seconds out of "+delay);
+ }
+ break;
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
