Author: markt Date: Wed Jun 1 22:25:02 2016 New Revision: 1746505 URL: http://svn.apache.org/viewvc?rev=1746505&view=rev Log: Pull up processSocket and definition of processorCache
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1746505&r1=1746504&r2=1746505&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Wed Jun 1 22:25:02 2016 @@ -26,10 +26,13 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; +import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; import org.apache.juli.logging.Log; +import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.IntrospectionUtils; +import org.apache.tomcat.util.collections.SynchronizedStack; import org.apache.tomcat.util.net.AbstractEndpoint.Acceptor.AcceptorState; import org.apache.tomcat.util.res.StringManager; import org.apache.tomcat.util.threads.LimitLatch; @@ -178,6 +181,10 @@ public abstract class AbstractEndpoint<S */ protected Acceptor[] acceptors; + /** + * Cache for SocketProcessor objects + */ + protected SynchronizedStack<SocketProcessorBase<S>> processorCache; // ----------------------------------------------------------------- Properties @@ -771,14 +778,46 @@ public abstract class AbstractEndpoint<S * selected the socket. * * @param socketWrapper The socket wrapper to process - * @param socketStatus The input status to the processing + * @param event The socket event to be processed * @param dispatch Should the processing be performed on a new * container thread * * @return if processing was triggered successfully */ - public abstract boolean processSocket(SocketWrapperBase<S> socketWrapper, - SocketEvent socketStatus, boolean dispatch); + public boolean processSocket(SocketWrapperBase<S> socketWrapper, + SocketEvent event, boolean dispatch) { + try { + if (socketWrapper == null) { + return false; + } + SocketProcessorBase<S> sc = processorCache.pop(); + if (sc == null) { + sc = createSocketProcessor(socketWrapper, event); + } else { + sc.reset(socketWrapper, event); + } + Executor executor = getExecutor(); + if (dispatch && executor != null) { + executor.execute(sc); + } else { + sc.run(); + } + } catch (RejectedExecutionException ree) { + getLog().warn(sm.getString("endpoint.executor.fail", socketWrapper) , ree); + return false; + } catch (Throwable t) { + ExceptionUtils.handleThrowable(t); + // This means we got an OOM or similar creating a thread, or that + // the pool and its queue are full + getLog().error(sm.getString("endpoint.process.fail"), t); + return false; + } + return true; + } + + + protected abstract SocketProcessorBase<S> createSocketProcessor( + SocketWrapperBase<S> socketWrapper, SocketEvent event); // ------------------------------------------------------- Lifecycle methods Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1746505&r1=1746504&r2=1746505&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Wed Jun 1 22:25:02 2016 @@ -27,7 +27,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.Lock; @@ -107,10 +106,6 @@ public class AprEndpoint extends Abstrac private final Map<Long,AprSocketWrapper> connections = new ConcurrentHashMap<>(); - /** - * Cache for SocketProcessor objects - */ - private SynchronizedStack<SocketProcessor> processorCache; // ------------------------------------------------------------ Constructor @@ -821,37 +816,12 @@ public class AprEndpoint extends Abstrac @Override - public boolean processSocket(SocketWrapperBase<Long> socketWrapper, - SocketEvent event, boolean dispatch) { - try { - if (socketWrapper == null) { - return false; - } - SocketProcessor sc = processorCache.pop(); - if (sc == null) { - sc = new SocketProcessor(socketWrapper, event); - } else { - sc.reset(socketWrapper, event); - } - Executor executor = getExecutor(); - if (dispatch && executor != null) { - executor.execute(sc); - } else { - sc.run(); - } - } catch (RejectedExecutionException ree) { - log.warn(sm.getString("endpoint.executor.fail", socketWrapper) , ree); - return false; - } catch (Throwable t) { - ExceptionUtils.handleThrowable(t); - // This means we got an OOM or similar creating a thread, or that - // the pool and its queue are full - log.error(sm.getString("endpoint.process.fail"), t); - return false; - } - return true; + protected SocketProcessorBase<Long> createSocketProcessor( + SocketWrapperBase<Long> socketWrapper, SocketEvent event) { + return new SocketProcessor(socketWrapper, event); } + private void closeSocket(long socket) { // Once this is called, the mapping from socket to wrapper will no // longer be required. Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1746505&r1=1746504&r2=1746505&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Wed Jun 1 22:25:02 2016 @@ -35,10 +35,8 @@ import java.nio.channels.WritePendingExc import java.nio.file.StandardOpenOption; import java.util.ArrayList; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -87,11 +85,6 @@ public class Nio2Endpoint extends Abstra private volatile boolean allClosed; /** - * Cache for SocketProcessor objects - */ - private SynchronizedStack<SocketProcessor> processorCache; - - /** * Bytebuffer cache, each channel holds a set of buffers (two, except for SSL holds four) */ private SynchronizedStack<Nio2Channel> nioChannels; @@ -376,38 +369,14 @@ public class Nio2Endpoint extends Abstra return true; } + @Override - public boolean processSocket(SocketWrapperBase<Nio2Channel> socketWrapper, - SocketEvent event, boolean dispatch) { - try { - if (socketWrapper == null) { - return false; - } - SocketProcessor sc = processorCache.pop(); - if (sc == null) { - sc = new SocketProcessor(socketWrapper, event); - } else { - sc.reset(socketWrapper, event); - } - Executor executor = getExecutor(); - if (dispatch && executor != null) { - executor.execute(sc); - } else { - sc.run(); - } - } catch (RejectedExecutionException ree) { - log.warn(sm.getString("endpoint.executor.fail", socketWrapper), ree); - return false; - } catch (Throwable t) { - ExceptionUtils.handleThrowable(t); - // This means we got an OOM or similar creating a thread, or that - // the pool and its queue are full - log.error(sm.getString("endpoint.process.fail"), t); - return false; - } - return true; + protected SocketProcessorBase<Nio2Channel> createSocketProcessor( + SocketWrapperBase<Nio2Channel> socketWrapper, SocketEvent event) { + return new SocketProcessor(socketWrapper, event); } + public void closeSocket(SocketWrapperBase<Nio2Channel> socket) { if (log.isDebugEnabled()) { log.debug("Calling [" + this + "].closeSocket([" + socket + "],[" + socket.getSocket() + "])", Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1746505&r1=1746504&r2=1746505&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Wed Jun 1 22:25:02 2016 @@ -36,8 +36,6 @@ import java.nio.channels.WritableByteCha import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Executor; -import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -94,11 +92,6 @@ public class NioEndpoint extends Abstrac private volatile CountDownLatch stopLatch = null; /** - * Cache for SocketProcessor objects - */ - private SynchronizedStack<SocketProcessor> processorCache; - - /** * Cache for poller events */ private SynchronizedStack<PollerEvent> eventCache; @@ -434,38 +427,6 @@ public class NioEndpoint extends Abstrac @Override - public boolean processSocket(SocketWrapperBase<NioChannel> socketWrapper, - SocketEvent event, boolean dispatch) { - try { - if (socketWrapper == null) { - return false; - } - SocketProcessor sc = processorCache.pop(); - if (sc == null) { - sc = new SocketProcessor(socketWrapper, event); - } else { - sc.reset(socketWrapper, event); - } - Executor executor = getExecutor(); - if (dispatch && executor != null) { - executor.execute(sc); - } else { - sc.run(); - } - } catch (RejectedExecutionException ree) { - log.warn(sm.getString("endpoint.executor.fail", socketWrapper.getSocket()), ree); - return false; - } catch (Throwable t) { - ExceptionUtils.handleThrowable(t); - // This means we got an OOM or similar creating a thread, or that - // the pool and its queue are full - log.error(sm.getString("endpoint.process.fail"), t); - return false; - } - return true; - } - - @Override protected Log getLog() { return log; } @@ -548,6 +509,13 @@ public class NioEndpoint extends Abstrac } + @Override + protected SocketProcessorBase<NioChannel> createSocketProcessor( + SocketWrapperBase<NioChannel> socketWrapper, SocketEvent event) { + return new SocketProcessor(socketWrapper, event); + } + + private void close(NioChannel socket, SelectionKey key) { try { if (socket.getPoller().cancelledKey(key) != null) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org