From 14aed00b0f8c504f202048904414f8865340f6b1 Mon Sep 17 00:00:00 2001 From: Brett Okken Date: Thu, 24 Oct 2019 12:37:57 -0500 Subject: [PATCH 1/3] https://github.com/xerial/snappy-java/issues/233 Pool byte[] and direct ByteBuffer instances for reuse by Framed implementation. --- .../java/org/xerial/snappy/SnappyFramed.java | 139 ----------- .../snappy/SnappyFramedInputStream.java | 107 +++++++-- .../snappy/SnappyFramedOutputStream.java | 68 +++++- .../org/xerial/snappy/pool/BufferPool.java | 48 ++++ .../xerial/snappy/pool/CachingBufferPool.java | 216 ++++++++++++++++++ .../snappy/pool/DefaultPoolFactory.java | 37 +++ .../xerial/snappy/pool/DirectByteBuffers.java | 150 ++++++++++++ .../snappy/pool/QuiescentBufferPool.java | 55 +++++ .../snappy/pool/CachingBufferPoolTest.java | 184 +++++++++++++++ 9 files changed, 838 insertions(+), 166 deletions(-) create mode 100644 src/main/java/org/xerial/snappy/pool/BufferPool.java create mode 100644 src/main/java/org/xerial/snappy/pool/CachingBufferPool.java create mode 100644 src/main/java/org/xerial/snappy/pool/DefaultPoolFactory.java create mode 100644 src/main/java/org/xerial/snappy/pool/DirectByteBuffers.java create mode 100644 src/main/java/org/xerial/snappy/pool/QuiescentBufferPool.java create mode 100644 src/test/java/org/xerial/snappy/pool/CachingBufferPoolTest.java diff --git a/src/main/java/org/xerial/snappy/SnappyFramed.java b/src/main/java/org/xerial/snappy/SnappyFramed.java index 97f01473..df8a82d5 100644 --- a/src/main/java/org/xerial/snappy/SnappyFramed.java +++ b/src/main/java/org/xerial/snappy/SnappyFramed.java @@ -3,24 +3,9 @@ */ package org.xerial.snappy; -import static java.lang.invoke.MethodHandles.constant; -import static java.lang.invoke.MethodHandles.dropArguments; -import static java.lang.invoke.MethodHandles.filterReturnValue; -import static java.lang.invoke.MethodHandles.guardWithTest; -import static java.lang.invoke.MethodHandles.lookup; -import static java.lang.invoke.MethodType.methodType; - import java.io.IOException; -import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles.Lookup; -import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; -import java.security.AccessController; -import java.security.PrivilegedExceptionAction; -import java.util.logging.Level; -import java.util.logging.Logger; /** * Constants and utilities for implementing x-snappy-framed. @@ -38,82 +23,6 @@ final class SnappyFramed private static final int MASK_DELTA = 0xa282ead8; - /** - * Sun specific mechanisms to clean up resources associated with direct byte buffers. - */ - @SuppressWarnings("unchecked") - static final Class DIRECT_BUFFER_CLAZZ = (Class) lookupClassQuietly("java.nio.DirectByteBuffer"); - - static final MethodHandle CLEAN_HANDLE; - - static { - // this approach is based off that used by apache lucene and documented here: https://issues.apache.org/jira/browse/LUCENE-6989 - // and https://github.com/apache/lucene-solr/blob/7e03427fa14a024ce257babcb8362d2451941e21/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java - MethodHandle cleanHandle = null; - try { - final PrivilegedExceptionAction action = new PrivilegedExceptionAction() { - - @Override - public MethodHandle run() throws Exception { - MethodHandle handle = null; - if (DIRECT_BUFFER_CLAZZ != null) { - final Lookup lookup = lookup(); - - try { - // sun.misc.Unsafe unmapping (Java 9+) - final Class unsafeClass = Class.forName("sun.misc.Unsafe"); - // first check if Unsafe has the right method, otherwise we can give up - // without doing any security critical stuff: - final MethodHandle unmapper = lookup.findVirtual(unsafeClass, "invokeCleaner", methodType(void.class, ByteBuffer.class)); - // fetch the unsafe instance and bind it to the virtual MH: - final Field f = unsafeClass.getDeclaredField("theUnsafe"); - f.setAccessible(true); - final Object theUnsafe = f.get(null); - handle = unmapper.bindTo(theUnsafe); - } catch (Exception e) { - Logger.getLogger(SnappyFramed.class.getName()).log(Level.FINE, "unable to use java 9 Unsafe.invokeCleaner", e); - - // sun.misc.Cleaner unmapping (Java 8 and older) - final Method m = DIRECT_BUFFER_CLAZZ.getMethod("cleaner"); - m.setAccessible(true); - final MethodHandle directBufferCleanerMethod = lookup.unreflect(m); - final Class cleanerClass = directBufferCleanerMethod.type().returnType(); - - /* - * "Compile" a MethodHandle that basically is equivalent to the following code: - * void unmapper(ByteBuffer byteBuffer) - * { - * sun.misc.Cleaner cleaner = ((java.nio.DirectByteBuffer) byteBuffer).cleaner(); - * if (nonNull(cleaner)) - * { - * cleaner.clean(); - * } - * else - * { - * // the noop is needed because MethodHandles#guardWithTest always needs ELSE - * noop(cleaner); - * } - * } - */ - final MethodHandle cleanMethod = lookup.findVirtual(cleanerClass, "clean", methodType(void.class)); - final MethodHandle nonNullTest = lookup.findStatic(SnappyFramed.class, "nonNull", methodType(boolean.class, Object.class)).asType(methodType(boolean.class, cleanerClass)); - final MethodHandle noop = dropArguments(constant(Void.class, null).asType(methodType(void.class)), 0, cleanerClass); - handle = filterReturnValue(directBufferCleanerMethod, guardWithTest(nonNullTest, cleanMethod, noop)).asType(methodType(void.class, ByteBuffer.class)); - } - } - - return handle; - } - }; - - cleanHandle = AccessController.doPrivileged(action); - - } catch (Throwable t) { - Logger.getLogger(SnappyFramed.class.getName()).log(Level.FINE, "Exception occurred attempting to lookup Sun specific DirectByteBuffer cleaner classes.", t); - } - CLEAN_HANDLE = cleanHandle; - } - /** * The header consists of the stream identifier flag, 3 bytes indicating a * length of 6, and "sNaPpY" in ASCII. @@ -213,52 +122,4 @@ static int skip(final ReadableByteChannel source, final int skip, final ByteBuff buffer.clear(); return skip - toSkip; } - - private static Class lookupClassQuietly(String name) - { - try { - return SnappyFramed.class.getClassLoader().loadClass(name); - } - catch (Throwable t) { - Logger.getLogger(SnappyFramed.class.getName()).log(Level.FINE, "Did not find requested class: " + name, t); - } - - return null; - } - - /** - * Provides jvm implementation specific operation to aggressively release resources associated with buffer. - * - * @param buffer The {@code ByteBuffer} to release. Must not be {@code null}. Must be {@link ByteBuffer#isDirect() direct}. - */ - static void releaseDirectByteBuffer(final ByteBuffer buffer) - { - assert buffer != null && buffer.isDirect(); - - if (CLEAN_HANDLE != null && DIRECT_BUFFER_CLAZZ.isInstance(buffer)) { - try { - final PrivilegedExceptionAction pea = new PrivilegedExceptionAction() { - @Override - public Void run() throws Exception { - try { - CLEAN_HANDLE.invokeExact(buffer); - } catch (Exception e) { - throw e; - } catch (Throwable t) { - //this will be an error - throw new RuntimeException(t); - } - return null; - } - }; - AccessController.doPrivileged(pea); - } catch (Throwable t) { - Logger.getLogger(SnappyFramed.class.getName()).log(Level.FINE, "Exception occurred attempting to clean up Sun specific DirectByteBuffer.", t); - } - } - } - - static boolean nonNull(Object o) { - return o != null; - } } diff --git a/src/main/java/org/xerial/snappy/SnappyFramedInputStream.java b/src/main/java/org/xerial/snappy/SnappyFramedInputStream.java index 21eb30c8..8be6cbb0 100644 --- a/src/main/java/org/xerial/snappy/SnappyFramedInputStream.java +++ b/src/main/java/org/xerial/snappy/SnappyFramedInputStream.java @@ -9,7 +9,6 @@ import static org.xerial.snappy.SnappyFramed.STREAM_IDENTIFIER_FLAG; import static org.xerial.snappy.SnappyFramed.UNCOMPRESSED_DATA_FLAG; import static org.xerial.snappy.SnappyFramed.readBytes; -import static org.xerial.snappy.SnappyFramed.releaseDirectByteBuffer; import static org.xerial.snappy.SnappyFramedOutputStream.MAX_BLOCK_SIZE; import java.io.EOFException; @@ -23,6 +22,9 @@ import java.nio.channels.WritableByteChannel; import java.util.Arrays; +import org.xerial.snappy.pool.BufferPool; +import org.xerial.snappy.pool.DefaultPoolFactory; + /** * Implements the uncompressedDirect.capacity()) { - uncompressedDirect = ByteBuffer - .allocateDirect(uncompressedLength); - buffer = new byte[Math.max(input.capacity(), uncompressedLength)]; + bufferPool.releaseDirect(uncompressedDirect); + bufferPool.releaseArray(buffer); + uncompressedDirect = bufferPool.allocateDirect(uncompressedLength); + buffer = bufferPool.allocateArray(uncompressedLength); } uncompressedDirect.clear(); diff --git a/src/main/java/org/xerial/snappy/SnappyFramedOutputStream.java b/src/main/java/org/xerial/snappy/SnappyFramedOutputStream.java index 7d4d1a7e..6d17776e 100644 --- a/src/main/java/org/xerial/snappy/SnappyFramedOutputStream.java +++ b/src/main/java/org/xerial/snappy/SnappyFramedOutputStream.java @@ -7,7 +7,6 @@ import static org.xerial.snappy.SnappyFramed.HEADER_BYTES; import static org.xerial.snappy.SnappyFramed.UNCOMPRESSED_DATA_FLAG; import static org.xerial.snappy.SnappyFramed.maskedCrc32c; -import static org.xerial.snappy.SnappyFramed.releaseDirectByteBuffer; import java.io.IOException; import java.io.InputStream; @@ -19,6 +18,9 @@ import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; +import org.xerial.snappy.pool.BufferPool; +import org.xerial.snappy.pool.DefaultPoolFactory; + /** * Implements the out. Must be in (0, 65536]. + * @param minCompressionRatio Defines the minimum compression ratio ( + * {@code compressedLength / rawLength}) that must be achieved to + * write the compressed data. This must be in (0, 1.0]. + * @throws IOException + * @since 1.1.1 + */ + public SnappyFramedOutputStream(WritableByteChannel out, int blockSize, + double minCompressionRatio, BufferPool bufferPool) + throws IOException { if (out == null) { - throw new NullPointerException(); + throw new NullPointerException("out is null"); + } + + if (bufferPool == null) { + throw new NullPointerException("buffer pool is null"); } if (minCompressionRatio <= 0 || minCompressionRatio > 1.0) { @@ -147,12 +194,14 @@ public SnappyFramedOutputStream(WritableByteChannel out, int blockSize, throw new IllegalArgumentException("block size " + blockSize + " must be in (0, 65536]"); } - + this.blockSize = blockSize; this.out = out; this.minCompressionRatio = minCompressionRatio; - buffer = ByteBuffer.allocate(blockSize); - directInputBuffer = ByteBuffer.allocateDirect(blockSize); - outputBuffer = ByteBuffer.allocateDirect(Snappy + + this.bufferPool = bufferPool; + buffer = ByteBuffer.wrap(bufferPool.allocateArray(blockSize), 0, blockSize); + directInputBuffer = bufferPool.allocateDirect(blockSize); + outputBuffer = bufferPool.allocateDirect(Snappy .maxCompressedLength(blockSize)); writeHeader(out); @@ -370,9 +419,9 @@ public final void close() } finally { closed = true; - - releaseDirectByteBuffer(directInputBuffer); - releaseDirectByteBuffer(outputBuffer); + bufferPool.releaseArray(buffer.array()); + bufferPool.releaseDirect(directInputBuffer); + bufferPool.releaseDirect(outputBuffer); } } @@ -389,6 +438,7 @@ private void flushBuffer() buffer.flip(); writeCompressed(buffer); buffer.clear(); + buffer.limit(blockSize); } } diff --git a/src/main/java/org/xerial/snappy/pool/BufferPool.java b/src/main/java/org/xerial/snappy/pool/BufferPool.java new file mode 100644 index 00000000..bf21198f --- /dev/null +++ b/src/main/java/org/xerial/snappy/pool/BufferPool.java @@ -0,0 +1,48 @@ +package org.xerial.snappy.pool; + +import java.nio.ByteBuffer; + +/** + * Makes various types of buffers available for use and potential re-use. + * @author Brett Okken + */ +public interface BufferPool { + + /** + * Returns a {@code byte[]} of size or greater length. + * @param size The minimum size array required. Must be {@code >= 0}. + * @return A {@code byte[]} with length of at least size. + * @see #releaseArray(byte[]) + */ + public byte[] allocateArray(int size); + + /** + * Returns instance to pool for potential future reuse. + *

+ * Must not be returned more than 1 time. Must not be used by caller after return. + *

+ * @param buffer Instance to return to pool. Must not be {@code null}. + * Must not be returned more than 1 time. Must not be used by caller after return. + */ + public void releaseArray(byte[] buffer); + + /** + * Returns a {@link ByteBuffer#allocateDirect(int) direct ByteBuffer} of size or + * greater {@link ByteBuffer#capacity() capacity}. + * @param size The minimum size buffer required. Must be {@code >= 0}. + * @return A {@code ByteBuffer} of size or greater {@link ByteBuffer#capacity() capacity}. + * @see #releaseDirect(ByteBuffer) + * @see ByteBuffer#allocateDirect(int) + */ + public ByteBuffer allocateDirect(int size); + + /** + * Returns instance to pool for potential future reuse. + *

+ * Must not be returned more than 1 time. Must not be used by caller after return. + *

+ * @param buffer Instance to return to pool. Must not be {@code null}. + * Must not be returned more than 1 time. Must not be used by caller after return. + */ + public void releaseDirect(ByteBuffer buffer); +} diff --git a/src/main/java/org/xerial/snappy/pool/CachingBufferPool.java b/src/main/java/org/xerial/snappy/pool/CachingBufferPool.java new file mode 100644 index 00000000..7f0665ad --- /dev/null +++ b/src/main/java/org/xerial/snappy/pool/CachingBufferPool.java @@ -0,0 +1,216 @@ +package org.xerial.snappy.pool; + +import java.lang.ref.SoftReference; +import java.nio.ByteBuffer; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedDeque; +import java.util.concurrent.ConcurrentMap; + +import com.google.common.annotations.VisibleForTesting; + +/** + * A {@link BufferPool} implementation which caches values at fixed sizes. + *

+ * Pooled instances are held as {@link SoftReference} to allow GC if necessary. + *

+ *

+ * The current fixed sizes are calculated as follows: + *

    + *
  • Values < 4KB return 4KB
    • + *
  • 4KB - 32KB to 2KB
    • + *
  • 32KB - 512KB to 16KB
    • + *
  • 512KB - 2MB to 128KB
    • + *
  • 2MB - 16MB to 512KB
    • + *
  • 16MB - 128MB to 4MB
    • + *
  • 128MB - 512MB to 16MB
    • + *
  • 512MB - 1.5 GB to 128MB
    • + *
  • Values > 1.5GB return {@link Integer#MAX_VALUE}
    • + *
+ *

+ * @author Brett Okken + */ +public final class CachingBufferPool implements BufferPool { + + private static interface IntFunction { + public E create(int size); + } + + private static final IntFunction ARRAY_FUNCTION = new IntFunction() { + @Override + public byte[] create(int size) { + return new byte[size]; + } + }; + + private static final IntFunction DBB_FUNCTION = new IntFunction() { + @Override + public ByteBuffer create(int size) { + return ByteBuffer.allocateDirect(size); + } + }; + + private static final CachingBufferPool INSTANCE = new CachingBufferPool(); + + private final ConcurrentMap>> bytes = new ConcurrentHashMap<>(); + private final ConcurrentMap>> buffers = new ConcurrentHashMap<>(); + + private CachingBufferPool() { + } + + /** + * Returns instance of {@link CachingBufferPool} for using cached buffers. + * @return instance of {@link CachingBufferPool} for using cached buffers. + */ + public static BufferPool getInstance() { + return INSTANCE; + } + + /** + * {@inheritDoc} + */ + @Override + public byte[] allocateArray(int size) { + if (size <= 0) { + throw new IllegalArgumentException("size is invalid: " + size); + } + + return getOrCreate(size, bytes, ARRAY_FUNCTION); + } + + /** + * {@inheritDoc} + */ + @Override + public void releaseArray(byte[] buffer) { + if (buffer == null) { + throw new IllegalArgumentException("buffer is null"); + } + returnValue(buffer, buffer.length, bytes); + } + + /** + * {@inheritDoc} + */ + @Override + public ByteBuffer allocateDirect(int size) { + if (size <= 0) { + throw new IllegalArgumentException("size is invalid: " + size); + } + + return getOrCreate(size, buffers, DBB_FUNCTION); + } + + /** + * {@inheritDoc} + */ + @Override + public void releaseDirect(ByteBuffer buffer) { + if (buffer == null) { + throw new IllegalArgumentException("buffer is null"); + } + buffer.clear(); + returnValue(buffer, buffer.capacity(), buffers); + } + + private static E getOrCreate(final int size, final ConcurrentMap>> map, final IntFunction creator) { + assert size > 0; + final int adjustedSize = adjustSize(size); + final ConcurrentLinkedDeque> queue = optimisticGetEntry(adjustedSize, map); + SoftReference entry; + while ((entry = queue.pollFirst()) != null) { + final E val = entry.get(); + if (val != null) { + return val; + } + } + + return creator.create(adjustedSize); + } + + @VisibleForTesting + static int adjustSize(int size) { + assert size > 0; + + switch (Integer.numberOfLeadingZeros(size)) { + case 1: // 1GB - 2GB + case 2: // 512MB + //if 512MB - 1.5 GB round to nearest 128 MB (2^27), else Integer.MAX_VALUE + return size <= 0x6000_0000 ? roundToPowers(size, 27) : Integer.MAX_VALUE; + case 3: //256MB + case 4: //128MB + //if 128MB - 512MB, round to nearest 16 MB + return roundToPowers(size, 24); + case 5: // 64MB + case 6: // 32MB + case 7: // 16MB + //if 16MB - 128MB, round to nearest 4MB + return roundToPowers(size, 22); + case 8: // 8MB + case 9: // 4MB + case 10: // 2MB + //if 2MB - 16MB, round to nearest 512KB + return roundToPowers(size, 19); + case 11: // 1MB + case 12: //512KB + //if 512KB - 2MB, round to nearest 128KB + return roundToPowers(size, 17); + case 13: //256KB + case 14: //128KB + case 15: // 64KB + case 16: // 32KB + //if 32KB to 512KB, round to nearest 16KB + return roundToPowers(size, 14); + case 17: // 16KB + case 18: // 8KB + case 19: // 4KB + // if 4KB - 32KB, round to nearest 2KB + return roundToPowers(size, 11); + default: + return 4 * 1024; + } + } + + private static int roundToPowers(int number, int bits) { + final int mask = (0x7FFF_FFFF >> bits) << bits; + final int floor = number & mask; + return floor == number ? number : floor + (1 << bits); + } + + private static ConcurrentLinkedDeque> optimisticGetEntry(Integer key, ConcurrentMap>> map) { + ConcurrentLinkedDeque> val = map.get(key); + if (val == null) { + map.putIfAbsent(key, new ConcurrentLinkedDeque>()); + val = map.get(key); + } + return val; + } + + private static void returnValue(E value, Integer size, ConcurrentMap>> map) { + final ConcurrentLinkedDeque> queue = map.get(size); + //no queue will exist if buffer was not originally obtained from this class + if (queue != null) { + //push this value onto deque first so that concurrent request can use it + queue.addFirst(new SoftReference(value)); + + //purge oldest entries have lost references + SoftReference entry; + boolean lastEmpty = true; + while(lastEmpty && (entry = queue.peekLast()) != null) { + if (entry.get() == null) { + queue.removeLastOccurrence(entry); + } else { + lastEmpty = false; + } + } + } + } + + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return "CachingBufferPool [bytes=" + this.bytes + ", buffers=" + this.buffers + "]"; + } +} + diff --git a/src/main/java/org/xerial/snappy/pool/DefaultPoolFactory.java b/src/main/java/org/xerial/snappy/pool/DefaultPoolFactory.java new file mode 100644 index 00000000..fc9447c1 --- /dev/null +++ b/src/main/java/org/xerial/snappy/pool/DefaultPoolFactory.java @@ -0,0 +1,37 @@ +package org.xerial.snappy.pool; + +/** + * Manages implementation of {@link BufferPool} to use by default. Setting the system property {@link #DISABLE_CACHING_PROPERTY} to {@code true} will + * cause the {@link QuiescentBufferPool} to be used by default. Otherwise, {@link CachingBufferPool} will be used by default. + * {@link #setDefaultPool(BufferPool)} can be used to explicitly control the implementation to use. + */ +public final class DefaultPoolFactory { + + /** + * Name of system property to disable use of {@link CachingBufferPool} by default. + */ + public static final String DISABLE_CACHING_PROPERTY = "org.xerial.snappy.pool.disable"; + + private static volatile BufferPool defaultPool = "true".equalsIgnoreCase(System.getProperty(DISABLE_CACHING_PROPERTY)) + ? QuiescentBufferPool.getInstance() + : CachingBufferPool.getInstance(); + + /** + * @return The default instance to use. + */ + public static BufferPool getDefaultPool() { + return defaultPool; + } + + /** + * Sets the default instance to use. + * @param pool The default instance to use. Must not be {@code null}. + * @see #getDefaultPool() + */ + public static void setDefaultPool(BufferPool pool) { + if (pool == null) { + throw new IllegalArgumentException("pool is null"); + } + defaultPool = pool; + } +} diff --git a/src/main/java/org/xerial/snappy/pool/DirectByteBuffers.java b/src/main/java/org/xerial/snappy/pool/DirectByteBuffers.java new file mode 100644 index 00000000..2d77ed86 --- /dev/null +++ b/src/main/java/org/xerial/snappy/pool/DirectByteBuffers.java @@ -0,0 +1,150 @@ +package org.xerial.snappy.pool; + +import static java.lang.invoke.MethodHandles.constant; +import static java.lang.invoke.MethodHandles.dropArguments; +import static java.lang.invoke.MethodHandles.filterReturnValue; +import static java.lang.invoke.MethodHandles.guardWithTest; +import static java.lang.invoke.MethodHandles.lookup; +import static java.lang.invoke.MethodType.methodType; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles.Lookup; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.nio.ByteBuffer; +import java.security.AccessController; +import java.security.PrivilegedExceptionAction; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * Utility to facilitate disposing of direct byte buffer instances. + */ +final class DirectByteBuffers { + + /** + * Sun specific mechanisms to clean up resources associated with direct byte buffers. + */ + @SuppressWarnings("unchecked") + static final Class DIRECT_BUFFER_CLAZZ = (Class) lookupClassQuietly("java.nio.DirectByteBuffer"); + + static final MethodHandle CLEAN_HANDLE; + + static { + // this approach is based off that used by apache lucene and documented here: https://issues.apache.org/jira/browse/LUCENE-6989 + // and https://github.com/apache/lucene-solr/blob/7e03427fa14a024ce257babcb8362d2451941e21/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java + MethodHandle cleanHandle = null; + try { + final PrivilegedExceptionAction action = new PrivilegedExceptionAction() { + + @Override + public MethodHandle run() throws Exception { + MethodHandle handle = null; + if (DIRECT_BUFFER_CLAZZ != null) { + final Lookup lookup = lookup(); + + try { + // sun.misc.Unsafe unmapping (Java 9+) + final Class unsafeClass = Class.forName("sun.misc.Unsafe"); + // first check if Unsafe has the right method, otherwise we can give up + // without doing any security critical stuff: + final MethodHandle unmapper = lookup.findVirtual(unsafeClass, "invokeCleaner", methodType(void.class, ByteBuffer.class)); + // fetch the unsafe instance and bind it to the virtual MH: + final Field f = unsafeClass.getDeclaredField("theUnsafe"); + f.setAccessible(true); + final Object theUnsafe = f.get(null); + handle = unmapper.bindTo(theUnsafe); + } catch (Exception e) { + Logger.getLogger(DirectByteBuffers.class.getName()).log(Level.FINE, "unable to use java 9 Unsafe.invokeCleaner", e); + + // sun.misc.Cleaner unmapping (Java 8 and older) + final Method m = DIRECT_BUFFER_CLAZZ.getMethod("cleaner"); + m.setAccessible(true); + final MethodHandle directBufferCleanerMethod = lookup.unreflect(m); + final Class cleanerClass = directBufferCleanerMethod.type().returnType(); + + /* + * "Compile" a MethodHandle that basically is equivalent to the following code: + * void unmapper(ByteBuffer byteBuffer) + * { + * sun.misc.Cleaner cleaner = ((java.nio.DirectByteBuffer) byteBuffer).cleaner(); + * if (nonNull(cleaner)) + * { + * cleaner.clean(); + * } + * else + * { + * // the noop is needed because MethodHandles#guardWithTest always needs ELSE + * noop(cleaner); + * } + * } + */ + final MethodHandle cleanMethod = lookup.findVirtual(cleanerClass, "clean", methodType(void.class)); + final MethodHandle nonNullTest = lookup.findStatic(DirectByteBuffers.class, "nonNull", methodType(boolean.class, Object.class)).asType(methodType(boolean.class, cleanerClass)); + final MethodHandle noop = dropArguments(constant(Void.class, null).asType(methodType(void.class)), 0, cleanerClass); + handle = filterReturnValue(directBufferCleanerMethod, guardWithTest(nonNullTest, cleanMethod, noop)).asType(methodType(void.class, ByteBuffer.class)); + } + } + + return handle; + } + }; + + cleanHandle = AccessController.doPrivileged(action); + + } catch (Throwable t) { + Logger.getLogger(DirectByteBuffers.class.getName()).log(Level.FINE, "Exception occurred attempting to lookup Sun specific DirectByteBuffer cleaner classes.", t); + } + CLEAN_HANDLE = cleanHandle; + } + + + private static Class lookupClassQuietly(String name) + { + try { + return DirectByteBuffers.class.getClassLoader().loadClass(name); + } + catch (Throwable t) { + Logger.getLogger(DirectByteBuffers.class.getName()).log(Level.FINE, "Did not find requested class: " + name, t); + } + + return null; + } + + + static boolean nonNull(Object o) { + return o != null; + } + + /** + * Provides jvm implementation specific operation to aggressively release resources associated with buffer. + * + * @param buffer The {@code ByteBuffer} to release. Must not be {@code null}. Must be {@link ByteBuffer#isDirect() direct}. + */ + public static void releaseDirectByteBuffer(final ByteBuffer buffer) + { + assert buffer != null && buffer.isDirect(); + + if (CLEAN_HANDLE != null && DIRECT_BUFFER_CLAZZ.isInstance(buffer)) { + try { + final PrivilegedExceptionAction pea = new PrivilegedExceptionAction() { + @Override + public Void run() throws Exception { + try { + CLEAN_HANDLE.invokeExact(buffer); + } catch (Exception e) { + throw e; + } catch (Throwable t) { + //this will be an error + throw new RuntimeException(t); + } + return null; + } + }; + AccessController.doPrivileged(pea); + } catch (Throwable t) { + Logger.getLogger(DirectByteBuffers.class.getName()).log(Level.FINE, "Exception occurred attempting to clean up Sun specific DirectByteBuffer.", t); + } + } + } +} diff --git a/src/main/java/org/xerial/snappy/pool/QuiescentBufferPool.java b/src/main/java/org/xerial/snappy/pool/QuiescentBufferPool.java new file mode 100644 index 00000000..8a5c4896 --- /dev/null +++ b/src/main/java/org/xerial/snappy/pool/QuiescentBufferPool.java @@ -0,0 +1,55 @@ +package org.xerial.snappy.pool; + +import java.nio.ByteBuffer; + +/** + * A {@link BufferPool} implementation which does no pooling. New instances will be created for each call to allocate. + * @author Brett Okken + */ +public final class QuiescentBufferPool implements BufferPool { + + private static final QuiescentBufferPool INSTANCE = new QuiescentBufferPool(); + + private QuiescentBufferPool() { + } + + /** + * @return Instance of {@link BufferPool} which does no caching/reuse of instances. + */ + public static BufferPool getInstance() { + return INSTANCE; + } + + /** + * Creates a new {@code byte[]} of size. + */ + @Override + public byte[] allocateArray(int size) { + return new byte[size]; + } + + /** + * Does nothing. + */ + @Override + public void releaseArray(byte[] buffer) { + } + + /** + * {@link ByteBuffer#allocateDirect(int) Allocates} a direct {@link ByteBuffer} of size. + */ + @Override + public ByteBuffer allocateDirect(int size) { + return ByteBuffer.allocateDirect(size); + } + + /** + * Aggressively releases native resources associated with buffer. + */ + @Override + public void releaseDirect(ByteBuffer buffer) { + assert buffer != null && buffer.isDirect(); + DirectByteBuffers.releaseDirectByteBuffer(buffer); + } + +} diff --git a/src/test/java/org/xerial/snappy/pool/CachingBufferPoolTest.java b/src/test/java/org/xerial/snappy/pool/CachingBufferPoolTest.java new file mode 100644 index 00000000..af51f4ab --- /dev/null +++ b/src/test/java/org/xerial/snappy/pool/CachingBufferPoolTest.java @@ -0,0 +1,184 @@ +package org.xerial.snappy.pool; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + +import java.lang.ref.Reference; +import java.lang.ref.WeakReference; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; + +import org.junit.Test; + + +public class CachingBufferPoolTest { + + private static final int LIST_COUNT = 2048; + + @Test + public void testAdjustSize() { + assertEquals(4 * 1024, CachingBufferPool.adjustSize(2)); + assertEquals(4 * 1024, CachingBufferPool.adjustSize(1023)); + assertEquals(4 * 1024, CachingBufferPool.adjustSize(1024)); + assertEquals(4 * 1024, CachingBufferPool.adjustSize(1025)); + assertEquals(4 * 1024, CachingBufferPool.adjustSize(4 * 1024)); + assertEquals((4 + 2) * 1024, CachingBufferPool.adjustSize((4 * 1024) + 1)); + assertEquals(6 * 1024, CachingBufferPool.adjustSize(5 * 1024)); + assertEquals(6 * 1024, CachingBufferPool.adjustSize((5 * 1024) + 1)); + + assertEquals(32 * 1024, CachingBufferPool.adjustSize(32 * 1024)); + assertEquals((32 + 16) * 1024, CachingBufferPool.adjustSize((32 * 1024) + 1)); + + assertEquals(2 * 1024 * 1024, CachingBufferPool.adjustSize(2 * 1024 * 1024)); + assertEquals(((2 * 1024) + 512) * 1024, CachingBufferPool.adjustSize((2 * 1024 * 1024) + 1)); + + assertEquals(16 * 1024 * 1024, CachingBufferPool.adjustSize(16 * 1024 * 1024)); + assertEquals((16 + 4) * 1024 * 1024, CachingBufferPool.adjustSize((16 * 1024 * 1024) + 1)); + + assertEquals(128 * 1024 * 1024, CachingBufferPool.adjustSize(128 * 1024 * 1024)); + assertEquals((128 + 16) * 1024 * 1024, CachingBufferPool.adjustSize((128 * 1024 * 1024) + 1)); + + assertEquals(512 * 1024 * 1024, CachingBufferPool.adjustSize(512 * 1024 * 1024)); + assertEquals((512 + 128) * 1024 * 1024, CachingBufferPool.adjustSize((512 * 1024 * 1024) + 1)); + assertEquals(0x6000_0000, CachingBufferPool.adjustSize(0x6000_0000)); + assertEquals(0x6000_0000, CachingBufferPool.adjustSize(0x6000_0000 - 1)); + assertEquals(Integer.MAX_VALUE, CachingBufferPool.adjustSize(0x6000_0001)); + assertEquals(Integer.MAX_VALUE, CachingBufferPool.adjustSize(Integer.MAX_VALUE)); + assertEquals(Integer.MAX_VALUE, CachingBufferPool.adjustSize(Integer.MAX_VALUE - 1)); + } + + @Test + public void testDirectByteBuffers() throws Exception { + + BufferPool pool = CachingBufferPool.getInstance(); + + ByteBuffer bb1 = pool.allocateDirect(12 * 1024); + assertNotNull(bb1); + assertEquals(12 * 1024, bb1.limit()); + assertEquals(12 * 1024, bb1.capacity()); + assertEquals(0, bb1.position()); + + ByteBuffer bb2 = pool.allocateDirect(12 * 1024); + assertNotNull(bb2); + assertEquals(12 * 1024, bb2.limit()); + assertEquals(12 * 1024, bb2.capacity()); + assertEquals(0, bb2.position()); + + assertNotSame(bb1, bb2); + + bb2.position(18); + pool.releaseDirect(bb2); + + ByteBuffer bb3 = pool.allocateDirect(12 * 1024); + assertNotNull(bb3); + assertEquals(12 * 1024, bb3.limit()); + assertEquals(12 * 1024, bb3.capacity()); + assertEquals(0, bb3.position()); + + assertNotSame(bb1, bb2); + assertSame(bb2, bb3); + + pool.releaseDirect(bb1); + + ByteBuffer bb4 = pool.allocateDirect((12 * 1024) - 1); + assertNotNull(bb4); + assertEquals(12 * 1024, bb4.limit()); + assertEquals(12 * 1024, bb4.capacity()); + assertEquals(0, bb4.position()); + + assertSame(bb1, bb4); + } + + @Test + public void testArrays() throws Exception { + + BufferPool pool = CachingBufferPool.getInstance(); + + byte[] bb1 = pool.allocateArray(12 * 1024); + assertNotNull(bb1); + assertEquals(12 * 1024, bb1.length); + + byte[] bb2 = pool.allocateArray(12 * 1024); + assertNotNull(bb2); + assertEquals(12 * 1024, bb2.length); + + assertNotSame(bb1, bb2); + + pool.releaseArray(bb2); + + byte[] bb3 = pool.allocateArray(12 * 1024); + assertNotNull(bb3); + assertEquals(12 * 1024, bb3.length); + + assertNotSame(bb1, bb2); + assertSame(bb2, bb3); + + pool.releaseArray(bb1); + + byte[] bb4 = pool.allocateArray((12 * 1024) - 1); + assertNotNull(bb4); + assertEquals(12 * 1024, bb4.length); + + assertSame(bb1, bb4); + } + + @Test + public void testSoftReferences() { + + BufferPool pool = CachingBufferPool.getInstance(); + byte[] bb1 = pool.allocateArray(8 * 1024); + Reference ref = new WeakReference(bb1); + bb1[0] = 123; + bb1[8000] = -74; + int bb1HC = System.identityHashCode(bb1); + + pool.releaseArray(bb1); + + byte[] bb1_copy = pool.allocateArray(8 * 1024); + assertSame(bb1, bb1_copy); + assertEquals(123, bb1_copy[0]); + assertEquals(-74, bb1_copy[8000]); + assertEquals(bb1HC, System.identityHashCode(bb1_copy)); + + //release back into pool (again) + pool.releaseArray(bb1); + + //release strong references + bb1_copy = null; + bb1 = null; + assertNotNull(ref.get()); + + //force an OOME to for SoftReferences to be collected + List vals = forceOOMEGC(LIST_COUNT); + assertTrue("count: " + vals.size(), vals.size() < LIST_COUNT); + + //assert that our test reference has been cleared + assertNull(ref.get()); + + //get another value from the pool + byte[] bb2 = pool.allocateArray(8 * 1024); + //assert that it is indeed a new value, and not same from previous + assertNotEquals(123, bb2[0]); + assertNotEquals(-74, bb2[8000]); + assertNotEquals(bb1HC, System.identityHashCode(bb2)); + } + + private static List forceOOMEGC(int count) { + final List vals = new ArrayList<>(count); + + try { + for (int i=0; i Date: Thu, 24 Oct 2019 15:06:48 -0500 Subject: [PATCH 2/3] Remove use of google VisibleForTesting annotation https://github.com/xerial/snappy-java/issues/233 --- src/main/java/org/xerial/snappy/pool/CachingBufferPool.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/xerial/snappy/pool/CachingBufferPool.java b/src/main/java/org/xerial/snappy/pool/CachingBufferPool.java index 7f0665ad..80232e33 100644 --- a/src/main/java/org/xerial/snappy/pool/CachingBufferPool.java +++ b/src/main/java/org/xerial/snappy/pool/CachingBufferPool.java @@ -6,8 +6,6 @@ import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.ConcurrentMap; -import com.google.common.annotations.VisibleForTesting; - /** * A {@link BufferPool} implementation which caches values at fixed sizes. *

@@ -127,7 +125,9 @@ private static E getOrCreate(final int size, final ConcurrentMap 0; From ee8796228a3469d2fb9222475f0eb64fb10cc7f0 Mon Sep 17 00:00:00 2001 From: Brett Okken Date: Mon, 28 Oct 2019 07:26:00 -0500 Subject: [PATCH 3/3] javadoc --- .../snappy/SnappyFramedInputStream.java | 28 ++++++++++- .../snappy/SnappyFramedOutputStream.java | 50 +++++++++++++++++-- .../org/xerial/snappy/pool/BufferPool.java | 5 ++ 3 files changed, 78 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/xerial/snappy/SnappyFramedInputStream.java b/src/main/java/org/xerial/snappy/SnappyFramedInputStream.java index 8be6cbb0..d96b866d 100644 --- a/src/main/java/org/xerial/snappy/SnappyFramedInputStream.java +++ b/src/main/java/org/xerial/snappy/SnappyFramedInputStream.java @@ -83,8 +83,12 @@ public final class SnappyFramedInputStream /** * Creates a Snappy input stream to read data from the specified underlying * input stream. - * - * @param in the underlying input stream. Must not be {@code null}. + *

+ * Uses {@link DefaultPoolFactory} to obtain {@link BufferPool} for buffers. + *

+ * + * @param in the underlying input stream. Must not be {@code null}. + * @throws IOException */ public SnappyFramedInputStream(InputStream in) throws IOException @@ -97,6 +101,8 @@ public SnappyFramedInputStream(InputStream in) * input stream. * * @param in the underlying input stream. Must not be {@code null}. + * @param bufferPool Used to obtain buffer instances. Must not be {@code null}. + * @throws IOException */ public SnappyFramedInputStream(InputStream in, BufferPool bufferPool) throws IOException @@ -107,9 +113,13 @@ public SnappyFramedInputStream(InputStream in, BufferPool bufferPool) /** * Creates a Snappy input stream to read data from the specified underlying * input stream. + *

+ * Uses {@link DefaultPoolFactory} to obtain {@link BufferPool} for buffers. + *

* * @param in the underlying input stream. Must not be {@code null}. * @param verifyChecksums if true, checksums in input stream will be verified + * @throws IOException */ public SnappyFramedInputStream(InputStream in, boolean verifyChecksums) throws IOException @@ -123,6 +133,8 @@ public SnappyFramedInputStream(InputStream in, boolean verifyChecksums) * * @param in the underlying input stream. Must not be {@code null}. * @param verifyChecksums if true, checksums in input stream will be verified + * @param bufferPool Used to obtain buffer instances. Must not be {@code null}. + * @throws IOException */ public SnappyFramedInputStream(InputStream in, boolean verifyChecksums, BufferPool bufferPool) @@ -136,6 +148,8 @@ public SnappyFramedInputStream(InputStream in, boolean verifyChecksums, * channel. * * @param in the underlying readable channel. Must not be {@code null}. + * @param bufferPool Used to obtain buffer instances. Must not be {@code null}. + * @throws IOException */ public SnappyFramedInputStream(ReadableByteChannel in, BufferPool bufferPool) throws IOException @@ -146,8 +160,12 @@ public SnappyFramedInputStream(ReadableByteChannel in, BufferPool bufferPool) /** * Creates a Snappy input stream to read data from the specified underlying * channel. + *

+ * Uses {@link DefaultPoolFactory} to obtain {@link BufferPool} for buffers. + *

* * @param in the underlying readable channel. Must not be {@code null}. + * @throws IOException */ public SnappyFramedInputStream(ReadableByteChannel in) throws IOException @@ -158,9 +176,13 @@ public SnappyFramedInputStream(ReadableByteChannel in) /** * Creates a Snappy input stream to read data from the specified underlying * channel. + *

+ * Uses {@link DefaultPoolFactory} to obtain {@link BufferPool} for buffers. + *

* * @param in the underlying readable channel. Must not be {@code null}. * @param verifyChecksums if true, checksums in input stream will be verified + * @throws IOException */ public SnappyFramedInputStream(ReadableByteChannel in, boolean verifyChecksums) @@ -175,6 +197,8 @@ public SnappyFramedInputStream(ReadableByteChannel in, * * @param in the underlying readable channel. Must not be {@code null}. * @param verifyChecksums if true, checksums in input stream will be verified + * @param bufferPool Used to obtain buffer instances. Must not be {@code null}. + * @throws IOException */ public SnappyFramedInputStream(ReadableByteChannel in, boolean verifyChecksums, BufferPool bufferPool) diff --git a/src/main/java/org/xerial/snappy/SnappyFramedOutputStream.java b/src/main/java/org/xerial/snappy/SnappyFramedOutputStream.java index 6d17776e..6797b6c4 100644 --- a/src/main/java/org/xerial/snappy/SnappyFramedOutputStream.java +++ b/src/main/java/org/xerial/snappy/SnappyFramedOutputStream.java @@ -76,6 +76,9 @@ public final class SnappyFramedOutputStream /** * Creates a new {@link SnappyFramedOutputStream} using the {@link #DEFAULT_BLOCK_SIZE} * and {@link #DEFAULT_MIN_COMPRESSION_RATIO}. + *

+ * Uses {@link DefaultPoolFactory} to obtain {@link BufferPool} for buffers. + *

* * @param out The underlying {@link OutputStream} to write to. Must not be * {@code null}. @@ -84,9 +87,18 @@ public final class SnappyFramedOutputStream public SnappyFramedOutputStream(OutputStream out) throws IOException { - this(out, DEFAULT_BLOCK_SIZE, DEFAULT_MIN_COMPRESSION_RATIO); + this(out, DEFAULT_BLOCK_SIZE, DEFAULT_MIN_COMPRESSION_RATIO, DefaultPoolFactory.getDefaultPool()); } + /** + * Creates a new {@link SnappyFramedOutputStream} using the {@link #DEFAULT_BLOCK_SIZE} + * and {@link #DEFAULT_MIN_COMPRESSION_RATIO}. + * + * @param out The underlying {@link OutputStream} to write to. Must not be + * {@code null}. + * @param bufferPool Used to obtain buffer instances. Must not be {@code null}. + * @throws IOException + */ public SnappyFramedOutputStream(OutputStream out, BufferPool bufferPool) throws IOException { @@ -95,6 +107,9 @@ public SnappyFramedOutputStream(OutputStream out, BufferPool bufferPool) /** * Creates a new {@link SnappyFramedOutputStream} instance. + *

+ * Uses {@link DefaultPoolFactory} to obtain {@link BufferPool} for buffers. + *

* * @param out The underlying {@link OutputStream} to write to. Must not be * {@code null}. @@ -109,9 +124,22 @@ public SnappyFramedOutputStream(OutputStream out, int blockSize, double minCompressionRatio) throws IOException { - this(Channels.newChannel(out), blockSize, minCompressionRatio); + this(Channels.newChannel(out), blockSize, minCompressionRatio, DefaultPoolFactory.getDefaultPool()); } + /** + * Creates a new {@link SnappyFramedOutputStream} instance. + * + * @param out The underlying {@link OutputStream} to write to. Must not be + * {@code null}. + * @param blockSize The block size (of raw data) to compress before writing frames + * to out. Must be in (0, 65536]. + * @param minCompressionRatio Defines the minimum compression ratio ( + * {@code compressedLength / rawLength}) that must be achieved to + * write the compressed data. This must be in (0, 1.0]. + * @param bufferPool Used to obtain buffer instances. Must not be {@code null}. + * @throws IOException + */ public SnappyFramedOutputStream(OutputStream out, int blockSize, double minCompressionRatio, BufferPool bufferPool) throws IOException @@ -122,6 +150,9 @@ public SnappyFramedOutputStream(OutputStream out, int blockSize, /** * Creates a new {@link SnappyFramedOutputStream} using the * {@link #DEFAULT_BLOCK_SIZE} and {@link #DEFAULT_MIN_COMPRESSION_RATIO}. + *

+ * Uses {@link DefaultPoolFactory} to obtain {@link BufferPool} for buffers. + *

* * @param out The underlying {@link WritableByteChannel} to write to. Must * not be {@code null}. @@ -131,9 +162,21 @@ public SnappyFramedOutputStream(OutputStream out, int blockSize, public SnappyFramedOutputStream(WritableByteChannel out) throws IOException { - this(out, DEFAULT_BLOCK_SIZE, DEFAULT_MIN_COMPRESSION_RATIO); + this(out, DEFAULT_BLOCK_SIZE, DEFAULT_MIN_COMPRESSION_RATIO, DefaultPoolFactory.getDefaultPool()); } + /** + * Creates a new {@link SnappyFramedOutputStream} using the + * {@link #DEFAULT_BLOCK_SIZE} and {@link #DEFAULT_MIN_COMPRESSION_RATIO}. + *

+ * Uses {@link DefaultPoolFactory} to obtain {@link BufferPool} for buffers. + *

+ * + * @param out The underlying {@link WritableByteChannel} to write to. Must + * not be {@code null}. + * @param bufferPool Used to obtain buffer instances. Must not be {@code null}. + * @throws IOException + */ public SnappyFramedOutputStream(WritableByteChannel out, BufferPool bufferPool) throws IOException { @@ -170,6 +213,7 @@ public SnappyFramedOutputStream(WritableByteChannel out, int blockSize, * @param minCompressionRatio Defines the minimum compression ratio ( * {@code compressedLength / rawLength}) that must be achieved to * write the compressed data. This must be in (0, 1.0]. + * @param bufferPool Used to obtain buffer instances. Must not be {@code null}. * @throws IOException * @since 1.1.1 */ diff --git a/src/main/java/org/xerial/snappy/pool/BufferPool.java b/src/main/java/org/xerial/snappy/pool/BufferPool.java index bf21198f..ae39a767 100644 --- a/src/main/java/org/xerial/snappy/pool/BufferPool.java +++ b/src/main/java/org/xerial/snappy/pool/BufferPool.java @@ -4,6 +4,11 @@ /** * Makes various types of buffers available for use and potential re-use. + * + *

+ * Implementations must be safe for concurrent use by multiple threads. + *

+ * * @author Brett Okken */ public interface BufferPool {