[jboss-remoting-commits] JBoss Remoting SVN: r6385 - in remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293: src/main/org/jboss/remoting/transport/bisocket and 4 other directories.
jboss-remoting-commits at lists.jboss.org
jboss-remoting-commits at lists.jboss.org
Mon Jun 13 12:18:06 EDT 2011
Author: jbertram at redhat.com
Date: 2011-06-13 12:18:06 -0400 (Mon, 13 Jun 2011)
New Revision: 6385
Added:
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java
Removed:
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java
Modified:
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/bisocket/
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java
remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/bisocket/dos/
Log:
JBPAPP-6536
Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293
___________________________________________________________________
Modified: svn:mergeinfo
- /remoting2/branches/2.2:6177-6178,6226,6253,6261-6263,6266-6267,6271-6273,6281-6284,6291-6292,6297,6313-6320,6322-6324
/remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292:6370
+ /remoting2/branches/2.2:6177-6178,6226,6253,6261-6263,6266-6267,6271-6273,6281-6284,6291-6292,6297,6313-6320,6322-6324,6375-6376,6379
/remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292:6370
Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/bisocket
___________________________________________________________________
Modified: svn:mergeinfo
- /remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket:6272-6273
/remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/main/org/jboss/remoting/transport/bisocket:6370
+ /remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket:6272-6273,6375-6376,6379
/remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/main/org/jboss/remoting/transport/bisocket:6370
Modified: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java
===================================================================
--- remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2011-06-13 15:58:41 UTC (rev 6384)
+++ remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2011-06-13 16:18:06 UTC (rev 6385)
@@ -611,7 +611,7 @@
{
if(threadpool.size() > 0)
{
- worker = (ServerThread)threadpool.removeFirst();
+ worker = (ServerThread)threadpool.removeLast();
if(trace) { log.trace(this + (worker == null ? " found NO threads in threadpool" : " got " + worker + " from threadpool")); }
}
Property changes on: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/bisocket/dos
___________________________________________________________________
Modified: svn:mergeinfo
- /remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/dos:6271
/remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/tests/org/jboss/test/remoting/transport/bisocket/dos:6370
+ /remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/dos:6271,6375-6376,6379
/remoting2/branches/2.2.3-SP2_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292/src/tests/org/jboss/test/remoting/transport/bisocket/dos:6370
Deleted: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java 2011-06-01 03:37:46 UTC (rev 6376)
+++ remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java 2011-06-13 16:18:06 UTC (rev 6385)
@@ -1,213 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.test.remoting.transport.socket.idle;
-
-import java.lang.reflect.Field;
-import java.net.InetAddress;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.management.MBeanServer;
-
-import junit.framework.TestCase;
-
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-import org.jboss.logging.XLevel;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.InvocationRequest;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.ServerInvocationHandler;
-import org.jboss.remoting.ServerInvoker;
-import org.jboss.remoting.callback.InvokerCallbackHandler;
-import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.transport.PortUtil;
-import org.jboss.remoting.transport.socket.LRUPool;
-import org.jboss.remoting.transport.socket.SocketServerInvoker;
-
-
-/**
- * JBREM-1293.
- *
- * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright May 31, 2011
- */
-public class ThreadPoolStackTestCase extends TestCase
-{
- private static Logger log = Logger.getLogger(ThreadPoolStackTestCase.class);
-
- private static boolean firstTime = true;
-
- protected String host;
- protected int port;
- protected String locatorURI;
- protected InvokerLocator serverLocator;
- protected Connector connector;
- protected TestInvocationHandler invocationHandler;
-
-
- public void setUp() throws Exception
- {
- if (firstTime)
- {
- firstTime = false;
- Logger.getLogger("org.jboss.remoting").setLevel(XLevel.TRACE);
- Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
- String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
- PatternLayout layout = new PatternLayout(pattern);
- ConsoleAppender consoleAppender = new ConsoleAppender(layout);
- Logger.getRootLogger().addAppender(consoleAppender);
- }
- }
-
-
- public void tearDown()
- {
- }
-
-
- public void testThreadpoolAsStack() throws Throwable
- {
- log.info("entering " + getName());
-
- // Start server.
- setupServer();
-
- // Get threadpool and clientpool.
- Field field = SocketServerInvoker.class.getDeclaredField("threadpool");
- field.setAccessible(true);
- List threadpool = (List) field.get(connector.getServerInvoker());
- field = SocketServerInvoker.class.getDeclaredField("clientpool");
- field.setAccessible(true);
- LRUPool clientpool = (LRUPool) field.get(connector.getServerInvoker());
-
- // Create client.
- InvokerLocator clientLocator = new InvokerLocator(locatorURI);
- HashMap clientConfig = new HashMap();
- clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
- addExtraClientConfig(clientConfig);
- Client client = new Client(clientLocator, clientConfig);
- client.connect();
- log.info("client is connected");
-
- Thread.sleep(2000);
-
- // Create 5 connections.
- for (int i = 0; i < 5; i++)
- {
- client.invokeOneway("4", null, true);
- }
-
- Thread.sleep(2000); // time = 4000
- assertEquals(0, threadpool.size());
- assertEquals(5, clientpool.size());
-
- // ServerThreads should be back in threadpool at 6000.
- client.disconnect();
- Thread.sleep(4000); // time = 8000
- assertEquals(5, threadpool.size());
- assertEquals(0, clientpool.size());
-
- // Wait until IdleTimerTask runs at 10000.
- Thread.sleep(4000); // time = 12000
-
- for (int i = 0; i < 6; i++)
- {
- client = new Client(clientLocator, clientConfig);
- client.connect();
- log.info("i = " + i);
- client.invoke("1");
- client.disconnect();
- }
-
- // Time = 18000. IdleTimerTask will run at 20000, at which point
- // all but one ServerThread should be removed from threadpool.
- Thread.sleep(4000); // time = 22000
- assertEquals(1, threadpool.size());
-
- shutdownServer();
- log.info(getName() + " PASSES");
- }
-
-
- protected String getTransport()
- {
- return "socket";
- }
-
-
- protected void addExtraClientConfig(Map config) {}
- protected void addExtraServerConfig(Map config) {}
-
-
- protected void setupServer() throws Exception
- {
- host = InetAddress.getLocalHost().getHostAddress();
- port = PortUtil.findFreePort(host);
- locatorURI = getTransport() + "://" + host + ":" + port;
- String metadata = System.getProperty("remoting.metadata");
- if (metadata != null)
- {
- locatorURI += "/?" + metadata;
- }
- serverLocator = new InvokerLocator(locatorURI);
- log.info("Starting remoting server with locator uri of: " + locatorURI);
- HashMap config = new HashMap();
- config.put(InvokerLocator.FORCE_REMOTE, "true");
- config.put("idleTimeout", "10");
- addExtraServerConfig(config);
- connector = new Connector(serverLocator, config);
- connector.create();
- invocationHandler = new TestInvocationHandler();
- connector.addInvocationHandler("test", invocationHandler);
- connector.start();
- }
-
-
- protected void shutdownServer() throws Exception
- {
- if (connector != null)
- connector.stop();
- }
-
-
- static class TestInvocationHandler implements ServerInvocationHandler
- {
- public void addListener(InvokerCallbackHandler callbackHandler) {}
- public Object invoke(final InvocationRequest invocation) throws Throwable
- {
- Integer.valueOf((String) invocation.getParameter()).intValue();
- Thread.sleep(Integer.valueOf((String) invocation.getParameter()).intValue() * 1000);
- log.info("parameter: " + invocation.getParameter());
- return invocation.getParameter();
- }
- public void removeListener(InvokerCallbackHandler callbackHandler) {}
- public void setMBeanServer(MBeanServer server) {}
- public void setInvoker(ServerInvoker invoker) {}
- }
-}
\ No newline at end of file
Copied: remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java (from rev 6376, remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java)
===================================================================
--- remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java (rev 0)
+++ remoting2/branches/2.2.3-SP1_JBREM-1269_JBREM-1275_JBREM-1261_JBREM-1277_JBREM-1280_JBREM-1281_JBREM-1292_JBREM-1293/src/tests/org/jboss/test/remoting/transport/socket/idle/ThreadPoolStackTestCase.java 2011-06-13 16:18:06 UTC (rev 6385)
@@ -0,0 +1,214 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.remoting.transport.socket.idle;
+
+import java.lang.reflect.Field;
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.jboss.logging.XLevel;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+import org.jboss.remoting.transport.socket.LRUPool;
+import org.jboss.remoting.transport.socket.SocketServerInvoker;
+
+
+/**
+ * JBREM-1293.
+ *
+ * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright May 31, 2011
+ */
+public class ThreadPoolStackTestCase extends TestCase
+{
+ private static Logger log = Logger.getLogger(ThreadPoolStackTestCase.class);
+
+ private static boolean firstTime = true;
+
+ protected String host;
+ protected int port;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected Connector connector;
+ protected TestInvocationHandler invocationHandler;
+
+
+ public void setUp() throws Exception
+ {
+ if (firstTime)
+ {
+ firstTime = false;
+ Logger.getLogger("org.jboss.remoting").setLevel(XLevel.TRACE);
+ Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+ String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+ PatternLayout layout = new PatternLayout(pattern);
+ ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+ Logger.getRootLogger().addAppender(consoleAppender);
+ }
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testThreadpoolAsStack() throws Throwable
+ {
+ log.info("entering " + getName());
+
+ // Start server.
+ setupServer();
+
+ // Get threadpool and clientpool.
+ Field field = SocketServerInvoker.class.getDeclaredField("threadpool");
+ field.setAccessible(true);
+ List threadpool = (List) field.get(connector.getServerInvoker());
+ field = SocketServerInvoker.class.getDeclaredField("clientpool");
+ field.setAccessible(true);
+ LRUPool clientpool = (LRUPool) field.get(connector.getServerInvoker());
+
+ // Create client.
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ Thread.sleep(2000);
+
+ // Create 5 connections.
+ for (int i = 0; i < 5; i++)
+ {
+ client.invokeOneway("4", null, true);
+ }
+
+ Thread.sleep(2000); // time = 4000
+ assertEquals(0, threadpool.size());
+ assertEquals(5, clientpool.size());
+
+ // ServerThreads should be back in threadpool at 6000.
+ client.disconnect();
+ Thread.sleep(4000); // time = 8000
+ assertEquals(5, threadpool.size());
+ assertEquals(0, clientpool.size());
+
+ // Wait until IdleTimerTask runs at 10000.
+ Thread.sleep(4000); // time = 12000
+
+ for (int i = 0; i < 5; i++)
+ {
+ client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("i = " + i);
+ client.invoke("1");
+ client.disconnect();
+ Thread.sleep(500);
+ }
+
+ // Time = 17500. IdleTimerTask will run at 20000, at which point
+ // all but one ServerThread should be removed from threadpool.
+ Thread.sleep(5000); // time = 22500
+ assertEquals(1, threadpool.size());
+
+ shutdownServer();
+ log.info(getName() + " PASSES");
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ protected void addExtraClientConfig(Map config) {}
+ protected void addExtraServerConfig(Map config) {}
+
+
+ protected void setupServer() throws Exception
+ {
+ host = InetAddress.getLocalHost().getHostAddress();
+ port = PortUtil.findFreePort(host);
+ locatorURI = getTransport() + "://" + host + ":" + port;
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "/?" + metadata;
+ }
+ serverLocator = new InvokerLocator(locatorURI);
+ log.info("Starting remoting server with locator uri of: " + locatorURI);
+ HashMap config = new HashMap();
+ config.put(InvokerLocator.FORCE_REMOTE, "true");
+ config.put("idleTimeout", "10");
+ addExtraServerConfig(config);
+ connector = new Connector(serverLocator, config);
+ connector.create();
+ invocationHandler = new TestInvocationHandler();
+ connector.addInvocationHandler("test", invocationHandler);
+ connector.start();
+ }
+
+
+ protected void shutdownServer() throws Exception
+ {
+ if (connector != null)
+ connector.stop();
+ }
+
+
+ static class TestInvocationHandler implements ServerInvocationHandler
+ {
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public Object invoke(final InvocationRequest invocation) throws Throwable
+ {
+ Integer.valueOf((String) invocation.getParameter()).intValue();
+ Thread.sleep(Integer.valueOf((String) invocation.getParameter()).intValue() * 1000);
+ log.info("parameter: " + invocation.getParameter());
+ return invocation.getParameter();
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+ }
+}
\ No newline at end of file
More information about the jboss-remoting-commits
mailing list