Author: markt
Date: Thu Jun 2 13:17:33 2016
New Revision: 1746566
URL: http://svn.apache.org/viewvc?rev=1746566&view=rev
Log:
Add a SocketProcessor cache to align with NIO/NIO2
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 2 13:17:33 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746504,1746509
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746505,1746509
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1746566&r1=1746565&r2=1746566&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
Thu Jun 2 13:17:33 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/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1746566&r1=1746565&r2=1746566&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu
Jun 2 13:17:33 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
@@ -825,37 +820,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/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1746566&r1=1746565&r2=1746566&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu
Jun 2 13:17:33 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/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1746566&r1=1746565&r2=1746566&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu
Jun 2 13:17:33 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
