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 2003/12/19 15:38:47 UTC
cvs commit: jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler JDBCSampler.java
sebb 2003/12/19 06:38:47
Modified: src/protocol/java/org/apache/jmeter/protocol/java/test
SleepTest.java JavaTest.java
src/protocol/java/org/apache/jmeter/protocol/java/sampler
JavaSampler.java BeanShellSampler.java
BSFSampler.java
src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler
FTPSampler.java
src/protocol/http/org/apache/jmeter/protocol/http/sampler
WebServiceSampler.java
src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler
JDBCSampler.java
Log:
Use sampleStart() and sampleEnd() instead of setTime()
Revision Changes Path
1.9 +6 -6 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SleepTest.java 8 May 2003 21:03:38 -0000 1.8
+++ SleepTest.java 19 Dec 2003 14:38:47 -0000 1.9
@@ -164,19 +164,19 @@
try
{
// Record sample start time.
+ results.sampleStart();
+
+ // Generate a random value using the current time.
long start = System.currentTimeMillis();
-
- // Generate a random value using the current time.
long ct = start % getSleepMask();
// Execute the sample. In this case sleep for the
// specified time.
Thread.sleep(getSleepTime() + ct);
- // Record end time and populate the results.
- long end = System.currentTimeMillis();
+ // Populate the results.
- results.setTime(end - start);
+ results.sampleEnd();
results.setSuccessful(true);
results.setSampleLabel(
"Sleep Test: time = " + (getSleepTime() + ct));
1.8 +5 -4 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JavaTest.java 20 Oct 2003 23:59:22 -0000 1.7
+++ JavaTest.java 19 Dec 2003 14:38:47 -0000 1.8
@@ -334,6 +334,8 @@
}
// Record sample start time.
+ results.sampleStart();
+
long start = System.currentTimeMillis();
// Generate a random value using the current time.
@@ -352,8 +354,7 @@
results.setSuccessful(false);
} finally{
// Record end time and populate the results.
- long end = System.currentTimeMillis();
- results.setTime(end - start);
+ results.sampleEnd();
}
if (getLogger().isDebugEnabled())
1.19 +1 -2 jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
Index: JavaSampler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- JavaSampler.java 5 Oct 2003 00:22:36 -0000 1.18
+++ JavaSampler.java 19 Dec 2003 14:38:47 -0000 1.19
@@ -341,7 +341,6 @@
log.debug(whoAmI() + "\trunTest");
Thread.yield();
SampleResult results = new SampleResult();
- results.setTime(0);
results.setSuccessful(false);
results.setResponseData(
("Class not found: " + getClassname()).getBytes());
1.4 +3 -5 jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
Index: BeanShellSampler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BeanShellSampler.java 11 Nov 2003 14:24:01 -0000 1.3
+++ BeanShellSampler.java 19 Dec 2003 14:38:47 -0000 1.4
@@ -124,7 +124,7 @@
SampleResult res = new SampleResult();
boolean isSuccessful = false;
res.setSampleLabel(getLabel());
- long start = System.currentTimeMillis();
+ res.sampleStart();
try
{
String request=getScript();
@@ -198,9 +198,7 @@
res.setResponseMessage(ex.toString());
}
- // Calculate response time
- long end = System.currentTimeMillis();
- res.setTime(end - start);
+ res.sampleEnd();
// Set if we were successful or not
res.setSuccessful(isSuccessful);
1.2 +3 -5 jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
Index: BSFSampler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BSFSampler.java 17 Nov 2003 00:52:14 -0000 1.1
+++ BSFSampler.java 19 Dec 2003 14:38:47 -0000 1.2
@@ -90,7 +90,7 @@
SampleResult res = new SampleResult();
boolean isSuccessful = false;
res.setSampleLabel(getLabel());
- long start = System.currentTimeMillis();
+ res.sampleStart();
try
{
String request=getScript();
@@ -122,9 +122,7 @@
res.setResponseMessage(ex.toString());
}
- // Calculate response time
- long end = System.currentTimeMillis();
- res.setTime(end - start);
+ res.sampleEnd();
// Set if we were successful or not
res.setSuccessful(isSuccessful);
1.9 +3 -5 jakarta-jmeter/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java
Index: FTPSampler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/ftp/org/apache/jmeter/protocol/ftp/sampler/FTPSampler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FTPSampler.java 5 Oct 2003 00:19:03 -0000 1.8
+++ FTPSampler.java 19 Dec 2003 14:38:47 -0000 1.9
@@ -120,7 +120,7 @@
res.setSampleLabel(getLabel());
//LoginConfig loginConfig =
// (LoginConfig)e.getConfigElement(LoginConfig.class);
- long start = System.currentTimeMillis();
+ res.sampleStart();
try
{
FtpClient ftp = new FtpClient();
@@ -146,9 +146,7 @@
res.setResponseData(ex.toString().getBytes());
}
- // Calculate response time
- long end = System.currentTimeMillis();
- res.setTime(end - start);
+ res.sampleEnd();
// Set if we were successful or not
res.setSuccessful(isSuccessful);
1.5 +4 -4 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
Index: WebServiceSampler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebServiceSampler.java 22 Nov 2003 03:26:36 -0000 1.4
+++ WebServiceSampler.java 19 Dec 2003 14:38:47 -0000 1.5
@@ -405,7 +405,7 @@
// send the message
Message msg = new Message();
- long start = System.currentTimeMillis();
+ RESULT.sampleStart();
msg.send(this.getUrl(), this.getSoapAction(), msgEnv);
SOAPTransport st = msg.getSOAPTransport();
@@ -419,7 +419,7 @@
{
buf.append(line);
}
- RESULT.setTime(System.currentTimeMillis() - start);
+ RESULT.sampleEnd();
// set the response
RESULT.setResponseData(buf.toString().getBytes());
}
@@ -429,7 +429,7 @@
// for real, it improves the
// performance on slow clients
br.read();
- RESULT.setTime(System.currentTimeMillis() - start);
+ RESULT.sampleEnd();
RESULT.setResponseData(
JMeterUtils
.getResString("read_response_message")
1.24 +3 -4 jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
Index: JDBCSampler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JDBCSampler.java 5 Sep 2003 21:19:45 -0000 1.23
+++ JDBCSampler.java 19 Dec 2003 14:38:47 -0000 1.24
@@ -118,8 +118,7 @@
res.setSamplerData(this.toString());
- long startTime = System.currentTimeMillis();
-
+ res.sampleStart();
Connection conn = null;
Statement stmt = null;
@@ -193,7 +192,7 @@
}
}
- res.setTime(System.currentTimeMillis() - startTime);
+ res.sampleEnd();
return res;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org