Skip to content

Replacing OneToOneConcurrentArrayQueue with ArrayDeque since it is thread local #201

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

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/main/java/org/lmdbjava/DirectBufferProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
import static org.lmdbjava.UnsafeAccess.UNSAFE;

import java.nio.ByteBuffer;
import java.util.ArrayDeque;

import jnr.ffi.Pointer;
import org.agrona.DirectBuffer;
import org.agrona.MutableDirectBuffer;
import org.agrona.concurrent.OneToOneConcurrentArrayQueue;
import org.agrona.concurrent.UnsafeBuffer;

/**
Expand All @@ -55,8 +55,8 @@ public final class DirectBufferProxy extends BufferProxy<DirectBuffer> {
* of a negative length) then that buffer is used. If no valid buffer is
* found, a new buffer is created.
*/
private static final ThreadLocal<OneToOneConcurrentArrayQueue<DirectBuffer>> BUFFERS
= withInitial(() -> new OneToOneConcurrentArrayQueue<>(16));
private static final ThreadLocal<ArrayDeque<DirectBuffer>> BUFFERS
= withInitial(() -> new ArrayDeque<>(16));

private DirectBufferProxy() {
}
Expand Down Expand Up @@ -100,7 +100,7 @@ public static int compareBuff(final DirectBuffer o1, final DirectBuffer o2) {

@Override
protected DirectBuffer allocate() {
final OneToOneConcurrentArrayQueue<DirectBuffer> q = BUFFERS.get();
final ArrayDeque<DirectBuffer> q = BUFFERS.get();
final DirectBuffer buffer = q.poll();

if (buffer != null && buffer.capacity() >= 0) {
Expand All @@ -118,7 +118,7 @@ protected int compare(final DirectBuffer o1, final DirectBuffer o2) {

@Override
protected void deallocate(final DirectBuffer buff) {
final OneToOneConcurrentArrayQueue<DirectBuffer> q = BUFFERS.get();
final ArrayDeque<DirectBuffer> q = BUFFERS.get();
q.offer(buff);
}

Expand Down