Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

9.4.x: Improve ByteBufferPool implementations #6380

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -20,9 +20,9 @@

import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Deque;
import java.util.List;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Consumer;
Expand Down Expand Up @@ -154,7 +154,7 @@ public void release(ByteBuffer buffer)

class Bucket
{
private final Deque<ByteBuffer> _queue = new ConcurrentLinkedDeque<>();
private final Queue<ByteBuffer> _queue = new ConcurrentLinkedQueue<>();
private final ByteBufferPool _pool;
private final int _capacity;
private final int _maxSize;
Expand Down Expand Up @@ -232,7 +232,7 @@ void clear(Consumer<ByteBuffer> memoryFn)

private void queueOffer(ByteBuffer buffer)
{
_queue.offerFirst(buffer);
_queue.offer(buffer);
}

private ByteBuffer queuePoll()
Expand Down
@@ -0,0 +1,72 @@
//
// ========================================================================
// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//

package org.eclipse.jetty.util;

import java.nio.ByteBuffer;

import org.eclipse.jetty.io.ArrayByteBufferPool;
import org.eclipse.jetty.io.ByteBufferPool;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.TearDown;
import org.openjdk.jmh.runner.Runner;
import org.openjdk.jmh.runner.RunnerException;
import org.openjdk.jmh.runner.options.Options;
import org.openjdk.jmh.runner.options.OptionsBuilder;

@State(Scope.Benchmark)
public class ArrayByteBufferPoolBenchmark
{
private ByteBufferPool pool;

@Setup
public void setUp() throws Exception
{
pool = new ArrayByteBufferPool();
}

@TearDown
public void tearDown()
{
pool = null;
}

@Benchmark
public void testAcquireRelease()
{
ByteBuffer buffer = pool.acquire(2048, true);
pool.release(buffer);
}

public static void main(String[] args) throws RunnerException
{
Options opt = new OptionsBuilder()
.include(ArrayByteBufferPoolBenchmark.class.getSimpleName())
.warmupIterations(3)
.measurementIterations(3)
.forks(1)
.threads(8)
// .addProfiler(GCProfiler.class)
.build();

new Runner(opt).run();
}
}