Improve #6322 log buckets in RetainableByteBufferPool

Dumpable Signed-off-by: Greg Wilkins <gregw@webtide.com>
jetty · Jul 13, 2021 · 42d4a98 · 42d4a98
1 parent 8feecc0
commit 42d4a98
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ArrayRetainableByteBufferPool.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ArrayRetainableByteBufferPool.java
@@ -13,6 +13,7 @@
 
 package org.eclipse.jetty.io;
 
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicLong;
@@ -25,11 +26,13 @@
 import org.eclipse.jetty.util.annotation.ManagedAttribute;
 import org.eclipse.jetty.util.annotation.ManagedObject;
 import org.eclipse.jetty.util.annotation.ManagedOperation;
+import org.eclipse.jetty.util.component.Dumpable;
+import org.eclipse.jetty.util.component.DumpableCollection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @ManagedObject
-public class ArrayRetainableByteBufferPool implements RetainableByteBufferPool
+public class ArrayRetainableByteBufferPool implements RetainableByteBufferPool, Dumpable
 {
     private static final Logger LOG = LoggerFactory.getLogger(ArrayRetainableByteBufferPool.class);
 
@@ -43,7 +46,6 @@ public class ArrayRetainableByteBufferPool implements RetainableByteBufferPool
     private final AtomicLong _currentHeapMemory = new AtomicLong();
     private final AtomicLong _currentDirectMemory = new AtomicLong();
     private final Function<Integer, Integer> _bucketIndexFor;
-    private final Function<Integer, Integer> _bucketCapacity;
 
     public ArrayRetainableByteBufferPool()
     {
@@ -92,7 +94,6 @@ protected ArrayRetainableByteBufferPool(int minCapacity, int factor, int maxCapa
         _direct = directArray;
         _indirect = indirectArray;
         _bucketIndexFor = bucketIndexFor;
-        _bucketCapacity = bucketCapacity;
     }
 
     public int getMinCapacity()
@@ -314,6 +315,28 @@ private void evict(boolean direct, long excess)
             LOG.debug("eviction done, cleared {} bytes from {} pools", totalClearedCapacity, (direct ? "direct" : "heap"));
     }
 
+    @Override
+    public String toString()
+    {
+        return String.format("%s{min=%d,max=%d,buckets=%d,heap=%d/%d,direct=%d/%d}",
+            super.toString(),
+            _minCapacity, _maxCapacity,
+            _direct.length,
+            _currentHeapMemory.get(), _maxHeapMemory,
+            _currentDirectMemory.get(), _maxDirectMemory);
+    }
+
+    @Override
+    public void dump(Appendable out, String indent) throws IOException
+    {
+        Dumpable.dumpObjects(
+            out,
+            indent,
+            this,
+            DumpableCollection.fromArray("direct", _direct),
+            DumpableCollection.fromArray("indirect", _indirect));
+    }
+
     private Pool<RetainableByteBuffer>.Entry findOldestEntry(long now, Pool<RetainableByteBuffer> bucket)
     {
         Pool<RetainableByteBuffer>.Entry oldestEntry = null;
@@ -342,6 +365,12 @@ private static class Bucket extends Pool<RetainableByteBuffer>
             super(Pool.StrategyType.THREAD_ID, size, true);
             _capacity = capacity;
         }
+
+        @Override
+        public String toString()
+        {
+            return String.format("%s{capacity=%d}", super.toString(), _capacity);
+        }
     }
 
     /**

diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/ArrayRetainableByteBufferPoolTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/ArrayRetainableByteBufferPoolTest.java
@@ -340,5 +340,7 @@ public void testLogBuckets()
 
             capacity = capacity * 2;
         }
+
+        System.err.println(pool.dump());
     }
 }