From 237d034b9762fb78ea71243aeee6374bfe3c70d1 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 8 Jul 2011 17:19:19 +0000 Subject: [PATCH] Pull up Handler.process for the Ajp Connectors. Note that this is an intermediate step. The aim is to pull this up to AbstractProtocol git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1144390 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/coyote/ajp/AbstractAjpProcessor.java | 7 +- .../org/apache/coyote/ajp/AbstractAjpProtocol.java | 88 ++++++++++++++++++++++ java/org/apache/coyote/ajp/AjpAprProcessor.java | 3 +- java/org/apache/coyote/ajp/AjpAprProtocol.java | 84 +-------------------- java/org/apache/coyote/ajp/AjpNioProcessor.java | 3 +- java/org/apache/coyote/ajp/AjpNioProtocol.java | 83 +------------------- java/org/apache/coyote/ajp/AjpProcessor.java | 3 +- java/org/apache/coyote/ajp/AjpProtocol.java | 83 +------------------- 8 files changed, 108 insertions(+), 246 deletions(-) diff --git a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java index 310733178..7824eba75 100644 --- a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java +++ b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.coyote.ajp; import java.io.ByteArrayInputStream; @@ -43,12 +42,13 @@ import org.apache.tomcat.util.net.AbstractEndpoint; import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; import org.apache.tomcat.util.net.SSLSupport; import org.apache.tomcat.util.net.SocketStatus; +import org.apache.tomcat.util.net.SocketWrapper; import org.apache.tomcat.util.res.StringManager; /** * Base class for AJP Processor implementations. */ -public abstract class AbstractAjpProcessor extends AbstractProcessor { +public abstract class AbstractAjpProcessor extends AbstractProcessor { protected abstract Log getLog(); @@ -454,6 +454,9 @@ public abstract class AbstractAjpProcessor extends AbstractProcessor { protected abstract void finish() throws IOException; + public abstract SocketState process(SocketWrapper socket) + throws IOException; + public SocketState asyncDispatch(SocketStatus status) { RequestInfo rp = request.getRequestProcessor(); diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java index 9c69bd7d7..f59b45e96 100644 --- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java +++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java @@ -16,7 +16,12 @@ */ package org.apache.coyote.ajp; +import java.util.concurrent.ConcurrentHashMap; + import org.apache.coyote.AbstractProtocol; +import org.apache.tomcat.util.ExceptionUtils; +import org.apache.tomcat.util.net.SocketStatus; +import org.apache.tomcat.util.net.SocketWrapper; import org.apache.tomcat.util.res.StringManager; public abstract class AbstractAjpProtocol extends AbstractProtocol { @@ -70,4 +75,87 @@ public abstract class AbstractAjpProtocol extends AbstractProtocol { this.packetSize = packetSize; } } + + protected abstract static class AbstractAjpConnectionHandler> + extends AbstractConnectionHandler { + + protected ConcurrentHashMap,P> connections = + new ConcurrentHashMap,P>(); + + protected RecycledProcessors

recycledProcessors = + new RecycledProcessors

(this); + + @Override + public void recycle() { + recycledProcessors.clear(); + } + + public SocketState process(SocketWrapper socket, + SocketStatus status) { + P processor = connections.remove(socket); + + socket.setAsync(false); + + try { + if (processor == null) { + processor = recycledProcessors.poll(); + } + if (processor == null) { + processor = createProcessor(); + } + + SocketState state = SocketState.CLOSED; + do { + if (processor.isAsync() || state == SocketState.ASYNC_END) { + state = processor.asyncDispatch(status); + } else { + state = processor.process(socket); + } + + if (state != SocketState.CLOSED && processor.isAsync()) { + state = processor.asyncPostProcess(); + } + } while (state == SocketState.ASYNC_END); + + if (state == SocketState.LONG) { + // In the middle of processing a request/response. Keep the + // socket associated with the processor. + connections.put(socket, processor); + socket.setAsync(true); + } else if (state == SocketState.OPEN){ + // In keep-alive but between requests. OK to recycle + // processor. Continue to poll for the next request. + release(socket, processor, false, true); + } else { + // Connection closed. OK to recycle the processor. + release(socket, processor, true, false); + } + return state; + } catch(java.net.SocketException e) { + // SocketExceptions are normal + getLog().debug(sm.getString( + "ajpprotocol.proto.socketexception.debug"), e); + } catch (java.io.IOException e) { + // IOExceptions are normal + getLog().debug(sm.getString( + "ajpprotocol.proto.ioexception.debug"), e); + } + // Future developers: if you discover any other + // rare-but-nonfatal exceptions, catch them here, and log as + // above. + catch (Throwable e) { + ExceptionUtils.handleThrowable(e); + // any other exception or error is odd. Here we log it + // with "ERROR" level, so it will show up even on + // less-than-verbose logs. + getLog().error(sm.getString("ajpprotocol.proto.error"), e); + } + release(socket, processor, true, false); + return SocketState.CLOSED; + } + + protected abstract P createProcessor(); + protected abstract void release(SocketWrapper socket, P processor, + boolean socketClosing, boolean addToPoller); + } } diff --git a/java/org/apache/coyote/ajp/AjpAprProcessor.java b/java/org/apache/coyote/ajp/AjpAprProcessor.java index 94880bca1..275f25522 100644 --- a/java/org/apache/coyote/ajp/AjpAprProcessor.java +++ b/java/org/apache/coyote/ajp/AjpAprProcessor.java @@ -47,7 +47,7 @@ import org.apache.tomcat.util.net.SocketWrapper; * @author Costin Manolache * @author Bill Barker */ -public class AjpAprProcessor extends AbstractAjpProcessor { +public class AjpAprProcessor extends AbstractAjpProcessor { /** @@ -106,6 +106,7 @@ public class AjpAprProcessor extends AbstractAjpProcessor { * * @throws IOException error during an I/O operation */ + @Override public SocketState process(SocketWrapper socket) throws IOException { RequestInfo rp = request.getRequestProcessor(); diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java b/java/org/apache/coyote/ajp/AjpAprProtocol.java index 50b25add2..d314cb2c9 100644 --- a/java/org/apache/coyote/ajp/AjpAprProtocol.java +++ b/java/org/apache/coyote/ajp/AjpAprProtocol.java @@ -14,19 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.coyote.ajp; -import java.util.concurrent.ConcurrentHashMap; - import org.apache.coyote.AbstractProtocol; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; -import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.net.AbstractEndpoint; import org.apache.tomcat.util.net.AprEndpoint; import org.apache.tomcat.util.net.AprEndpoint.Handler; -import org.apache.tomcat.util.net.SocketStatus; import org.apache.tomcat.util.net.SocketWrapper; @@ -100,16 +95,11 @@ public class AjpAprProtocol extends AbstractAjpProtocol { protected static class AjpConnectionHandler - extends AbstractConnectionHandler implements Handler { + extends AbstractAjpConnectionHandler + implements Handler { protected AjpAprProtocol proto; - protected ConcurrentHashMap, AjpAprProcessor> connections = - new ConcurrentHashMap, AjpAprProcessor>(); - - protected RecycledProcessors recycledProcessors = - new RecycledProcessors(this); - public AjpConnectionHandler(AjpAprProtocol proto) { this.proto = proto; } @@ -124,15 +114,11 @@ public class AjpAprProtocol extends AbstractAjpProtocol { return log; } - @Override - public void recycle() { - recycledProcessors.clear(); - } - /** * Expected to be used by the handler once the processor is no longer * required. */ + @Override public void release(SocketWrapper socket, AjpAprProcessor processor, boolean isSocketClosing, boolean addToPoller) { @@ -146,70 +132,6 @@ public class AjpAprProtocol extends AbstractAjpProtocol { @Override - public SocketState process(SocketWrapper socket, - SocketStatus status) { - AjpAprProcessor processor = connections.remove(socket); - - socket.setAsync(false); - - try { - if (processor == null) { - processor = recycledProcessors.poll(); - } - if (processor == null) { - processor = createProcessor(); - } - - SocketState state = SocketState.CLOSED; - do { - if (processor.isAsync() || state == SocketState.ASYNC_END) { - state = processor.asyncDispatch(status); - } else { - state = processor.process(socket); - } - - if (state != SocketState.CLOSED && processor.isAsync()) { - state = processor.asyncPostProcess(); - } - } while (state == SocketState.ASYNC_END); - - if (state == SocketState.LONG) { - // Need to make socket available for next processing cycle - // but no need for the poller - connections.put(socket, processor); - socket.setAsync(true); - } else if (state == SocketState.OPEN){ - // In keep-alive but between requests. OK to recycle - // processor. Continue to poll for the next request. - release(socket, processor, false, true); - } else { - // Connection closed. OK to recycle the processor. - release(socket, processor, true, false); - } - return state; - } catch(java.net.SocketException e) { - // SocketExceptions are normal - log.debug(sm.getString( - "ajpprotocol.proto.socketexception.debug"), e); - } catch (java.io.IOException e) { - // IOExceptions are normal - log.debug(sm.getString( - "ajpprotocol.proto.ioexception.debug"), e); - } - // Future developers: if you discover any other - // rare-but-nonfatal exceptions, catch them here, and log as - // above. - catch (Throwable e) { - ExceptionUtils.handleThrowable(e); - // any other exception or error is odd. Here we log it - // with "ERROR" level, so it will show up even on - // less-than-verbose logs. - log.error(sm.getString("ajpprotocol.proto.error"), e); - } - release(socket, processor, true, false); - return SocketState.CLOSED; - } - protected AjpAprProcessor createProcessor() { AjpAprProcessor processor = new AjpAprProcessor(proto.packetSize, (AprEndpoint)proto.endpoint); processor.setAdapter(proto.adapter); diff --git a/java/org/apache/coyote/ajp/AjpNioProcessor.java b/java/org/apache/coyote/ajp/AjpNioProcessor.java index e68057e56..4ce2ee808 100644 --- a/java/org/apache/coyote/ajp/AjpNioProcessor.java +++ b/java/org/apache/coyote/ajp/AjpNioProcessor.java @@ -42,7 +42,7 @@ import org.apache.tomcat.util.net.SocketWrapper; /** * Processes AJP requests using NIO. */ -public class AjpNioProcessor extends AbstractAjpProcessor { +public class AjpNioProcessor extends AbstractAjpProcessor { /** @@ -91,6 +91,7 @@ public class AjpNioProcessor extends AbstractAjpProcessor { * * @throws IOException error during an I/O operation */ + @Override public SocketState process(SocketWrapper socket) throws IOException { RequestInfo rp = request.getRequestProcessor(); diff --git a/java/org/apache/coyote/ajp/AjpNioProtocol.java b/java/org/apache/coyote/ajp/AjpNioProtocol.java index baeaf5c3c..987761b0e 100644 --- a/java/org/apache/coyote/ajp/AjpNioProtocol.java +++ b/java/org/apache/coyote/ajp/AjpNioProtocol.java @@ -14,23 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.coyote.ajp; import java.nio.channels.SocketChannel; import java.util.Iterator; -import java.util.concurrent.ConcurrentHashMap; import org.apache.coyote.AbstractProtocol; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; -import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.net.AbstractEndpoint; import org.apache.tomcat.util.net.NioChannel; import org.apache.tomcat.util.net.NioEndpoint; import org.apache.tomcat.util.net.NioEndpoint.Handler; import org.apache.tomcat.util.net.SSLImplementation; -import org.apache.tomcat.util.net.SocketStatus; import org.apache.tomcat.util.net.SocketWrapper; @@ -90,16 +86,11 @@ public class AjpNioProtocol extends AbstractAjpProtocol { protected static class AjpConnectionHandler - extends AbstractConnectionHandler implements Handler { + extends AbstractAjpConnectionHandler + implements Handler { protected AjpNioProtocol proto; - protected ConcurrentHashMap, AjpNioProcessor> connections = - new ConcurrentHashMap, AjpNioProcessor>(); - - protected RecycledProcessors recycledProcessors = - new RecycledProcessors(this); - public AjpConnectionHandler(AjpNioProtocol proto) { this.proto = proto; } @@ -115,11 +106,6 @@ public class AjpNioProtocol extends AbstractAjpProtocol { } @Override - public void recycle() { - recycledProcessors.clear(); - } - - @Override public SSLImplementation getSslImplementation() { // AJP does not support SSL return null; @@ -167,6 +153,7 @@ public class AjpNioProtocol extends AbstractAjpProtocol { * Expected to be used by the handler once the processor is no longer * required. */ + @Override public void release(SocketWrapper socket, AjpNioProcessor processor, boolean isSocketClosing, boolean addToPoller) { @@ -179,70 +166,6 @@ public class AjpNioProtocol extends AbstractAjpProtocol { @Override - public SocketState process(SocketWrapper socket, - SocketStatus status) { - AjpNioProcessor processor = connections.remove(socket); - - socket.setAsync(false); //no longer check for timeout - - try { - if (processor == null) { - processor = recycledProcessors.poll(); - } - if (processor == null) { - processor = createProcessor(); - } - - SocketState state = SocketState.CLOSED; - do { - if (processor.isAsync() || state == SocketState.ASYNC_END) { - state = processor.asyncDispatch(status); - } else { - state = processor.process(socket); - } - - if (state != SocketState.CLOSED && processor.isAsync()) { - state = processor.asyncPostProcess(); - } - } while (state == SocketState.ASYNC_END); - - if (state == SocketState.LONG) { - // In the middle of processing a request/response. Keep the - // socket associated with the processor. - connections.put(socket, processor); - socket.setAsync(true); - } else if (state == SocketState.OPEN){ - // In keep-alive but between requests. OK to recycle - // processor. Continue to poll for the next request. - release(socket, processor, false, true); - } else { - // Connection closed. OK to recycle the processor. - release(socket, processor, true, false); - } - return state; - } catch(java.net.SocketException e) { - // SocketExceptions are normal - log.debug(sm.getString( - "ajpprotocol.proto.socketexception.debug"), e); - } catch (java.io.IOException e) { - // IOExceptions are normal - log.debug(sm.getString( - "ajpprotocol.proto.ioexception.debug"), e); - } - // Future developers: if you discover any other - // rare-but-nonfatal exceptions, catch them here, and log as - // above. - catch (Throwable e) { - ExceptionUtils.handleThrowable(e); - // any other exception or error is odd. Here we log it - // with "ERROR" level, so it will show up even on - // less-than-verbose logs. - log.error(sm.getString("ajpprotocol.proto.error"), e); - } - release(socket, processor, true, false); - return SocketState.CLOSED; - } - protected AjpNioProcessor createProcessor() { AjpNioProcessor processor = new AjpNioProcessor(proto.packetSize, (NioEndpoint)proto.endpoint); processor.setAdapter(proto.adapter); diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java index e62085d6e..35b77b36a 100644 --- a/java/org/apache/coyote/ajp/AjpProcessor.java +++ b/java/org/apache/coyote/ajp/AjpProcessor.java @@ -47,7 +47,7 @@ import org.apache.tomcat.util.net.SocketWrapper; * @author Costin Manolache * @author Bill Barker */ -public class AjpProcessor extends AbstractAjpProcessor { +public class AjpProcessor extends AbstractAjpProcessor { /** @@ -100,6 +100,7 @@ public class AjpProcessor extends AbstractAjpProcessor { * * @throws IOException error during an I/O operation */ + @Override public SocketState process(SocketWrapper socket) throws IOException { RequestInfo rp = request.getRequestProcessor(); diff --git a/java/org/apache/coyote/ajp/AjpProtocol.java b/java/org/apache/coyote/ajp/AjpProtocol.java index 014d9104e..0e5578263 100644 --- a/java/org/apache/coyote/ajp/AjpProtocol.java +++ b/java/org/apache/coyote/ajp/AjpProtocol.java @@ -14,21 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.coyote.ajp; import java.net.Socket; -import java.util.concurrent.ConcurrentHashMap; import org.apache.coyote.AbstractProtocol; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; -import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.net.AbstractEndpoint; import org.apache.tomcat.util.net.JIoEndpoint; import org.apache.tomcat.util.net.JIoEndpoint.Handler; import org.apache.tomcat.util.net.SSLImplementation; -import org.apache.tomcat.util.net.SocketStatus; import org.apache.tomcat.util.net.SocketWrapper; @@ -89,16 +85,11 @@ public class AjpProtocol extends AbstractAjpProtocol { protected static class AjpConnectionHandler - extends AbstractConnectionHandler implements Handler { + extends AbstractAjpConnectionHandler + implements Handler { protected AjpProtocol proto; - protected ConcurrentHashMap, AjpProcessor> connections = - new ConcurrentHashMap, AjpProcessor>(); - - protected RecycledProcessors recycledProcessors = - new RecycledProcessors(this); - public AjpConnectionHandler(AjpProtocol proto) { this.proto = proto; } @@ -119,11 +110,6 @@ public class AjpProtocol extends AbstractAjpProtocol { return null; } - @Override - public void recycle() { - recycledProcessors.clear(); - } - /** * Expected to be used by the handler once the processor is no longer * required. @@ -133,6 +119,7 @@ public class AjpProtocol extends AbstractAjpProtocol { * @param isSocketClosing * @param addToPoller Ignored for BIO */ + @Override public void release(SocketWrapper socket, AjpProcessor processor, boolean isSocketClosing, boolean addToPoller) { @@ -142,70 +129,6 @@ public class AjpProtocol extends AbstractAjpProtocol { @Override - public SocketState process(SocketWrapper socket, - SocketStatus status) { - AjpProcessor processor = connections.remove(socket); - - socket.setAsync(false); - - try { - if (processor == null) { - processor = recycledProcessors.poll(); - } - if (processor == null) { - processor = createProcessor(); - } - - SocketState state = SocketState.CLOSED; - do { - if (processor.isAsync() || state == SocketState.ASYNC_END) { - state = processor.asyncDispatch(status); - } else { - state = processor.process(socket); - } - - if (state != SocketState.CLOSED && processor.isAsync()) { - state = processor.asyncPostProcess(); - } - } while (state == SocketState.ASYNC_END); - - if (state == SocketState.LONG) { - // In the middle of processing a request/response. Keep the - // socket associated with the processor. - connections.put(socket, processor); - socket.setAsync(true); - } else if (state == SocketState.OPEN){ - // In keep-alive but between requests. OK to recycle - // processor. Continue to poll for the next request. - release(socket, processor, false, true); - } else { - // Connection closed. OK to recycle the processor. - release(socket, processor, true, false); - } - return state; - } catch(java.net.SocketException e) { - // SocketExceptions are normal - log.debug(sm.getString( - "ajpprotocol.proto.socketexception.debug"), e); - } catch (java.io.IOException e) { - // IOExceptions are normal - log.debug(sm.getString( - "ajpprotocol.proto.ioexception.debug"), e); - } - // Future developers: if you discover any other - // rare-but-nonfatal exceptions, catch them here, and log as - // above. - catch (Throwable e) { - ExceptionUtils.handleThrowable(e); - // any other exception or error is odd. Here we log it - // with "ERROR" level, so it will show up even on - // less-than-verbose logs. - log.error(sm.getString("ajpprotocol.proto.error"), e); - } - release(socket, processor, true, false); - return SocketState.CLOSED; - } - protected AjpProcessor createProcessor() { AjpProcessor processor = new AjpProcessor(proto.packetSize, (JIoEndpoint)proto.endpoint); processor.setAdapter(proto.adapter); -- 2.11.0