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 se...@apache.org on 2004/04/29 16:44:12 UTC
cvs commit: jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test SleepTest.java JavaTest.java
sebb 2004/04/29 07:44:12
Modified: src/protocol/java/org/apache/jmeter/protocol/java/test Tag:
rel-2_0 SleepTest.java JavaTest.java
Log:
Treat Interrupted sleep as a warning; fix zero timestamp error
Revision Changes Path
No revision
No revision
1.11.2.1 +16 -9 jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java
Index: SleepTest.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- SleepTest.java 10 Feb 2004 00:46:44 -0000 1.11
+++ SleepTest.java 29 Apr 2004 14:44:12 -0000 1.11.2.1
@@ -132,23 +132,30 @@
// Generate a random value using the current time.
long start = System.currentTimeMillis();
- long ct = start % getSleepMask();
+ long sleep = getSleepTime() + (start % getSleepMask());
+ results.setSampleLabel(
+ "Sleep Test: time = " + sleep);
+
// Execute the sample. In this case sleep for the
// specified time.
- Thread.sleep(getSleepTime() + ct);
-
- // Populate the results.
+ Thread.sleep(sleep);
- results.sampleEnd();
results.setSuccessful(true);
- results.setSampleLabel(
- "Sleep Test: time = " + (getSleepTime() + ct));
+ }
+ catch (InterruptedException e)
+ {
+ getLogger().warn("SleepTest: interrupted.");
+ results.setSuccessful(true);
}
catch (Exception e)
{
getLogger().error("SleepTest: error during sample", e);
results.setSuccessful(false);
+ }
+ finally
+ {
+ results.sampleEnd();
}
if (getLogger().isDebugEnabled())
1.10.2.1 +10 -5 jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
Index: JavaTest.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- JavaTest.java 10 Feb 2004 00:46:44 -0000 1.10
+++ JavaTest.java 29 Apr 2004 14:44:12 -0000 1.10.2.1
@@ -298,15 +298,20 @@
long start = System.currentTimeMillis();
- // Generate a random value using the current time.
- long ct = start % getSleepMask();
+ // Generate a random offset value using the current time.
+ long sleep = getSleepTime() + (start % getSleepMask());
try
{
// Execute the sample. In this case sleep for the
// specified time.
- Thread.sleep(getSleepTime() + ct);
+ Thread.sleep(sleep);
results.setSuccessful(success);
+ }
+ catch (InterruptedException e)
+ {
+ getLogger().warn("JavaTest: interrupted.");
+ results.setSuccessful(true);
}
catch (Exception e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org