support call ExpressHandler directly in iothread

greenlaw110 · greenlaw110 · commit d9b9001a6345 · 2017-01-31T21:43:06.000+11:00
diff --git a/pom.xml b/pom.xml
@@ -18,8 +18,12 @@
 ********************************************
 *            version history
 ********************************************
+0.4.0
+- Performance tuning: enable direct io thread processing handler
+
 0.3.1
 - ActiveRecord -> AdaptiveRecord
+- Performance tuning: enable nonblocking IO
 
 0.3.0
 - Catch up update to osgl-mvc 0.6.0: Bind annotation now support specifying multiple Binder implementations
@@ -48,7 +52,7 @@
   <groupId>org.actframework</groupId>
   <artifactId>act</artifactId>
   <packaging>jar</packaging>
-  <version>0.3.1-SNAPSHOT</version>
+  <version>0.4.0-SNAPSHOT</version>
 
   <name>ACT Framework</name>
   <description>The ACT full stack MVC framework</description>
diff --git a/src/main/java/act/app/ActionContext.java b/src/main/java/act/app/ActionContext.java
@@ -85,7 +85,6 @@ private ActionContext(App app, H.Request request, H.Response response) {
         this.disableCsrf = req().method().safe();
         this.sessionKeyUsername = config.sessionKeyUsername();
         this.localeResolver = new LocaleResolver(this);
-        this.saveLocal();
     }
 
     public State state() {
diff --git a/src/main/java/act/conf/AppConfig.java b/src/main/java/act/conf/AppConfig.java
@@ -88,6 +88,9 @@ public AppConfig<T> app(App app) {
         E.NPE(app);
         this.app = app;
         AppConfigKey.onApp(app);
+        // preload some common used configurations
+        sessionCookieName();
+        sessionCookiePrefix();
         return this;
     }
 
diff --git a/src/main/java/act/handler/DelegateRequestHandler.java b/src/main/java/act/handler/DelegateRequestHandler.java
@@ -17,6 +17,11 @@ protected DelegateRequestHandler(RequestHandler handler) {
         this.realHandler = handler instanceof RequestHandlerBase ? ((RequestHandlerBase) handler).realHandler() : handler;
     }
 
+    @Override
+    public boolean express() {
+        return handler_.express();
+    }
+
     @Override
     public void handle(ActionContext context) {
         handler_.handle(context);
diff --git a/src/main/java/act/handler/ExpressHandler.java b/src/main/java/act/handler/ExpressHandler.java
@@ -1,9 +1,9 @@
-package act.handler.builtin;
+package act.handler;
 
 /**
  * This is a tag interface that when a {@link act.handler.RequestHandler} implement this
  * means the underline network can invoke the handler directly in IO thread instead of worker
  * thread
  */
-public interface DirectIO {
+public interface ExpressHandler {
 }
diff --git a/src/main/java/act/handler/NonBlock.java b/src/main/java/act/handler/NonBlock.java
@@ -0,0 +1,19 @@
+package act.handler;
+
+import act.Act;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark a class method as non-block method.
+ *
+ * When an action handler created from an non-block
+ * method the handler will be treated as an {@link ExpressHandler}
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface NonBlock {
+}
diff --git a/src/main/java/act/handler/OptionsRequestHandler.java b/src/main/java/act/handler/OptionsRequestHandler.java
@@ -4,7 +4,7 @@
 import act.handler.builtin.controller.FastRequestHandler;
 import act.security.CORS;
 
-public class OptionsRequestHandler extends FastRequestHandler {
+public class OptionsRequestHandler extends FastRequestHandler implements ExpressHandler {
 
     private CORS.Spec corsSpec;
 
diff --git a/src/main/java/act/handler/RequestHandler.java b/src/main/java/act/handler/RequestHandler.java
@@ -23,6 +23,17 @@ public interface RequestHandler extends $.Function<ActionContext, Void>, Destroy
      */
     void handle(ActionContext context);
 
+    /**
+     * Indicate the handler logic is fast enough to be put into network layer's io thread and
+     * does not require to dispatch to worker thread.
+     *
+     * Note a handler that implements {@link ExpressHandler} should
+     * always return `true` for this method
+     *
+     * @return `true` if this handler support direct io thread processing
+     */
+    boolean express();
+
     /**
      * Indicate if this request handler support partial path lookup.
      * Usually this method should return {@code false}. However for
diff --git a/src/main/java/act/handler/RequestHandlerBase.java b/src/main/java/act/handler/RequestHandlerBase.java
@@ -19,6 +19,11 @@ public final Void apply(ActionContext context) throws NotAppliedException, $.Bre
         return null;
     }
 
+    @Override
+    public boolean express() {
+        return this instanceof ExpressHandler;
+    }
+
     @Override
     public Class<? extends Annotation> scope() {
         return ApplicationScoped.class;
diff --git a/src/main/java/act/handler/UnknownHttpMethodProcessor.java b/src/main/java/act/handler/UnknownHttpMethodProcessor.java
@@ -14,7 +14,7 @@ public abstract class UnknownHttpMethodProcessor implements Serializable {
 
     public abstract Result handle(H.Method method);
 
-    private static class NotAllowed extends UnknownHttpMethodProcessor {
+    private static class NotAllowed extends UnknownHttpMethodProcessor implements ExpressHandler {
         @Override
         public Result handle(H.Method method) {
             return MethodNotAllowed.INSTANCE;
@@ -25,7 +25,7 @@ private Object readResolve() {
         }
     }
 
-    private static class NotImplemented extends UnknownHttpMethodProcessor {
+    private static class NotImplemented extends UnknownHttpMethodProcessor implements ExpressHandler {
         @Override
         public Result handle(H.Method method) {
             return org.osgl.mvc.result.NotImplemented.INSTANCE;
diff --git a/src/main/java/act/handler/builtin/AlwaysBadRequest.java b/src/main/java/act/handler/builtin/AlwaysBadRequest.java
@@ -1,10 +1,11 @@
 package act.handler.builtin;
 
 import act.app.ActionContext;
+import act.handler.ExpressHandler;
 import act.handler.builtin.controller.FastRequestHandler;
 import org.osgl.mvc.result.BadRequest;
 
-public class AlwaysBadRequest extends FastRequestHandler implements DirectIO {
+public class AlwaysBadRequest extends FastRequestHandler implements ExpressHandler {
 
     public static AlwaysBadRequest INSTANCE = new AlwaysBadRequest();
 
diff --git a/src/main/java/act/handler/builtin/AlwaysForbidden.java b/src/main/java/act/handler/builtin/AlwaysForbidden.java
@@ -1,10 +1,11 @@
 package act.handler.builtin;
 
 import act.app.ActionContext;
+import act.handler.ExpressHandler;
 import act.handler.builtin.controller.FastRequestHandler;
 import org.osgl.mvc.result.Forbidden;
 
-public class AlwaysForbidden extends FastRequestHandler implements DirectIO {
+public class AlwaysForbidden extends FastRequestHandler implements ExpressHandler {
 
     public static AlwaysForbidden INSTANCE = new AlwaysForbidden();
 
diff --git a/src/main/java/act/handler/builtin/AlwaysMethodNotAllowed.java b/src/main/java/act/handler/builtin/AlwaysMethodNotAllowed.java
@@ -1,10 +1,11 @@
 package act.handler.builtin;
 
 import act.app.ActionContext;
+import act.handler.ExpressHandler;
 import act.handler.builtin.controller.FastRequestHandler;
 import org.osgl.mvc.result.MethodNotAllowed;
 
-public class AlwaysMethodNotAllowed extends FastRequestHandler implements DirectIO {
+public class AlwaysMethodNotAllowed extends FastRequestHandler implements ExpressHandler {
 
     public static AlwaysMethodNotAllowed INSTANCE = new AlwaysMethodNotAllowed();
 
diff --git a/src/main/java/act/handler/builtin/AlwaysNotFound.java b/src/main/java/act/handler/builtin/AlwaysNotFound.java
@@ -1,10 +1,11 @@
 package act.handler.builtin;
 
 import act.app.ActionContext;
+import act.handler.ExpressHandler;
 import act.handler.builtin.controller.FastRequestHandler;
 import org.osgl.mvc.result.NotFound;
 
-public class AlwaysNotFound extends FastRequestHandler implements DirectIO {
+public class AlwaysNotFound extends FastRequestHandler implements ExpressHandler {
 
     public static AlwaysNotFound INSTANCE = new AlwaysNotFound();
 
diff --git a/src/main/java/act/handler/builtin/AlwaysNotImplemented.java b/src/main/java/act/handler/builtin/AlwaysNotImplemented.java
@@ -1,10 +1,11 @@
 package act.handler.builtin;
 
 import act.app.ActionContext;
+import act.handler.ExpressHandler;
 import act.handler.builtin.controller.FastRequestHandler;
 import org.osgl.mvc.result.NotImplemented;
 
-public class AlwaysNotImplemented extends FastRequestHandler implements DirectIO {
+public class AlwaysNotImplemented extends FastRequestHandler implements ExpressHandler {
 
     public static AlwaysNotImplemented INSTANCE = new AlwaysNotImplemented();
 
diff --git a/src/main/java/act/handler/builtin/Echo.java b/src/main/java/act/handler/builtin/Echo.java
@@ -1,14 +1,15 @@
 package act.handler.builtin;
 
 import act.app.ActionContext;
+import act.handler.ExpressHandler;
 import act.handler.builtin.controller.FastRequestHandler;
 import org.apache.commons.codec.Charsets;
 import org.osgl.http.H;
 import org.osgl.util.S;
 
 import java.nio.ByteBuffer;
 
-public class Echo extends FastRequestHandler implements DirectIO {
+public class Echo extends FastRequestHandler implements ExpressHandler {
 
     private ByteBuffer buffer;
     private String toString;
diff --git a/src/main/java/act/handler/builtin/Redirect.java b/src/main/java/act/handler/builtin/Redirect.java
@@ -1,10 +1,11 @@
 package act.handler.builtin;
 
 import act.app.ActionContext;
+import act.handler.ExpressHandler;
 import act.handler.builtin.controller.FastRequestHandler;
 import org.osgl.http.H;
 
-public class Redirect extends FastRequestHandler implements DirectIO {
+public class Redirect extends FastRequestHandler implements ExpressHandler {
 
     private String url;
 
diff --git a/src/main/java/act/handler/builtin/UnknownHttpMethodHandler.java b/src/main/java/act/handler/builtin/UnknownHttpMethodHandler.java
@@ -1,6 +1,11 @@
 package act.handler.builtin;
 
+import act.Act;
 import act.app.ActionContext;
+import act.conf.AppConfig;
+import act.handler.ExpressHandler;
+import act.handler.RequestHandler;
+import act.handler.UnknownHttpMethodProcessor;
 import act.handler.builtin.controller.FastRequestHandler;
 import act.handler.builtin.controller.RequestHandlerProxy;
 import act.view.ActErrorResult;
@@ -14,13 +19,14 @@
 public class UnknownHttpMethodHandler extends FastRequestHandler implements Serializable {
 
     private static Logger logger = LogManager.get(UnknownHttpMethodHandler.class);
-
     public static final UnknownHttpMethodHandler INSTANCE = new UnknownHttpMethodHandler();
 
+    private volatile UnknownHttpMethodProcessor configured;
+
     @Override
     public void handle(ActionContext context) {
         H.Method method = context.req().method();
-        Result result = context.config().unknownHttpMethodProcessor().handle(method);
+        Result result = configured(context.config()).handle(method);
         try {
             result = RequestHandlerProxy.GLOBAL_AFTER_INTERCEPTOR.apply(result, context);
         } catch (Exception e) {
@@ -30,6 +36,25 @@ public void handle(ActionContext context) {
         result.apply(context.req(), context.resp());
     }
 
+    @Override
+    public boolean express() {
+        return configured(null) instanceof ExpressHandler;
+    }
+
+    private UnknownHttpMethodProcessor configured(AppConfig config) {
+        if (null == configured) {
+            synchronized (this) {
+                if (null == configured) {
+                    if (null == config) {
+                        config = Act.appConfig();
+                    }
+                    configured = config.unknownHttpMethodProcessor();
+                }
+            }
+        }
+        return configured;
+    }
+
     private Object readResolve() {
         return INSTANCE;
     }
diff --git a/src/main/java/act/handler/builtin/controller/ActionHandlerInvoker.java b/src/main/java/act/handler/builtin/controller/ActionHandlerInvoker.java
@@ -16,6 +16,8 @@ interface Visitor {}
 
     boolean sessionFree();
 
+    boolean express();
+
     CORS.Spec corsSpec();
 
     CSRF.Spec csrfSpec();
diff --git a/src/main/java/act/handler/builtin/controller/AfterInterceptorInvoker.java b/src/main/java/act/handler/builtin/controller/AfterInterceptorInvoker.java
@@ -12,4 +12,5 @@ public interface AfterInterceptorInvoker extends Prioritised, Destroyable {
 
     CORS.Spec corsSpec();
     boolean sessionFree();
+    boolean express();
 }
diff --git a/src/main/java/act/handler/builtin/controller/ControllerAction.java b/src/main/java/act/handler/builtin/controller/ControllerAction.java
@@ -36,6 +36,11 @@ public boolean sessionFree() {
         return handlerInvoker.sessionFree();
     }
 
+    @Override
+    public boolean express() {
+        return handlerInvoker.express();
+    }
+
     @Override
     public void accept(Visitor visitor) {
         handlerInvoker.accept(visitor.invokerVisitor());
diff --git a/src/main/java/act/handler/builtin/controller/ExceptionInterceptorInvoker.java b/src/main/java/act/handler/builtin/controller/ExceptionInterceptorInvoker.java
@@ -11,4 +11,5 @@ public interface ExceptionInterceptorInvoker extends Prioritised, Destroyable {
     void accept(ActionHandlerInvoker.Visitor visitor);
     CORS.Spec corsSpec();
     boolean sessionFree();
+    boolean express();
 }
diff --git a/src/main/java/act/handler/builtin/controller/FastRequestHandler.java b/src/main/java/act/handler/builtin/controller/FastRequestHandler.java
@@ -14,7 +14,11 @@ public abstract class FastRequestHandler extends RequestHandlerBase {
     public static final RequestHandler DUMB = new FastRequestHandler() {
         @Override
         public void handle(ActionContext context) {
+        }
 
+        @Override
+        public boolean express() {
+            return true;
         }
     };
 
diff --git a/src/main/java/act/handler/builtin/controller/Handler.java b/src/main/java/act/handler/builtin/controller/Handler.java
@@ -42,6 +42,8 @@ public void accept(Visitor visitor) {}
 
     public abstract boolean sessionFree();
 
+    public abstract boolean express();
+
     public interface Visitor {
         ActionHandlerInvoker.Visitor invokerVisitor();
     }
diff --git a/src/main/java/act/handler/builtin/controller/RequestHandlerProxy.java b/src/main/java/act/handler/builtin/controller/RequestHandlerProxy.java
diff --git a/src/main/java/act/handler/builtin/controller/impl/ReflectedHandlerInvoker.java b/src/main/java/act/handler/builtin/controller/impl/ReflectedHandlerInvoker.java
diff --git a/src/main/java/act/metric/MetricInfo.java b/src/main/java/act/metric/MetricInfo.java
diff --git a/src/main/java/act/route/RouteInfo.java b/src/main/java/act/route/RouteInfo.java
diff --git a/src/main/java/act/route/Router.java b/src/main/java/act/route/Router.java
diff --git a/src/main/java/act/xio/NetworkDispatcher.java b/src/main/java/act/xio/NetworkDispatcher.java
diff --git a/src/main/java/act/xio/NetworkHandler.java b/src/main/java/act/xio/NetworkHandler.java
diff --git a/src/main/java/act/xio/NetworkJob.java b/src/main/java/act/xio/NetworkJob.java
diff --git a/src/main/java/act/xio/undertow/ActHttpHandler.java b/src/main/java/act/xio/undertow/ActHttpHandler.java
diff --git a/src/test/java/act/controller/bytecode/ControllerEnhancerTest.java b/src/test/java/act/controller/bytecode/ControllerEnhancerTest.java

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,6 @@ private ActionContext(App app, H.Request request, H.Response response) {`
`85`	`85`	`this.disableCsrf = req().method().safe();`
`86`	`86`	`this.sessionKeyUsername = config.sessionKeyUsername();`
`87`	`87`	`this.localeResolver = new LocaleResolver(this);`
`88`		`- this.saveLocal();`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`public State state() {`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,9 @@ public AppConfig<T> app(App app) {`
`88`	`88`	`E.NPE(app);`
`89`	`89`	`this.app = app;`
`90`	`90`	`AppConfigKey.onApp(app);`
	`91`	`+ // preload some common used configurations`
	`92`	`+ sessionCookieName();`
	`93`	`+ sessionCookiePrefix();`
`91`	`94`	`return this;`
`92`	`95`	`}`
`93`	`96`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public abstract class UnknownHttpMethodProcessor implements Serializable {`
`14`	`14`
`15`	`15`	`public abstract Result handle(H.Method method);`
`16`	`16`
`17`		`- private static class NotAllowed extends UnknownHttpMethodProcessor {`
	`17`	`+ private static class NotAllowed extends UnknownHttpMethodProcessor implements ExpressHandler {`
`18`	`18`	`@Override`
`19`	`19`	`public Result handle(H.Method method) {`
`20`	`20`	`return MethodNotAllowed.INSTANCE;`
`@@ -25,7 +25,7 @@ private Object readResolve() {`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`- private static class NotImplemented extends UnknownHttpMethodProcessor {`
	`28`	`+ private static class NotImplemented extends UnknownHttpMethodProcessor implements ExpressHandler {`
`29`	`29`	`@Override`
`30`	`30`	`public Result handle(H.Method method) {`
`31`	`31`	`return org.osgl.mvc.result.NotImplemented.INSTANCE;`