March 2011 - jboss-remoting-commits

JBoss Remoting SVN: r6294 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-03-22 15:10:47 -0400 (Tue, 22 Mar 2011) New Revision: 6294 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java Log: JBREM-1276: Added catch for Error. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2011-03-21 17:05:20 UTC (rev 6293) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2011-03-22 19:10:47 UTC (rev 6294) @@ -957,8 +957,14 @@ log.error("Failed to accept socket connection", e); else return; - } + catch (Error e) + { + if (running) + log.error("error", e); + else + return; + } } }

13 years, 8 months

1
0
0 / 0

JBoss Remoting SVN: r6293 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-03-21 13:05:20 -0400 (Mon, 21 Mar 2011) New Revision: 6293 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java Log: JBREM-1277: Updated logging for worker thread creation to display priority. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2011-03-21 17:02:01 UTC (rev 6292) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2011-03-21 17:05:20 UTC (rev 6293) @@ -806,7 +806,7 @@ worker = new ServerThread(socket, this, clientpool, threadpool, getTimeout(), writeTimeout, serverSocketClass); worker.setPriority(Thread.NORM_PRIORITY); - if(trace) { log.trace(this + " created " + worker); } + if(trace) { log.trace(this + " created " + worker + " with priority " + worker.getPriority()); } newThread = true; }

13 years, 8 months

1
0
0 / 0

JBoss Remoting SVN: r6292 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/accept.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-03-21 13:02:01 -0400 (Mon, 21 Mar 2011) New Revision: 6292 Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/accept/AcceptThreadPriorityTestCase.java Log: JBREM-1277: Test worker threads priority. Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/accept/AcceptThreadPriorityTestCase.java =================================================================== --- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/accept/AcceptThreadPriorityTestCase.java 2011-03-21 17:01:31 UTC (rev 6291) +++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/socket/accept/AcceptThreadPriorityTestCase.java 2011-03-21 17:02:01 UTC (rev 6292) @@ -25,7 +25,10 @@ import java.lang.reflect.Field; import java.net.InetAddress; import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import java.util.Map; +import java.util.Set; import javax.management.MBeanServer; @@ -44,6 +47,7 @@ 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; @@ -126,6 +130,29 @@ } + // Test worker threads priority. + field = SocketServerInvoker.class.getDeclaredField("clientpool"); + field.setAccessible(true); + LRUPool clientpool = (LRUPool) field.get((SocketServerInvoker) connector.getServerInvoker()); + Iterator it = clientpool.getContents().iterator(); + while (it.hasNext()) + { + Thread t = (Thread) it.next(); + log.info(t + " priority: " + t.getPriority()); + assertEquals(Thread.NORM_PRIORITY, t.getPriority()); + } + + field = SocketServerInvoker.class.getDeclaredField("threadpool"); + field.setAccessible(true); + List threadpool = (List) field.get((SocketServerInvoker) connector.getServerInvoker()); + it = threadpool.iterator(); + while (it.hasNext()) + { + Thread t = (Thread) it.next(); + log.info(t + " priority: " + t.getPriority()); + assertEquals(Thread.NORM_PRIORITY, t.getPriority()); + } + client.disconnect(); shutdownServer(); log.info(getName() + " PASSES"); @@ -167,6 +194,29 @@ } + // Test worker threads priority. + field = SocketServerInvoker.class.getDeclaredField("clientpool"); + field.setAccessible(true); + LRUPool clientpool = (LRUPool) field.get((SocketServerInvoker) connector.getServerInvoker()); + Iterator it = clientpool.getContents().iterator(); + while (it.hasNext()) + { + Thread t = (Thread) it.next(); + log.info(t + " priority: " + t.getPriority()); + assertEquals(Thread.NORM_PRIORITY, t.getPriority()); + } + + field = SocketServerInvoker.class.getDeclaredField("threadpool"); + field.setAccessible(true); + List threadpool = (List) field.get((SocketServerInvoker) connector.getServerInvoker()); + it = threadpool.iterator(); + while (it.hasNext()) + { + Thread t = (Thread) it.next(); + log.info(t + " priority: " + t.getPriority()); + assertEquals(Thread.NORM_PRIORITY, t.getPriority()); + } + client.disconnect(); shutdownServer(); log.info(getName() + " PASSES");

13 years, 8 months

1
0
0 / 0

JBoss Remoting SVN: r6291 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-03-21 13:01:31 -0400 (Mon, 21 Mar 2011) New Revision: 6291 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java Log: JBREM-1277: Set worker threads priority to normal. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2011-03-21 16:58:20 UTC (rev 6290) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2011-03-21 17:01:31 UTC (rev 6291) @@ -628,8 +628,9 @@ worker = new ServerThread(socket, this, clientpool, threadpool, getTimeout(), writeTimeout, serverSocketClass); + worker.setPriority(Thread.NORM_PRIORITY); - if(trace) { log.trace(this + " created " + worker); } + if(trace) { log.trace(this + " created " + worker + " with priority " + worker.getPriority()); } newThread = true; }

13 years, 8 months

1
0
0 / 0

JBoss Remoting SVN: r6290 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/accept.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-03-21 12:58:20 -0400 (Mon, 21 Mar 2011) New Revision: 6290 Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/accept/AcceptThreadPriorityTestCase.java Log: JBREM-1277: Test worker threads priority. Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/accept/AcceptThreadPriorityTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/accept/AcceptThreadPriorityTestCase.java 2011-03-21 16:57:12 UTC (rev 6289) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/accept/AcceptThreadPriorityTestCase.java 2011-03-21 16:58:20 UTC (rev 6290) @@ -25,7 +25,10 @@ import java.lang.reflect.Field; import java.net.InetAddress; import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import java.util.Map; +import java.util.Set; import javax.management.MBeanServer; @@ -44,6 +47,7 @@ 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; @@ -126,6 +130,29 @@ } + // Test worker threads priority. + field = SocketServerInvoker.class.getDeclaredField("clientpool"); + field.setAccessible(true); + LRUPool clientpool = (LRUPool) field.get((SocketServerInvoker) connector.getServerInvoker()); + Iterator it = clientpool.getContents().iterator(); + while (it.hasNext()) + { + Thread t = (Thread) it.next(); + log.info(t + " priority: " + t.getPriority()); + assertEquals(Thread.NORM_PRIORITY, t.getPriority()); + } + + field = SocketServerInvoker.class.getDeclaredField("threadpool"); + field.setAccessible(true); + List threadpool = (List) field.get((SocketServerInvoker) connector.getServerInvoker()); + it = threadpool.iterator(); + while (it.hasNext()) + { + Thread t = (Thread) it.next(); + log.info(t + " priority: " + t.getPriority()); + assertEquals(Thread.NORM_PRIORITY, t.getPriority()); + } + client.disconnect(); shutdownServer(); log.info(getName() + " PASSES"); @@ -167,6 +194,29 @@ } + // Test worker threads priority. + field = SocketServerInvoker.class.getDeclaredField("clientpool"); + field.setAccessible(true); + LRUPool clientpool = (LRUPool) field.get((SocketServerInvoker) connector.getServerInvoker()); + Iterator it = clientpool.getContents().iterator(); + while (it.hasNext()) + { + Thread t = (Thread) it.next(); + log.info(t + " priority: " + t.getPriority()); + assertEquals(Thread.NORM_PRIORITY, t.getPriority()); + } + + field = SocketServerInvoker.class.getDeclaredField("threadpool"); + field.setAccessible(true); + List threadpool = (List) field.get((SocketServerInvoker) connector.getServerInvoker()); + it = threadpool.iterator(); + while (it.hasNext()) + { + Thread t = (Thread) it.next(); + log.info(t + " priority: " + t.getPriority()); + assertEquals(Thread.NORM_PRIORITY, t.getPriority()); + } + client.disconnect(); shutdownServer(); log.info(getName() + " PASSES");

13 years, 8 months

1
0
0 / 0

JBoss Remoting SVN: r6289 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-03-21 12:57:12 -0400 (Mon, 21 Mar 2011) New Revision: 6289 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java Log: JBREM-1277: Set worker threads priority to normal. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2011-03-19 21:15:11 UTC (rev 6288) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2011-03-21 16:57:12 UTC (rev 6289) @@ -805,6 +805,7 @@ if(trace) { log.trace(this + " creating new worker thread"); } worker = new ServerThread(socket, this, clientpool, threadpool, getTimeout(), writeTimeout, serverSocketClass); + worker.setPriority(Thread.NORM_PRIORITY); if(trace) { log.trace(this + " created " + worker); } newThread = true; }

13 years, 8 months

1
0
0 / 0

JBoss Remoting SVN: r6288 - in remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket: accept and 1 other directory.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-03-19 17:15:11 -0400 (Sat, 19 Mar 2011) New Revision: 6288 Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/accept/ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/accept/SecondaryAcceptThreadPriorityTestCase.java Log: JBREM-1277: New unit tests. Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/accept/SecondaryAcceptThreadPriorityTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/accept/SecondaryAcceptThreadPriorityTestCase.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/accept/SecondaryAcceptThreadPriorityTestCase.java 2011-03-19 21:15:11 UTC (rev 6288) @@ -0,0 +1,227 @@ +/* + * 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.bisocket.accept; + +import java.lang.reflect.Field; +import java.net.InetAddress; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +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.bisocket.BisocketServerInvoker; +import org.jboss.remoting.transport.socket.SocketServerInvoker; + + +/** + * Unit tests for JBREM-1277 + * + * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> + * @version $Revision: 1.1 $ + * <p> + * Copyright Mar 19, 2011 + */ +public class SecondaryAcceptThreadPriorityTestCase extends TestCase +{ + protected static String NUM_ACCEPT_THREADS = "3"; + protected static String PRIORITY_INCREMENT = "4"; + + private static Logger log = Logger.getLogger(SecondaryAcceptThreadPriorityTestCase.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 testAcceptThreadPriority() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(PRIORITY_INCREMENT); + + // 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"); + + // Test connections. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good"); + + // Test accept threads priority. + int defaultPriority = Thread.NORM_PRIORITY; + int expectedPriority = defaultPriority + Integer.valueOf(PRIORITY_INCREMENT).intValue(); + Field field = BisocketServerInvoker.class.getDeclaredField("secondaryServerSocketThreads"); + field.setAccessible(true); + Set secondaryServerSocketThreads = (Set) field.get((BisocketServerInvoker) connector.getServerInvoker()); + Iterator it = secondaryServerSocketThreads.iterator(); + while (it.hasNext()) + { + assertEquals(expectedPriority, ((Thread)it.next()).getPriority()); + } + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + public void testAcceptThreadPriorityInvalidValue() throws Throwable + { + log.info("entering " + getName()); + + // Discover invalid thread priority value. + int invalidPriority = Thread.MAX_PRIORITY + 1; + + // Start server. + setupServer(Integer.toString(invalidPriority)); + + // 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"); + + // Test connections. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good"); + + // Test accept threads priority. + int defaultPriority = Thread.NORM_PRIORITY; + Field field = BisocketServerInvoker.class.getDeclaredField("secondaryServerSocketThreads"); + field.setAccessible(true); + Set secondaryServerSocketThreads = (Set) field.get((BisocketServerInvoker) connector.getServerInvoker()); + Iterator it = secondaryServerSocketThreads.iterator(); + while (it.hasNext()) + { + assertEquals(defaultPriority, ((Thread)it.next()).getPriority()); + } + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + protected String getTransport() + { + return "bisocket"; + } + + + protected void addExtraClientConfig(Map config) {} + protected void addExtraServerConfig(Map config) {} + + + protected void setupServer(String increment) throws Exception + { + host = InetAddress.getLocalHost().getHostAddress(); + port = PortUtil.findFreePort(host); + locatorURI = getTransport() + "://" + host + ":" + port; + locatorURI += "/?numAcceptThreads=" + NUM_ACCEPT_THREADS; + locatorURI += "&acceptThreadPriorityIncrement=" + increment; + 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"); + 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 + { + return invocation.getParameter(); + } + public void removeListener(InvokerCallbackHandler callbackHandler) {} + public void setMBeanServer(MBeanServer server) {} + public void setInvoker(ServerInvoker invoker) {} + } +} \ No newline at end of file Property changes on: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/bisocket/accept/SecondaryAcceptThreadPriorityTestCase.java ___________________________________________________________________ Added: svn:executable + *

13 years, 8 months

1
0
0 / 0

JBoss Remoting SVN: r6287 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-03-19 17:14:48 -0400 (Sat, 19 Mar 2011) New Revision: 6287 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java Log: JBREM-1277: Add secondary accept thread priority configuration option. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2011-03-19 21:04:36 UTC (rev 6286) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2011-03-19 21:14:48 UTC (rev 6287) @@ -270,9 +270,10 @@ Thread t = new SecondaryServerSocketThread(secondaryServerSocket); t.setName("secondaryServerSocketThread[" + i++ + "]"); t.setDaemon(true); + t.setPriority(Thread.NORM_PRIORITY + acceptThreadPriorityIncrement); t.start(); secondaryServerSocketThreads.add(t); - log.debug(this + " created " + t); + log.debug(this + " created " + t + " with priority " + t.getPriority()); } if (getLocator().isMultihome())

13 years, 8 months

1
0
0 / 0

JBoss Remoting SVN: r6286 - in remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket: accept and 1 other directory.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-03-19 17:04:36 -0400 (Sat, 19 Mar 2011) New Revision: 6286 Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/accept/ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/accept/AcceptThreadPriorityTestCase.java Log: JBREM-1277: New unit tests. Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/accept/AcceptThreadPriorityTestCase.java =================================================================== --- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/accept/AcceptThreadPriorityTestCase.java (rev 0) +++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/accept/AcceptThreadPriorityTestCase.java 2011-03-19 21:04:36 UTC (rev 6286) @@ -0,0 +1,228 @@ +/* + * 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.accept; + +import java.lang.reflect.Field; +import java.net.InetAddress; +import java.util.HashMap; +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.SocketServerInvoker; + + +/** + * Unit tests for JBREM-1277 + * + * @author <a href="ron.sigal(a)jboss.com">Ron Sigal</a> + * @version $Revision: 1.1 $ + * <p> + * Copyright Mar 19, 2011 + */ +public class AcceptThreadPriorityTestCase extends TestCase +{ + protected static String NUM_ACCEPT_THREADS = "3"; + protected static String PRIORITY_INCREMENT = "4"; + + private static Logger log = Logger.getLogger(AcceptThreadPriorityTestCase.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 testAcceptThreadPriority() throws Throwable + { + log.info("entering " + getName()); + + // Start server. + setupServer(PRIORITY_INCREMENT); + + // 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"); + + // Test connections. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good"); + + // Test accept threads priority. + int defaultPriority = Thread.NORM_PRIORITY; + int expectedPriority = defaultPriority + Integer.valueOf(PRIORITY_INCREMENT).intValue(); + Field field = SocketServerInvoker.class.getDeclaredField("acceptThreads"); + field.setAccessible(true); + Thread[] acceptThreads = (Thread[]) field.get((SocketServerInvoker) connector.getServerInvoker()); + assertEquals(Integer.valueOf(NUM_ACCEPT_THREADS).intValue(), acceptThreads.length); + for (int i = 0; i < acceptThreads.length; i++) + { + log.info("acceptThreads[" + i + "].getPriority(): " + acceptThreads[i].getPriority()); + assertEquals(expectedPriority, acceptThreads[i].getPriority()); + + } + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + public void testAcceptThreadPriorityInvalidValue() throws Throwable + { + log.info("entering " + getName()); + + // Discover invalid thread priority value. + int invalidPriority = Thread.MAX_PRIORITY + 1; + + // Start server. + setupServer(Integer.toString(invalidPriority)); + + // 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"); + + // Test connections. + assertEquals("abc", client.invoke("abc")); + log.info("connection is good"); + + // Test accept threads priority. + int defaultPriority = Thread.NORM_PRIORITY; + Field field = SocketServerInvoker.class.getDeclaredField("acceptThreads"); + field.setAccessible(true); + Thread[] acceptThreads = (Thread[]) field.get((SocketServerInvoker) connector.getServerInvoker()); + assertEquals(Integer.valueOf(NUM_ACCEPT_THREADS).intValue(), acceptThreads.length); + for (int i = 0; i < acceptThreads.length; i++) + { + log.info("acceptThreads[" + i + "].getPriority(): " + acceptThreads[i].getPriority()); + assertEquals(defaultPriority, acceptThreads[i].getPriority()); + + } + + client.disconnect(); + shutdownServer(); + log.info(getName() + " PASSES"); + } + + protected String getTransport() + { + return "socket"; + } + + + protected void addExtraClientConfig(Map config) {} + protected void addExtraServerConfig(Map config) {} + + + protected void setupServer(String increment) throws Exception + { + host = InetAddress.getLocalHost().getHostAddress(); + port = PortUtil.findFreePort(host); + locatorURI = getTransport() + "://" + host + ":" + port; + locatorURI += "/?numAcceptThreads=" + NUM_ACCEPT_THREADS; + locatorURI += "&acceptThreadPriorityIncrement=" + increment; + 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"); + 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 + { + return invocation.getParameter(); + } + public void removeListener(InvokerCallbackHandler callbackHandler) {} + public void setMBeanServer(MBeanServer server) {} + public void setInvoker(ServerInvoker invoker) {} + } +} \ No newline at end of file Property changes on: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/socket/accept/AcceptThreadPriorityTestCase.java ___________________________________________________________________ Added: svn:executable + *

13 years, 8 months

1
0
0 / 0

JBoss Remoting SVN: r6285 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket.

by jboss-remoting-commits＠lists.jboss.org

Author: ron.sigal(a)jboss.com Date: 2011-03-19 17:04:11 -0400 (Sat, 19 Mar 2011) New Revision: 6285 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java Log: JBREM-1277: Add accept thread priority configuration option. Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2011-03-19 20:51:35 UTC (rev 6284) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/SocketServerInvoker.java 2011-03-19 21:04:11 UTC (rev 6285) @@ -101,6 +101,7 @@ protected LRUPool clientpool; protected LinkedList threadpool; protected boolean immediateShutdown; + protected int acceptThreadPriorityIncrement = 0; protected ServerSocketRefresh refreshThread; protected boolean newServerSocketFactory = false; @@ -261,7 +262,11 @@ ServerSocket ss = (ServerSocket) it.next(); for(int j = 0; j < numAcceptThreads; j++) { - acceptThreads[i++] = new AcceptThread(ss, refreshThread); + acceptThreads[i] = new AcceptThread(ss, refreshThread); + acceptThreads[i].setPriority(Thread.NORM_PRIORITY + acceptThreadPriorityIncrement); + if(trace) { log.trace(this + " created and registered " + acceptThreads[i] + + " with priority " + acceptThreads[i].getPriority()); } + i++; } } } @@ -735,7 +740,25 @@ { this.writeTimeout = writeTimeout; } + + public int getAcceptThreadPriorityIncrement() + { + return acceptThreadPriorityIncrement; + } + public void setAcceptThreadPriorityIncrement(int acceptThreadPriorityIncrement) + { + int resultingPriority = Thread.NORM_PRIORITY + acceptThreadPriorityIncrement; + if (resultingPriority < Thread.MIN_PRIORITY || resultingPriority > Thread.MAX_PRIORITY) + { + log.warn(this + " resulting priority out of range: " + resultingPriority); + } + else + { + this.acceptThreadPriorityIncrement = acceptThreadPriorityIncrement; + } + } + protected void configureSocket(Socket s) throws SocketException { s.setReuseAddress(getReuseAddress());

13 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-remoting-commits March 2011