[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket ...
Tom Elrod
tom.elrod at jboss.com
Fri Aug 18 13:59:03 EDT 2006
User: telrod
Date: 06/08/18 13:59:03
Modified: src/tests/org/jboss/test/remoting/performance/raw/socket
MultiThreadedSocketPerformanceClient.java
SocketCallbackServer.java SocketHandler.java
SocketPerformanceClient.java
SocketPerformanceServer.java
SocketPerformanceTestCase.java SocketServer.java
Log:
JBREM-562 - updated performance tests so can specify the bind host (previously hardcoded to localhost).
Revision Changes Path
1.4 +11 -12 JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MultiThreadedSocketPerformanceClient.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket/MultiThreadedSocketPerformanceClient.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MultiThreadedSocketPerformanceClient.java 30 Dec 2005 05:26:44 -0000 1.3
+++ MultiThreadedSocketPerformanceClient.java 18 Aug 2006 17:59:03 -0000 1.4
@@ -22,6 +22,14 @@
package org.jboss.test.remoting.performance.raw.socket;
+import EDU.oswego.cs.dl.util.concurrent.Latch;
+import junit.framework.Test;
+import org.jboss.jrunit.decorators.ThreadLocalDecorator;
+import org.jboss.logging.Logger;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.test.remoting.performance.synchronous.MultiThreadedPerformanceClientTest;
+import org.jboss.test.remoting.performance.synchronous.PerformanceCallbackKeeper;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.IOException;
@@ -30,21 +38,12 @@
import java.net.Socket;
import java.rmi.server.UID;
import java.util.Map;
-import org.jboss.jrunit.decorators.ThreadLocalDecorator;
-import org.jboss.logging.Logger;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.test.remoting.performance.synchronous.MultiThreadedPerformanceClientTest;
-import org.jboss.test.remoting.performance.synchronous.PerformanceCallbackKeeper;
-
-import EDU.oswego.cs.dl.util.concurrent.Latch;
-import junit.framework.Test;
/**
* @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
*/
public class MultiThreadedSocketPerformanceClient extends MultiThreadedPerformanceClientTest
{
- private String address = "localhost";
private int port = 7600;
private Socket socket = null;
private ObjectOutputStream oos;
@@ -87,7 +86,7 @@
protected PerformanceCallbackKeeper addCallbackListener(String sessionId, Latch serverDoneLock)
throws Throwable
{
- SocketCallbackServer callbackServer = new SocketCallbackServer(clientSessionId, serverDoneLock);
+ SocketCallbackServer callbackServer = new SocketCallbackServer(host, clientSessionId, serverDoneLock);
callbackServer.start();
makeInvocation("callbackserver", new Integer(callbackServer.getBindPort()));
return callbackServer;
@@ -119,7 +118,7 @@
{
Object obj = null;
- synchronized(address)
+ synchronized(host)
{
// Socket socket = new Socket(address, port);
// socket.setSoTimeout(timeout);
@@ -157,7 +156,7 @@
{
try
{
- socket = new Socket(address, port);
+ socket = new Socket(host, port);
socket.setSoTimeout(timeout);
BufferedOutputStream out = new BufferedOutputStream(socket.getOutputStream());
BufferedInputStream in = new BufferedInputStream(socket.getInputStream());
1.3 +8 -7 JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SocketCallbackServer.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketCallbackServer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SocketCallbackServer.java 30 Dec 2005 05:26:44 -0000 1.2
+++ SocketCallbackServer.java 18 Aug 2006 17:59:03 -0000 1.3
@@ -22,6 +22,12 @@
package org.jboss.test.remoting.performance.raw.socket;
+import EDU.oswego.cs.dl.util.concurrent.Latch;
+import org.jboss.remoting.callback.Callback;
+import org.jboss.remoting.callback.HandleCallbackException;
+import org.jboss.test.remoting.TestUtil;
+import org.jboss.test.remoting.performance.synchronous.PerformanceCallbackKeeper;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.IOException;
@@ -30,12 +36,6 @@
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
-import org.jboss.remoting.callback.Callback;
-import org.jboss.remoting.callback.HandleCallbackException;
-import org.jboss.test.remoting.TestUtil;
-import org.jboss.test.remoting.performance.synchronous.PerformanceCallbackKeeper;
-
-import EDU.oswego.cs.dl.util.concurrent.Latch;
/**
* @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
@@ -53,8 +53,9 @@
private int numberOfCallsProcessed = 0;
private int numberofDuplicates = 0;
- public SocketCallbackServer(String sessionId, Latch lock)
+ public SocketCallbackServer(String host, String sessionId, Latch lock)
{
+ this.serverBindAddress = host;
this.sessionId = sessionId;
this.lock = lock;
}
1.3 +6 -4 JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketHandler.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SocketHandler.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SocketHandler.java 30 Dec 2005 05:26:44 -0000 1.2
+++ SocketHandler.java 18 Aug 2006 17:59:03 -0000 1.3
@@ -22,15 +22,16 @@
package org.jboss.test.remoting.performance.raw.socket;
+import org.jboss.remoting.callback.Callback;
+import org.jboss.remoting.callback.HandleCallbackException;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.net.Socket;
-import org.jboss.remoting.callback.Callback;
-import org.jboss.remoting.callback.HandleCallbackException;
-import org.jboss.remoting.callback.InvokerCallbackHandler;
/**
* @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
@@ -42,8 +43,9 @@
private String sessionId;
- public SocketHandler(String sessionId, int callbackServerPort)
+ public SocketHandler(String host, String sessionId, int callbackServerPort)
{
+ this.serverBindAddress = host;
this.sessionId = sessionId;
this.serverBindPort = callbackServerPort;
}
1.4 +10 -11 JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SocketPerformanceClient.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/performance/raw/socket/SocketPerformanceClient.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SocketPerformanceClient.java 30 Dec 2005 05:26:44 -0000 1.3
+++ SocketPerformanceClient.java 18 Aug 2006 17:59:03 -0000 1.4
@@ -22,6 +22,14 @@
package org.jboss.test.remoting.performance.raw.socket;
+import EDU.oswego.cs.dl.util.concurrent.Latch;
+import junit.framework.Test;
+import org.jboss.jrunit.decorators.ThreadLocalDecorator;
+import org.jboss.logging.Logger;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.test.remoting.performance.synchronous.PerformanceCallbackKeeper;
+import org.jboss.test.remoting.performance.synchronous.PerformanceClientTest;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.IOException;
@@ -30,14 +38,6 @@
import java.net.Socket;
import java.rmi.server.UID;
import java.util.Map;
-import org.jboss.jrunit.decorators.ThreadLocalDecorator;
-import org.jboss.logging.Logger;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.test.remoting.performance.synchronous.PerformanceCallbackKeeper;
-import org.jboss.test.remoting.performance.synchronous.PerformanceClientTest;
-
-import EDU.oswego.cs.dl.util.concurrent.Latch;
-import junit.framework.Test;
/**
* @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
@@ -45,7 +45,6 @@
public class SocketPerformanceClient extends PerformanceClientTest
{
- private String address = "localhost";
private int port = 7600;
private Socket socket = null;
private ObjectOutputStream oos;
@@ -81,7 +80,7 @@
protected PerformanceCallbackKeeper addCallbackListener(String sessionId, Latch serverDoneLock)
throws Throwable
{
- SocketCallbackServer callbackServer = new SocketCallbackServer(clientSessionId, serverDoneLock);
+ SocketCallbackServer callbackServer = new SocketCallbackServer(host, clientSessionId, serverDoneLock);
callbackServer.start();
makeInvocation("callbackserver", new Integer(callbackServer.getBindPort()));
return callbackServer;
@@ -147,7 +146,7 @@
{
try
{
- socket = new Socket(address, port);
+ socket = new Socket(host, port);
socket.setSoTimeout(timeout);
BufferedOutputStream out = new BufferedOutputStream(socket.getOutputStream());
BufferedInputStream in = new BufferedInputStream(socket.getInputStream());
1.3 +3 -2 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SocketPerformanceServer.java 30 Dec 2005 05:26:44 -0000 1.2
+++ SocketPerformanceServer.java 18 Aug 2006 17:59:03 -0000 1.3
@@ -22,9 +22,10 @@
package org.jboss.test.remoting.performance.raw.socket;
-import java.util.Map;
import org.jboss.test.remoting.performance.synchronous.PerformanceServerTest;
+import java.util.Map;
+
/**
* @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
*/
@@ -34,7 +35,7 @@
public void init(Map metatdata) throws Exception
{
- server = new SocketServer();
+ server = new SocketServer(host);
server.setUp();
}
1.3 +8 -1 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SocketPerformanceTestCase.java 30 Dec 2005 05:26:44 -0000 1.2
+++ SocketPerformanceTestCase.java 18 Aug 2006 17:59:03 -0000 1.3
@@ -22,10 +22,11 @@
package org.jboss.test.remoting.performance.raw.socket;
-import java.io.IOException;
import org.apache.log4j.Level;
import org.jboss.jrunit.harness.BenchmarkTestDriver;
+import java.io.IOException;
+
/**
* @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
*/
@@ -43,6 +44,7 @@
public static final String RESULT_TIMEOUT = "jrunit.result_timeout";
public static final String TEAR_DOWN_TIMEOUT = "jrunit.tear_down_timeout";
public static final String RUN_TEST_TIMEOUT = "jrunit.run_test_timeout";
+ public static final String REMOTING_HOST = "remoting.host";
public void declareTestClasses()
{
@@ -147,6 +149,11 @@
{
vmArgs = "-D" + REMOTING_TRANSPORT + "=" + transport;
}
+ String host = System.getProperty(REMOTING_HOST);
+ if(host != null && host.length() > 0)
+ {
+ vmArgs = "-D" + REMOTING_HOST + "=" + host;
+ }
String serialization = System.getProperty(REMOTING_SERIALIZATION);
if(serialization != null && serialization.length() > 0)
{
1.6 +14 -8 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- SocketServer.java 30 Dec 2005 05:26:44 -0000 1.5
+++ SocketServer.java 18 Aug 2006 17:59:03 -0000 1.6
@@ -22,6 +22,12 @@
package org.jboss.test.remoting.performance.raw.socket;
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import org.jboss.logging.Logger;
+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 java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.IOException;
@@ -31,12 +37,6 @@
import java.net.ServerSocket;
import java.net.Socket;
import java.util.Map;
-import org.jboss.logging.Logger;
-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 EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
/**
* @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
@@ -62,6 +62,11 @@
private static final Logger log = Logger.getLogger(SocketServer.class);
+ public SocketServer(String host)
+ {
+ serverBindAddress = host;
+ }
+
protected void setUp() throws Exception
{
System.out.println("SimpleServerTest::setUp() called.");
@@ -167,7 +172,7 @@
}
else
{
- SocketHandler callbackHandler = new SocketHandler(sessionId, callbackServerPort);
+ SocketHandler callbackHandler = new SocketHandler(serverBindAddress, sessionId, callbackServerPort);
tracker = new CallTracker(sessionId, callbackHandler);
callTrackers.put(sessionId, tracker);
tracker.createTotalCount(totalCount);
@@ -247,7 +252,8 @@
public static void main(String[] args)
{
- SocketServer server = new SocketServer();
+ String serverBindAddress = "localhost";
+ SocketServer server = new SocketServer(serverBindAddress);
try
{
server.setUp();
More information about the jboss-cvs-commits
mailing list