[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket ...
Ron Sigal
ron_sigal at yahoo.com
Thu Aug 24 17:03:15 EDT 2006
User: rsigal
Date: 06/08/24 17:03:15
Modified: src/tests/org/jboss/test/remoting/performance/raw/socket
SocketServer.java SocketPerformanceTestCase.java
SocketPerformanceServer.java
Log:
JBREM-589: Added a numOfClients parameter which determines the number of server threads to run.
Revision Changes Path
1.7 +49 -32 JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SocketServer.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketServer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- SocketServer.java 18 Aug 2006 17:59:03 -0000 1.6
+++ SocketServer.java 24 Aug 2006 21:03:14 -0000 1.7
@@ -27,9 +27,11 @@
import org.jboss.test.remoting.performance.synchronous.CallTracker;
import org.jboss.test.remoting.performance.synchronous.Payload;
import org.jboss.test.remoting.performance.synchronous.PerformanceClientTest;
+import org.jboss.test.remoting.performance.synchronous.PerformanceTestCase;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
+import java.io.EOFException;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -50,7 +52,7 @@
private String serverBindAddress = "localhost";
private int timeout = 20000;
- private int serverReadThreads = 1;
+ private int serverReadThreads;
private int callbackServerPort = -1;
@@ -62,9 +64,10 @@
private static final Logger log = Logger.getLogger(SocketServer.class);
- public SocketServer(String host)
+ public SocketServer(String host, int numOfClients)
{
serverBindAddress = host;
+ serverReadThreads = numOfClients;
}
protected void setUp() throws Exception
@@ -98,8 +101,6 @@
private void startServer()
{
- while(continueToRun)
- {
try
{
Socket socket = serverSocket.accept();
@@ -114,9 +115,9 @@
processRequest(objInputStream, oos);
-// objInputStream.close();
-// oos.close();
-// socket.close();
+ // objInputStream.close();
+ // oos.close();
+ // socket.close();
while(continueToRun)
{
@@ -124,14 +125,16 @@
processRequest(objInputStream, oos);
}
}
+ catch (EOFException e)
+ {
+ log.debug(e);
+ }
catch(Exception e)
{
- System.out.println("Done processing on client socket.");
e.printStackTrace();
-// org.apache.log4j.Category.getRoot().debug("Done processing on client socket.");
- }
-
+ // org.apache.log4j.Category.getRoot().debug("Done processing on client socket.");
}
+ System.out.println("Done processing on client socket.");
}
@@ -252,8 +255,22 @@
public static void main(String[] args)
{
+ int numOfClients = 1;
+ String numOfClientsString = System.getProperty(PerformanceTestCase.NUMBER_OF_CLIENTS);
+ if(numOfClientsString != null && numOfClientsString.length() > 0)
+ {
+ try
+ {
+ numOfClients = Integer.parseInt(numOfClientsString);
+ }
+ catch(NumberFormatException e)
+ {
+ e.printStackTrace();
+ }
+ }
+
String serverBindAddress = "localhost";
- SocketServer server = new SocketServer(serverBindAddress);
+ SocketServer server = new SocketServer(serverBindAddress, numOfClients);
try
{
server.setUp();
1.4 +13 -0 JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SocketPerformanceTestCase.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SocketPerformanceTestCase.java 18 Aug 2006 17:59:03 -0000 1.3
+++ SocketPerformanceTestCase.java 24 Aug 2006 21:03:14 -0000 1.4
@@ -179,6 +179,19 @@
{
vmArgs = vmArgs + " -Xmx" + jvmMx + "m";
}
+ String numOfClients = System.getProperty(NUMBER_OF_CLIENTS);
+ if(numOfClients != null && numOfClients.length() > 0)
+ {
+ try
+ {
+ numberOfClients = Integer.parseInt(numOfClients);
+ vmArgs = vmArgs + " -D" + NUMBER_OF_CLIENTS + "=" + numberOfClients;
+ }
+ catch(NumberFormatException e)
+ {
+ e.printStackTrace();
+ }
+ }
return vmArgs;
}
1.4 +20 -1 JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceServer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SocketPerformanceServer.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceServer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SocketPerformanceServer.java 18 Aug 2006 17:59:03 -0000 1.3
+++ SocketPerformanceServer.java 24 Aug 2006 21:03:14 -0000 1.4
@@ -23,6 +23,7 @@
package org.jboss.test.remoting.performance.raw.socket;
import org.jboss.test.remoting.performance.synchronous.PerformanceServerTest;
+import org.jboss.test.remoting.performance.synchronous.PerformanceTestCase;
import java.util.Map;
@@ -32,13 +33,31 @@
public class SocketPerformanceServer extends PerformanceServerTest
{
private SocketServer server = null;
+ private int numOfClients;
public void init(Map metatdata) throws Exception
{
- server = new SocketServer(host);
+ server = new SocketServer(host, numOfClients);
server.setUp();
}
+ public void setUp() throws Exception
+ {
+ String numOfClientsString = System.getProperty(PerformanceTestCase.NUMBER_OF_CLIENTS);
+ if(numOfClientsString != null && numOfClientsString.length() > 0)
+ {
+ try
+ {
+ numOfClients = Integer.parseInt(numOfClientsString);
+ }
+ catch(NumberFormatException e)
+ {
+ e.printStackTrace();
+ }
+ }
+ super.setUp();
+ }
+
public void tearDown() throws Exception
{
super.tearDown();
More information about the jboss-cvs-commits
mailing list