performance: netty

- redo context selector on multiple apps
- nettystring fix hashcode implementation
- get back previous leak detector (OFF)
- rocker/fortunes tests remove composite buffer
- ref #3770

Author: jknack

jooby/src/main/java/io/jooby/Context.java

@@ -50,14 +50,13 @@ interface Selector {
     /**
      * Select an application base on context path prefix matching a provided path.
      *
-     * @param applications List of applications.
      * @param path Path to match.
      * @return Best match application.
      */
-    Jooby select(List<Jooby> applications, String path);
+    Jooby select(String path);
 
     static Selector create(List<Jooby> applications) {
-      return applications.size() == 1 ? single() : multiple();
+      return applications.size() == 1 ? single(applications.getFirst()) : multiple(applications);
     }
 
     /**
@@ -66,9 +65,9 @@ static Selector create(List<Jooby> applications) {
      *
      * @return Best match application.
      */
-    static Selector multiple() {
-      return (applications, path) -> {
-        var defaultApp = applications.get(0);
+    private static Selector multiple(List<Jooby> applications) {
+      return path -> {
+        var defaultApp = applications.getFirst();
         for (var app : applications) {
           var contextPath = app.getContextPath();
           if ("/".equals(contextPath)) {
@@ -81,8 +80,8 @@ static Selector multiple() {
       };
     }
 
-    private static Selector single() {
-      return (applications, path) -> applications.get(0);
+    private static Selector single(Jooby defaultApp) {
+      return path -> defaultApp;
     }
   }
 

modules/jooby-netty/src/main/java/io/jooby/internal/netty/HeadersMultiMap.java

@@ -80,7 +80,7 @@ public HeadersMultiMap(BiConsumer<CharSequence, CharSequence> validator) {
 
   public HeadersMultiMap add(CharSequence name, CharSequence value) {
     Objects.requireNonNull(value);
-    int h = AsciiString.hashCode(name);
+    int h = hashCode(name);
     int i = h & 0x0000000F;
     add0(h, i, name, value);
     return this;
@@ -102,7 +102,7 @@ public HeadersMultiMap add(String name, String strVal) {
 
   @Override
   public HeadersMultiMap add(CharSequence name, Iterable values) {
-    int h = AsciiString.hashCode(name);
+    int h = hashCode(name);
     int i = h & 0x0000000F;
     for (Object vstr : values) {
       add0(h, i, name, toValidCharSequence(vstr));
@@ -118,7 +118,7 @@ public HeadersMultiMap add(String name, Iterable values) {
   @Override
   public HeadersMultiMap remove(CharSequence name) {
     Objects.requireNonNull(name, "name");
-    int h = AsciiString.hashCode(name);
+    int h = hashCode(name);
     int i = h & 0x0000000F;
     remove0(h, i, name);
     return this;
@@ -151,7 +151,7 @@ public HeadersMultiMap set(CharSequence name, Object value) {
   public HeadersMultiMap set(CharSequence name, Iterable values) {
     Objects.requireNonNull(values, "values");
 
-    int h = AsciiString.hashCode(name);
+    int h = hashCode(name);
     int i = h & 0x0000000F;
 
     remove0(h, i, name);
@@ -182,7 +182,7 @@ public boolean contains(CharSequence name, CharSequence value, boolean ignoreCas
 
   private boolean containsInternal(
       CharSequence name, CharSequence value, boolean equals, boolean ignoreCase) {
-    int h = AsciiString.hashCode(name);
+    int h = hashCode(name);
     int i = h & 0x0000000F;
     HeadersMultiMap.MapEntry e = entries[i];
     while (e != null) {
@@ -257,7 +257,7 @@ public String get(String name) {
   public List<String> getAll(CharSequence name) {
     Objects.requireNonNull(name, "name");
     LinkedList<String> values = null;
-    int h = AsciiString.hashCode(name);
+    int h = hashCode(name);
     int i = h & 0x0000000F;
     HeadersMultiMap.MapEntry e = entries[i];
     while (e != null) {
@@ -606,7 +606,7 @@ private void add0(int h, int i, final CharSequence name, final CharSequence valu
   }
 
   private HeadersMultiMap set0(final CharSequence name, final CharSequence strVal) {
-    int h = AsciiString.hashCode(name);
+    int h = hashCode(name);
     int i = h & 0x0000000F;
     remove0(h, i, name);
     if (strVal != null) {
@@ -616,7 +616,7 @@ private HeadersMultiMap set0(final CharSequence name, final CharSequence strVal)
   }
 
   private CharSequence get0(CharSequence name) {
-    int h = AsciiString.hashCode(name);
+    int h = hashCode(name);
     int i = h & 0x0000000F;
     HeadersMultiMap.MapEntry e = entries[i];
     CharSequence value = null;
@@ -629,4 +629,8 @@ private CharSequence get0(CharSequence name) {
     }
     return value;
   }
+
+  private int hashCode(CharSequence value) {
+    return value instanceof NettyString str ? str.hashCode() : AsciiString.hashCode(value);
+  }
 }

modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyHandler.java

@@ -10,7 +10,6 @@
 import static io.netty.handler.codec.http.HttpUtil.isTransferEncodingChunked;
 
 import java.nio.charset.StandardCharsets;
-import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,9 +26,8 @@
 public class NettyHandler extends ChannelInboundHandlerAdapter {
   private final Logger log = LoggerFactory.getLogger(NettyServer.class);
   private final NettyDateService serverDate;
-  private final List<Jooby> applications;
   private Router router;
-  private final Context.Selector ctxSelector;
+  private final Context.Selector contextSelector;
   private final int bufferSize;
   private final boolean defaultHeaders;
   private final long maxRequestSize;
@@ -40,14 +38,13 @@ public class NettyHandler extends ChannelInboundHandlerAdapter {
 
   public NettyHandler(
       NettyDateService serverDate,
-      List<Jooby> applications,
+      Context.Selector contextSelector,
       long maxRequestSize,
       int bufferSize,
       boolean defaultHeaders,
       boolean http2) {
     this.serverDate = serverDate;
-    this.applications = applications;
-    this.ctxSelector = Context.Selector.create(applications);
+    this.contextSelector = contextSelector;
     this.maxRequestSize = maxRequestSize;
     this.bufferSize = bufferSize;
     this.defaultHeaders = defaultHeaders;
@@ -59,7 +56,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) {
     if (isHttpRequest(msg)) {
       var req = (HttpRequest) msg;
       var path = pathOnly(req.uri());
-      var app = ctxSelector.select(applications, path);
+      var app = contextSelector.select(path);
       this.router = app.getRouter();
 
       context = new NettyContext(ctx, req, app, path, bufferSize, http2);

modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyPipeline.java

@@ -5,11 +5,10 @@
  */
 package io.jooby.internal.netty;
 
-import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.function.Supplier;
 
-import io.jooby.Jooby;
+import io.jooby.Context;
 import io.jooby.internal.netty.http2.NettyHttp2Configurer;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOutboundHandler;
@@ -22,7 +21,7 @@ public class NettyPipeline extends ChannelInitializer<SocketChannel> {
   private static final String H2_HANDSHAKE = "h2-handshake";
   private final SslContext sslContext;
   private final HttpDecoderConfig decoderConfig;
-  private final List<Jooby> applications;
+  private final Context.Selector contextSelector;
   private final long maxRequestSize;
   private final int bufferSize;
   private final boolean defaultHeaders;
@@ -33,7 +32,7 @@ public class NettyPipeline extends ChannelInitializer<SocketChannel> {
   public NettyPipeline(
       SslContext sslContext,
       HttpDecoderConfig decoderConfig,
-      List<Jooby> applications,
+      Context.Selector contextSelector,
       long maxRequestSize,
       int bufferSize,
       boolean defaultHeaders,
@@ -42,7 +41,7 @@ public NettyPipeline(
       Integer compressionLevel) {
     this.sslContext = sslContext;
     this.decoderConfig = decoderConfig;
-    this.applications = applications;
+    this.contextSelector = contextSelector;
     this.maxRequestSize = maxRequestSize;
     this.bufferSize = bufferSize;
     this.defaultHeaders = defaultHeaders;
@@ -54,7 +53,7 @@ public NettyPipeline(
   private NettyHandler createHandler(ScheduledExecutorService executor) {
     return new NettyHandler(
         new NettyDateService(executor),
-        applications,
+        contextSelector,
         maxRequestSize,
         bufferSize,
         defaultHeaders,

modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyString.java

@@ -9,6 +9,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.jooby.MediaType;
+import io.netty.util.AsciiString;
 
 public class NettyString implements CharSequence {
   static final CharSequence server = NettyString.of("N");
@@ -23,11 +24,13 @@ public class NettyString implements CharSequence {
   final byte[] bytes;
   private final String value;
   private final int hashCode;
+  private final int length;
 
   public NettyString(String value) {
     this.value = value;
-    this.hashCode = value.hashCode();
+    this.hashCode = AsciiString.hashCode(value);
     this.bytes = value.getBytes(StandardCharsets.US_ASCII);
+    this.length = value.length();
   }
 
   public static NettyString of(String value) {
@@ -36,7 +39,7 @@ public static NettyString of(String value) {
 
   @Override
   public int length() {
-    return value.length();
+    return length;
   }
 
   @Override

modules/jooby-netty/src/main/java/io/jooby/netty/NettyServer.java

@@ -17,11 +17,7 @@
 import javax.net.ssl.SSLContext;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import io.jooby.Jooby;
-import io.jooby.Server;
-import io.jooby.ServerOptions;
-import io.jooby.SneakyThrows;
-import io.jooby.SslOptions;
+import io.jooby.*;
 import io.jooby.exception.StartupException;
 import io.jooby.internal.netty.*;
 import io.jooby.output.OutputFactory;
@@ -36,6 +32,7 @@
 import io.netty.handler.ssl.IdentityCipherSuiteFilter;
 import io.netty.handler.ssl.JdkSslContext;
 import io.netty.handler.ssl.SslContext;
+import io.netty.util.ResourceLeakDetector;
 import io.netty.util.concurrent.DefaultThreadFactory;
 
 /**
@@ -47,9 +44,15 @@
 public class NettyServer extends Server.Base {
 
   private static final String NAME = "netty";
+  private static final String LEAK_DETECTION = "io.netty.leakDetection.level";
 
   static {
     System.setProperty("__server_.name", NAME);
+    System.setProperty(
+        LEAK_DETECTION,
+        System.getProperty(LEAK_DETECTION, ResourceLeakDetector.Level.DISABLED.name()));
+    ResourceLeakDetector.setLevel(
+        ResourceLeakDetector.Level.valueOf(System.getProperty(LEAK_DETECTION)));
   }
 
   private NettyEventLoopGroup eventLoop;
@@ -208,7 +211,7 @@ private NettyPipeline newPipeline(ServerOptions options, SslContext sslContext,
     return new NettyPipeline(
         sslContext,
         decoderConfig,
-        applications,
+        Context.Selector.create(applications),
         options.getMaxRequestSize(),
         options.getOutput().getSize(),
         options.getDefaultHeaders(),

modules/jooby-rocker/src/main/java/io/jooby/rocker/BufferedRockerOutput.java

@@ -74,6 +74,6 @@ public Output asOutput() {
 
   static RockerOutputFactory<BufferedRockerOutput> factory(Charset charset, OutputFactory factory) {
     return (contentType, charsetName) ->
-        new BufferedRockerOutput(charset, contentType, factory.newComposite());
+        new BufferedRockerOutput(charset, contentType, factory.allocate());
   }
 }

modules/jooby-undertow/src/main/java/io/jooby/internal/undertow/UndertowHandler.java

@@ -6,7 +6,6 @@
 package io.jooby.internal.undertow;
 
 import java.nio.charset.StandardCharsets;
-import java.util.List;
 
 import io.jooby.*;
 import io.undertow.io.Receiver;
@@ -20,24 +19,25 @@
 import io.undertow.util.Headers;
 
 public class UndertowHandler implements HttpHandler {
-  protected final List<Jooby> applications;
   private final long maxRequestSize;
   private final int bufferSize;
   private final boolean defaultHeaders;
   private final Context.Selector ctxSelector;
 
   public UndertowHandler(
-      List<Jooby> applications, int bufferSize, long maxRequestSize, boolean defaultHeaders) {
-    this.applications = applications;
-    this.ctxSelector = Context.Selector.create(applications);
+      Context.Selector contextSelector,
+      int bufferSize,
+      long maxRequestSize,
+      boolean defaultHeaders) {
+    this.ctxSelector = contextSelector;
     this.maxRequestSize = maxRequestSize;
     this.bufferSize = bufferSize;
     this.defaultHeaders = defaultHeaders;
   }
 
   @Override
   public void handleRequest(HttpServerExchange exchange) throws Exception {
-    var router = ctxSelector.select(applications, exchange.getRequestPath());
+    var router = ctxSelector.select(exchange.getRequestPath());
     var context = new UndertowContext(exchange, router);
 
     /* default headers: */

modules/jooby-undertow/src/main/java/io/jooby/undertow/UndertowServer.java

@@ -16,11 +16,7 @@
 import org.xnio.*;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import io.jooby.Jooby;
-import io.jooby.Server;
-import io.jooby.ServerOptions;
-import io.jooby.SneakyThrows;
-import io.jooby.SslOptions;
+import io.jooby.*;
 import io.jooby.exception.StartupException;
 import io.jooby.internal.undertow.UndertowHandler;
 import io.jooby.internal.undertow.UndertowWebSocket;
@@ -100,7 +96,7 @@ public String getName() {
 
       HttpHandler handler =
           new UndertowHandler(
-              this.applications,
+              Context.Selector.create(applications),
               getOptions().getOutput().getSize(),
               options.getMaxRequestSize(),
               options.getDefaultHeaders());

tests/src/test/java/examples/Performance.java

@@ -43,10 +43,6 @@ public class Performance extends Jooby {
 
   public static void main(final String[] args) {
     System.setProperty("io.netty.disableHttpHeadersValidation", "true");
-    runApp(
-        args,
-        new NettyServer(new ServerOptions()).setSingleEventLoopGroup(true),
-        EVENT_LOOP,
-        Performance::new);
+    runApp(args, new NettyServer(new ServerOptions()), EVENT_LOOP, Performance::new);
   }
 }