Skip to content

Commit

Permalink
Try reuse existing Netty pooled allocator singleton (Fixes #5168)
Browse files Browse the repository at this point in the history
  • Loading branch information
franz1981 committed Sep 5, 2024
1 parent 83c72a4 commit 65e745d
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 3 deletions.
13 changes: 10 additions & 3 deletions src/main/java/io/vertx/core/buffer/impl/VertxByteBufAllocator.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@

public abstract class VertxByteBufAllocator extends AbstractByteBufAllocator {

private static final boolean REUSE_NETTY_ALLOCATOR = Boolean.getBoolean("vertx.reuseNettyAllocators");

/**
* Vert.x pooled allocator.
* Vert.x pooled allocator. It should prefers direct buffers, unless {@link PlatformDependent#hasUnsafe()} is {@code false}.
*/
public static final ByteBufAllocator POOLED_ALLOCATOR = new PooledByteBufAllocator(true);
public static final ByteBufAllocator POOLED_ALLOCATOR = (REUSE_NETTY_ALLOCATOR && PooledByteBufAllocator.defaultPreferDirect()) ?
PooledByteBufAllocator.DEFAULT : new PooledByteBufAllocator(true);
/**
* Vert.x shared unpooled allocator.
* Vert.x shared unpooled allocator. It prefers non-direct buffers.
*/
public static final ByteBufAllocator UNPOOLED_ALLOCATOR = new UnpooledByteBufAllocator(false);

Expand All @@ -42,6 +45,10 @@ protected ByteBuf newHeapBuffer(int initialCapacity, int maxCapacity) {
}
};

/**
* Vert.x shared unpooled heap buffers allocator.<br>
* Differently from {@link #UNPOOLED_ALLOCATOR}, its buffers are not reference-counted and array-backed.
*/
public static final VertxByteBufAllocator DEFAULT = PlatformDependent.hasUnsafe() ? UNSAFE_IMPL : IMPL;

@Override
Expand Down
1 change: 1 addition & 0 deletions src/main/java/io/vertx/core/net/impl/TCPServerBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* Copyright (c) 2011-2024 Contributors to the Eclipse Foundation
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
* which is available at https://www.apache.org/licenses/LICENSE-2.0.
*
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
*/

package io.vertx.core.buffer.impl;

import org.junit.Assert;
import org.junit.Test;

import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.PooledByteBufAllocator;

public class VertxByteBufAllocatorTest {


@Test
public void defaultShouldNotReuseExistingNettyPooledAllocators() {
Assert.assertNull(System.getProperty("vertx.reuseNettyAllocators"));
Assert.assertNotSame(PooledByteBufAllocator.DEFAULT, VertxByteBufAllocator.POOLED_ALLOCATOR);
Assert.assertNotSame(ByteBufAllocator.DEFAULT, VertxByteBufAllocator.POOLED_ALLOCATOR);
Assert.assertSame(ByteBufAllocator.DEFAULT, PooledByteBufAllocator.DEFAULT);
}

}

0 comments on commit 65e745d

Please sign in to comment.