Employ sun misc Cleaner for unmap - java8 only

Netflix · Jun 22, 2023 · 013ca0f · 013ca0f
1 parent 5fabbd3
commit 013ca0f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/hollow/src/main/java/com/netflix/hollow/core/memory/encoding/BlobByteBuffer.java b/hollow/src/main/java/com/netflix/hollow/core/memory/encoding/BlobByteBuffer.java
@@ -10,6 +10,7 @@
 import java.nio.channels.FileChannel;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Logger;
+import sun.nio.ch.DirectBuffer;
 
 /**
  * <p>A stitching of {@link MappedByteBuffer}s to operate on large memory mapped blobs. {@code MappedByteBuffer} is
@@ -305,7 +306,15 @@ public void unmapBlob() {
                     LOG.warning("SNAP: unmapBlob called on BlobByteBuffer after its already been unmapped previously. " +
                             "spine.length= " + spine.length + ", i= " + i);
                 }
+                try {
+                    sun.misc.Cleaner cleaner = ((DirectBuffer) spine[i]).cleaner();
+                    cleaner.clean();
+                } catch (Exception e) {
+                    LOG.warning("SNAP: sun.misc.Cleaner support not available in app");
+                }
+
                 spine[i] = null;
+
                 // SNAP: TODO: instead of calling it too frequently, let app decide when to call it
                 //  System.gc();    // just a hint, but does seem to keep the size of mapped file region lower- both virtual and physical sizes as reported by vmmap on mac
                                 // note that this also adds 2s to delta refresh that's 10s without it

diff --git a/hollow/test-BlobByteBuffer-1687466883997-d24c045d-4baa-49d2-9bbf-b6454588a2a8 b/hollow/test-BlobByteBuffer-1687466883997-d24c045d-4baa-49d2-9bbf-b6454588a2a8