mstover1 2002/08/27 11:19:26
Modified: src/core/org/apache/jmeter/threads ListenerNotifier.java
src/protocol/http/org/apache/jmeter/protocol/http/sampler
HTTPSampler.java PostWriter.java
Log:
turning off keep-alive dynamically when run out of connections
Revision Changes Path
1.5 +9 -13
jakarta-jmeter/src/core/org/apache/jmeter/threads/ListenerNotifier.java
Index: ListenerNotifier.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/ListenerNotifier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ListenerNotifier.java 27 Aug 2002 15:03:36 -0000 1.4
+++ ListenerNotifier.java 27 Aug 2002 18:19:26 -0000 1.5
@@ -44,22 +44,17 @@
((SampleListener)
iter.next()).sampleOccurred(res);
}
}
- if(sleepTime > 0)
+ try
{
- try
- {
- Thread.sleep(sleepTime);
- }
- catch (InterruptedException e)
- {
- }
+ Thread.sleep(sleepTime);
}
- else
+ catch (InterruptedException e)
{
- if(size() > 200)
- {
-
Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
- }
+ }
+ if (size() > 200 && Thread.currentThread().getPriority() ==
Thread.NORM_PRIORITY)
+ {
+ log.debug("Notifier thread priority going from normal
to max, size = "+size());
+
Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
}
}
log.debug("Listener Notifier stopped");
@@ -84,6 +79,7 @@
catch (RuntimeException e)
{
sleepTime = 2000;
+ log.debug("Setting notifier thread priority to normal");
Thread.currentThread().setPriority(Thread.NORM_PRIORITY);
return null;
}
1.10 +5 -12
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Index: HTTPSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- HTTPSampler.java 27 Aug 2002 15:03:36 -0000 1.9
+++ HTTPSampler.java 27 Aug 2002 18:19:26 -0000 1.10
@@ -620,7 +620,7 @@
{
w.write(buffer, 0, x);
}
- //in.close();
+ in.close();
w.flush();
w.close();
return w.toByteArray();
@@ -930,16 +930,9 @@
}
catch (IOException ex)
{
- log.error("", ex);
+ log.warn(ex.getMessage(), ex);
res.setDataType(res.TEXT);
- try
- {
- res.setResponseData(readResponse(conn));
- }
- catch (IOException e)
- {
- res.setResponseData(ex.toString().getBytes());
- }
+ res.setResponseData(ex.toString().getBytes());
res.setResponseCode(NON_HTTP_RESPONSE_CODE);
res.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE);
res.setTime(System.currentTimeMillis() - time);
1.4 +1 -1
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java
Index: PostWriter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PostWriter.java 27 Aug 2002 15:03:36 -0000 1.3
+++ PostWriter.java 27 Aug 2002 18:19:26 -0000 1.4
@@ -109,7 +109,7 @@
writeln(out,"--" + BOUNDARY+"--");
out.flush();
- //out.close();
+ out.close();
}
// No filename specified, so send the post using normal syntax
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
