From c5504b57404c7c12ad8c07b31c54c4e95dee9f0a Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 8 Jul 2011 18:01:30 +0000 Subject: [PATCH] Pull up Handler.process git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1144405 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/coyote/AbstractProcessor.java | 26 ++++- java/org/apache/coyote/AbstractProtocol.java | 106 +++++++++++++++++++-- .../apache/coyote/ajp/AbstractAjpProcessor.java | 20 ++-- .../org/apache/coyote/ajp/AbstractAjpProtocol.java | 91 +----------------- .../coyote/http11/AbstractHttp11Processor.java | 12 +-- .../coyote/http11/AbstractHttp11Protocol.java | 94 ------------------ .../apache/coyote/http11/Http11AprProtocol.java | 2 +- .../apache/coyote/http11/Http11NioProtocol.java | 2 +- java/org/apache/coyote/http11/Http11Protocol.java | 2 +- 9 files changed, 145 insertions(+), 210 deletions(-) diff --git a/java/org/apache/coyote/AbstractProcessor.java b/java/org/apache/coyote/AbstractProcessor.java index 912dc2544..c0c168d91 100644 --- a/java/org/apache/coyote/AbstractProcessor.java +++ b/java/org/apache/coyote/AbstractProcessor.java @@ -16,16 +16,19 @@ */ package org.apache.coyote; +import java.io.IOException; import java.util.concurrent.Executor; import org.apache.tomcat.util.net.AbstractEndpoint; import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; +import org.apache.tomcat.util.net.SocketStatus; +import org.apache.tomcat.util.net.SocketWrapper; /** * Provides functionality and attributes common to all supported protocols * (currently HTTP and AJP). */ -public abstract class AbstractProcessor implements ActionHook, Processor { +public abstract class AbstractProcessor implements ActionHook, Processor { protected Adapter adapter; protected final AsyncStateMachine asyncStateMachine; @@ -100,4 +103,25 @@ public abstract class AbstractProcessor implements ActionHook, Processor { public SocketState asyncPostProcess() { return asyncStateMachine.asyncPostProcess(); } + + protected abstract boolean isComet(); + + /** + * Process HTTP requests. All requests are treated as HTTP requests to start + * with although they may change type during processing. + */ + public abstract SocketState process(SocketWrapper socket) + throws IOException; + + + /** + * Process in-progress Comet requests. These will start as HTTP requests. + */ + public abstract SocketState event(SocketStatus status) throws IOException; + + /** + * Process in-progress Servlet 3.0 Async requests. These will start as HTTP + * requests. + */ + public abstract SocketState asyncDispatch(SocketStatus status); } diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java index 8cbc31c80..d719bb940 100644 --- a/java/org/apache/coyote/AbstractProtocol.java +++ b/java/org/apache/coyote/AbstractProtocol.java @@ -17,6 +17,7 @@ package org.apache.coyote; import java.net.InetAddress; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; @@ -28,9 +29,12 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import org.apache.juli.logging.Log; +import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.modeler.Registry; import org.apache.tomcat.util.net.AbstractEndpoint; import org.apache.tomcat.util.net.AbstractEndpoint.Handler; +import org.apache.tomcat.util.net.SocketStatus; +import org.apache.tomcat.util.net.SocketWrapper; import org.apache.tomcat.util.res.StringManager; public abstract class AbstractProtocol implements ProtocolHandler, @@ -456,14 +460,22 @@ public abstract class AbstractProtocol implements ProtocolHandler, // ------------------------------------------- Connection handler base class - protected abstract static class AbstractConnectionHandler + protected abstract static class AbstractConnectionHandler> implements AbstractEndpoint.Handler { + protected abstract Log getLog(); + protected RequestGroupInfo global = new RequestGroupInfo(); protected AtomicLong registerCount = new AtomicLong(0); + protected ConcurrentHashMap,P> connections = + new ConcurrentHashMap,P>(); + + protected RecycledProcessors recycledProcessors = + new RecycledProcessors(this); + + protected abstract AbstractProtocol getProtocol(); - protected abstract Log getLog(); @Override @@ -471,8 +483,88 @@ public abstract class AbstractProtocol implements ProtocolHandler, return global; } + @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(); + } + + initSsl(socket, processor); + + SocketState state = SocketState.CLOSED; + do { + if (processor.isAsync() || state == SocketState.ASYNC_END) { + state = processor.asyncDispatch(status); + } else if (processor.isComet()) { + state = processor.event(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. Exact requirements + // depend on type of long poll + longPoll(socket, processor); + } 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 initSsl(SocketWrapper socket, P processor); + protected abstract void longPoll(SocketWrapper socket, P processor); + protected abstract void release(SocketWrapper socket, P processor, + boolean socketClosing, boolean addToPoller); + - protected void register(AbstractProcessor processor) { + protected void register(AbstractProcessor processor) { if (getProtocol().getDomain() != null) { synchronized (this) { try { @@ -499,7 +591,7 @@ public abstract class AbstractProtocol implements ProtocolHandler, } } - protected void unregister(AbstractProcessor processor) { + protected void unregister(AbstractProcessor processor) { if (getProtocol().getDomain() != null) { synchronized (this) { try { @@ -521,14 +613,14 @@ public abstract class AbstractProtocol implements ProtocolHandler, } } - protected static class RecycledProcessors

+ protected static class RecycledProcessors

, S> extends ConcurrentLinkedQueue

{ private static final long serialVersionUID = 1L; - private AbstractConnectionHandler handler; + private transient AbstractConnectionHandler handler; protected AtomicInteger size = new AtomicInteger(0); - public RecycledProcessors(AbstractConnectionHandler handler) { + public RecycledProcessors(AbstractConnectionHandler handler) { this.handler = handler; } diff --git a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java index cde518ca7..04a0f5577 100644 --- a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java +++ b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java @@ -42,13 +42,12 @@ 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(); @@ -213,11 +212,6 @@ public abstract class AbstractAjpProcessor extends AbstractProcessor { protected long byteCount = 0; - /** - * AJP does not support comet - */ - protected final boolean comet = false; - // ------------------------------------------------------------ Constructor public AbstractAjpProcessor(int packetSize, AbstractEndpoint endpoint) { @@ -459,9 +453,7 @@ public abstract class AbstractAjpProcessor extends AbstractProcessor { protected abstract void finish() throws IOException; - public abstract SocketState process(SocketWrapper socket) - throws IOException; - + @Override public SocketState asyncDispatch(SocketStatus status) { RequestInfo rp = request.getRequestProcessor(); @@ -502,7 +494,13 @@ public abstract class AbstractAjpProcessor extends AbstractProcessor { } - @SuppressWarnings("unused") + @Override + protected final boolean isComet() { + // AJP does not support Comet + return false; + } + + @Override public SocketState event(SocketStatus status) throws IOException { // Should never reach this code but in case we do... throw new IOException( diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java index c31d47d17..3e6c0600d 100644 --- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java +++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java @@ -16,11 +16,7 @@ */ 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; @@ -77,99 +73,18 @@ public abstract class AbstractAjpProtocol extends AbstractProtocol { } protected abstract static class AbstractAjpConnectionHandler> - extends AbstractConnectionHandler { - - protected ConcurrentHashMap,P> connections = - new ConcurrentHashMap,P>(); + extends AbstractConnectionHandler { - 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(); - } - - initSsl(socket, processor); - - SocketState state = SocketState.CLOSED; - do { - if (processor.isAsync() || state == SocketState.ASYNC_END) { - state = processor.asyncDispatch(status); - } else if (processor.comet) { - state = processor.event(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. Exact requirements - // depend on type of long poll - longPoll(socket, processor); - } 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(); - @SuppressWarnings("unused") protected void initSsl(SocketWrapper socket, P processor) { // NOOP for AJP } + + @Override protected void longPoll(SocketWrapper socket, P processor) { // Same requirements for all AJP connectors connections.put(socket, processor); socket.setAsync(true); - } - protected abstract void release(SocketWrapper socket, P processor, - boolean socketClosing, boolean addToPoller); } } diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java index 54a3f4ca4..7d5385a3b 100644 --- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java +++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java @@ -47,10 +47,9 @@ import org.apache.tomcat.util.http.MimeHeaders; import org.apache.tomcat.util.net.AbstractEndpoint; import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; import org.apache.tomcat.util.net.SocketStatus; -import org.apache.tomcat.util.net.SocketWrapper; import org.apache.tomcat.util.res.StringManager; -public abstract class AbstractHttp11Processor extends AbstractProcessor { +public abstract class AbstractHttp11Processor extends AbstractProcessor { protected abstract Log getLog(); @@ -1212,9 +1211,7 @@ public abstract class AbstractHttp11Processor extends AbstractProcessor { } - public abstract SocketState process(SocketWrapper socket) - throws IOException; - + @Override public SocketState asyncDispatch(SocketStatus status) { RequestInfo rp = request.getRequestProcessor(); @@ -1252,7 +1249,10 @@ public abstract class AbstractHttp11Processor extends AbstractProcessor { } - public abstract SocketState event(SocketStatus status) throws IOException; + @Override + public boolean isComet() { + return comet; + } /** diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java index b15c35b35..85b8371d0 100644 --- a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java +++ b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java @@ -16,12 +16,8 @@ */ package org.apache.coyote.http11; -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 AbstractHttp11Protocol extends AbstractProtocol { @@ -187,94 +183,4 @@ public abstract class AbstractHttp11Protocol extends AbstractProtocol { public void setMaxKeepAliveRequests(int mkar) { endpoint.setMaxKeepAliveRequests(mkar); } - - - protected abstract static class AbstractHttp11ConnectionHandler> - 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); //no longer check for timeout - - try { - if (processor == null) { - processor = recycledProcessors.poll(); - } - if (processor == null) { - processor = createProcessor(); - } - - initSsl(socket, processor); - - SocketState state = SocketState.CLOSED; - do { - if (processor.isAsync() || state == SocketState.ASYNC_END) { - state = processor.asyncDispatch(status); - } else if (processor.comet) { - state = processor.event(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. Exact requirements - // depend on type of long poll - longPoll(socket, processor); - } 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( - "http11protocol.proto.socketexception.debug"), e); - } catch (java.io.IOException e) { - // IOExceptions are normal - getLog().debug(sm.getString( - "http11protocol.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("http11protocol.proto.error"), e); - } - release(socket, processor, true, false); - return SocketState.CLOSED; - } - - protected abstract P createProcessor(); - protected abstract void initSsl(SocketWrapper socket, P processor); - protected abstract void longPoll(SocketWrapper socket, P processor); - protected abstract void release(SocketWrapper socket, P processor, - boolean socketClosing, boolean addToPoller); - } } diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java index f630dfbf4..ca8e49ca2 100644 --- a/java/org/apache/coyote/http11/Http11AprProtocol.java +++ b/java/org/apache/coyote/http11/Http11AprProtocol.java @@ -177,7 +177,7 @@ public class Http11AprProtocol extends AbstractHttp11Protocol { // -------------------- Connection handler -------------------- protected static class Http11ConnectionHandler - extends AbstractHttp11ConnectionHandler implements Handler { + extends AbstractConnectionHandler implements Handler { protected Http11AprProtocol proto; diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java index b3915ba42..a589d8555 100644 --- a/java/org/apache/coyote/http11/Http11NioProtocol.java +++ b/java/org/apache/coyote/http11/Http11NioProtocol.java @@ -148,7 +148,7 @@ public class Http11NioProtocol extends AbstractHttp11JsseProtocol { // -------------------- Connection handler -------------------- protected static class Http11ConnectionHandler - extends AbstractHttp11ConnectionHandler + extends AbstractConnectionHandler implements Handler { protected Http11NioProtocol proto; diff --git a/java/org/apache/coyote/http11/Http11Protocol.java b/java/org/apache/coyote/http11/Http11Protocol.java index 0a9420c87..ef2417337 100644 --- a/java/org/apache/coyote/http11/Http11Protocol.java +++ b/java/org/apache/coyote/http11/Http11Protocol.java @@ -97,7 +97,7 @@ public class Http11Protocol extends AbstractHttp11JsseProtocol { // ----------------------------------- Http11ConnectionHandler Inner Class protected static class Http11ConnectionHandler - extends AbstractHttp11ConnectionHandler implements Handler { + extends AbstractConnectionHandler implements Handler { protected Http11Protocol proto; -- 2.11.0