Try reuse existing Netty pooled allocator singleton (Fixes #5168)

eclipse-vertx · Sep 1, 2024 · ca6c707 · ca6c707
1 parent 83c72a4
commit ca6c707
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/io/vertx/core/buffer/impl/VertxByteBufAllocator.java b/src/main/java/io/vertx/core/buffer/impl/VertxByteBufAllocator.java
@@ -22,11 +22,13 @@ public abstract class VertxByteBufAllocator extends AbstractByteBufAllocator {
   /**
    * Vert.x pooled allocator.
    */
-  public static final ByteBufAllocator POOLED_ALLOCATOR = new PooledByteBufAllocator(true);
+  public static final ByteBufAllocator POOLED_ALLOCATOR = !PooledByteBufAllocator.defaultPreferDirect() ?
+    PooledByteBufAllocator.DEFAULT : new PooledByteBufAllocator(true);
   /**
    * Vert.x shared unpooled allocator.
    */
-  public static final ByteBufAllocator UNPOOLED_ALLOCATOR = new UnpooledByteBufAllocator(false);
+  public static final ByteBufAllocator UNPOOLED_ALLOCATOR = !PooledByteBufAllocator.defaultPreferDirect() ?
+    UnpooledByteBufAllocator.DEFAULT : new UnpooledByteBufAllocator(false);
 
   private static final VertxByteBufAllocator UNSAFE_IMPL = new VertxByteBufAllocator() {
     @Override
@@ -42,6 +44,10 @@ protected ByteBuf newHeapBuffer(int initialCapacity, int maxCapacity) {
     }
   };
 
+  /**
+   * Vert.x shared unpooled allocator.<br>
+   * Differently from {@link #POOLED_ALLOCATOR}, its heap buffers are not reference counted.
+   */
   public static final VertxByteBufAllocator DEFAULT = PlatformDependent.hasUnsafe() ? UNSAFE_IMPL : IMPL;
 
   @Override

diff --git a/src/main/java/io/vertx/core/net/impl/TCPServerBase.java b/src/main/java/io/vertx/core/net/impl/TCPServerBase.java
@@ -26,6 +26,7 @@
 import io.vertx.core.Handler;
 import io.vertx.core.Promise;
 import io.vertx.core.buffer.impl.PartialPooledByteBufAllocator;
+import io.vertx.core.buffer.impl.VertxByteBufAllocator;
 import io.vertx.core.impl.ContextInternal;
 import io.vertx.core.impl.future.PromiseInternal;
 import io.vertx.core.impl.VertxInternal;
@@ -245,7 +246,7 @@ private synchronized Future<Channel> listen(SocketAddress localAddress, ContextI
             if (options.isSsl()) {
               bootstrap.childOption(ChannelOption.ALLOCATOR, PartialPooledByteBufAllocator.INSTANCE);
             } else {
-              bootstrap.childOption(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
+              bootstrap.childOption(ChannelOption.ALLOCATOR, VertxByteBufAllocator.POOLED_ALLOCATOR);
             }
 
             bootstrap.childHandler(channelBalancer);