Bug 37625246 - [37624706->25.03] BufferManager allocation messages should be FINEST not FINE

fryp · fryp · commit 90b29c5baad4 · 2025-02-22T10:33:20.000-05:00
Bug 37624706 - BufferManager allocation messages should be FINEST not FINE 
(auto-submit 114535 after successfully running remote remote.full)
Job ID: job.9.20250222041417.22286
(auto-submit integ 114536 main -&gt; coherence-ce/main after successfully running remote remote.full)
Job ID: job.9.20250222134551.30575

[git-p4: depot-paths = "//dev/coherence-ce/main/": change = 114544]
diff --git a/prj/coherence-core/src/main/java/com/oracle/coherence/common/internal/io/SegmentedBufferManager.java b/prj/coherence-core/src/main/java/com/oracle/coherence/common/internal/io/SegmentedBufferManager.java
@@ -1,13 +1,13 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
  */
 package com.oracle.coherence.common.internal.io;
 
-
 import com.oracle.coherence.common.base.Disposable;
+
 import com.oracle.coherence.common.collections.ConcurrentLinkedStack;
 import com.oracle.coherence.common.collections.Stack;
 import com.oracle.coherence.common.io.BufferManager;
@@ -18,17 +18,17 @@
 
 import com.tangosol.coherence.config.Config;
 
+import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.util.logging.Logger;
-import java.util.logging.Level;
 
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-import java.nio.ByteBuffer;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
- * The SegmentedBufferManager performs buffer managment by dividing
+ * The SegmentedBufferManager performs buffer management by dividing
  * the buffers into a number of segments, such as small, medium, and large.
  * <p>
  * Each segment contains a number of generations, where generations are created
@@ -805,7 +805,7 @@ protected boolean allocateGeneration(int nGeneration)
             {
             int cbBuffer = encodeGeneration(nGeneration);
 
-            LOGGER.log(Level.FINE, getName() + " growing segment '"
+            LOGGER.log(Level.FINEST, getName() + " growing segment '"
                     + getBufferSize() + "' to " + (nGeneration + 1)
                     + " generations");
 
@@ -883,7 +883,7 @@ private void evaluateCapacity(final boolean fEvalPeers)
                             {
                             m_cMaxBuffersHistoric = m_cMaxBuffers;
 
-                            LOGGER.log(Level.FINE, getName() + " shrinking segment '" + getBufferSize()
+                            LOGGER.log(Level.FINEST, getName() + " shrinking segment '" + getBufferSize()
                                     + "' by " + (nGen - nDesiredGen)
                                     + " generation(s) to " + (nDesiredGen + 1) + ", based on recent high water mark of "
                                     + new MemorySize(m_cMaxBuffers * f_cbBuffer));
@@ -1074,7 +1074,7 @@ public String toString()
     // ----- inner class: BufferAllocator -----------------------------------
 
     /**
-     * A BufferAllocator is provides a mean for allocating ByteBuffers.
+     * A BufferAllocator provides a means for allocating ByteBuffers.
      */
     public interface BufferAllocator
         {
@@ -1085,7 +1085,7 @@ public interface BufferAllocator
          *
          * @return the buffer
          *
-         * @throws OutOfMemoryError if the request cannot be satisified
+         * @throws OutOfMemoryError if the request cannot be satisfied
          */
         public ByteBuffer allocate(int cb);
 
@@ -1137,7 +1137,7 @@ public interface BufferAllocator
     public static final long UNPOOLED_RECLAIM_INTERVAL = 1024;
 
     /**
-     * The default release frequency at which to records statistics.
+     * The default release frequency at which to record statistics.
      *
      * Note this value must be a power of two - 1.
      */
@@ -1188,7 +1188,7 @@ public interface BufferAllocator
     private final BufferAllocator m_allocator;
 
     /**
-     * The pool is composed of several sub-ordinate pools represented by the
+     * The pool is composed of several subordinate pools represented by the
      * PoolSegment inner class, each of a specific allocation size. This array
      * holds the various PoolSegment instances, starting with the smallest
      * allocation size and proceeding to the largest.
diff --git a/prj/coherence-core/src/main/java/com/oracle/coherence/common/internal/io/SlabBufferManager.java b/prj/coherence-core/src/main/java/com/oracle/coherence/common/internal/io/SlabBufferManager.java
@@ -1,39 +1,39 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
- * http://oss.oracle.com/licenses/upl.
+ * https://oss.oracle.com/licenses/upl.
  */
 package com.oracle.coherence.common.internal.io;
 
 import com.oracle.coherence.common.collections.WeakIdentityHashMap;
 
 import com.oracle.coherence.common.io.BufferManagers;
 
+import com.oracle.coherence.common.util.SafeClock;
+
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
+
 import java.lang.ref.WeakReference;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 import java.nio.ByteBuffer;
 
 import java.util.BitSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
-import com.oracle.coherence.common.util.SafeClock;
-
-import java.lang.management.GarbageCollectorMXBean;
-import java.lang.management.ManagementFactory;
-
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Consumer;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.util.function.Consumer;
 
 import java.util.logging.Level;
 
-
 /**
  * The SlabBufferManager is a BufferManager which allocates buffers in large slabs which are then sliced into smaller
  * ByteBuffers.
@@ -134,7 +134,7 @@ protected boolean allocateGenerationBuffers(int nGen, int cbBuffer)
                     f_cReclaimed.addAndGet(getGenerationSize());
                     LOGGER.log(Level.WARNING, getName() + " replenished leaked segment '" + getBufferSize()
                             + "' slab for generation " + i +
-                            "; set the com.oracle.common.io.BufferManagers.checked system property to true to help identify leak suspects");
+                            "; set the com.oracle.coherence.common.io.BufferManagers.checked system property to true to help identify leak suspects");
                     }
                 }
 
@@ -144,7 +144,7 @@ protected boolean allocateGenerationBuffers(int nGen, int cbBuffer)
             if (!slab.ensure())
                 {
                 // revive generation that was never fully released
-                LOGGER.log(Level.FINE, getName() + " reviving segment '" + getBufferSize() + "' slab for generation "
+                LOGGER.log(Level.FINEST, getName() + " reviving segment '" + getBufferSize() + "' slab for generation "
                         + nGen);
                 }
             // else; new memory allocation
@@ -172,7 +172,7 @@ protected ByteBuffer allocateNonPooledBuffer()
                             LOGGER.log(Level.WARNING, getName() + " detected leaked segment '" + getBufferSize()
                                     + "' slab for generation " + GEN_ID_UNPOOLED + "; " + slab.f_afOutstanding.cardinality() +
                                     " of " + f_cBufferGen + " buffers were leaked" +
-                                    "; set the com.oracle.common.io.BufferManagers.checked system property to true to help identify leak suspects");
+                                    "; set the com.oracle.coherence.common.io.BufferManagers.checked system property to true to help identify leak suspects");
                             }
                         // else; just a GC
                         }
@@ -190,7 +190,7 @@ protected ByteBuffer allocateNonPooledBuffer()
                         if (!slabRevive.ensure())
                             {
                             // revive generation that was never fully released
-                            LOGGER.log(Level.FINE, getName() + " reviving segment '" + getBufferSize() + "' slab for generation "
+                            LOGGER.log(Level.FINEST, getName() + " reviving segment '" + getBufferSize() + "' slab for generation "
                                     + GEN_ID_UNPOOLED);
                             }
 
@@ -205,7 +205,7 @@ protected ByteBuffer allocateNonPooledBuffer()
                     f_cNonPooledAllocations.incrementAndGet();
                     instantiateSlab(f_cbUnpooledBuffer).ensure(); // note: ensure inserts its buffers into the segment
 
-                    LOGGER.log(Level.FINE, getName() + " allocating unpooled slab for segment '" + getBufferSize());
+                    LOGGER.log(Level.FINEST, getName() + " allocating unpooled slab for segment '" + getBufferSize());
 
                     buff = f_stackBuf.pop();
                     }
@@ -261,7 +261,7 @@ public void dropBuffer(ByteBuffer buffer)
                         // we didn't produce.  We have no evidence that it is the callers fault though, so we don't throw
                         LOGGER.log(Level.WARNING, getName() + " detected release of unknown ByteBuffer for segment '"
                                 + getBufferSize() + "' generation " + nGen
-                                + "; set the com.oracle.common.io.BufferManagers.checked system property to true to help identify suspects");
+                                + "; set the com.oracle.coherence.common.io.BufferManagers.checked system property to true to help identify suspects");
                         // return and let GC deal with it
                         }
                     else if (slab.releaseSlice(buffer))
@@ -399,7 +399,7 @@ public synchronized boolean releaseSlice(ByteBuffer buffer)
                     if (f_afOutstanding.isEmpty())
                         {
                         // we've reclaimed the entire generation (slab); release it now
-                        LOGGER.log(Level.FINE, getName() + " releasing segment '" + getBufferSize()
+                        LOGGER.log(Level.FINEST, getName() + " releasing segment '" + getBufferSize()
                                 + "' slab for generation " + decodeGeneration(f_cbSlice));
                         getAllocator().release(bufSlab);
                         m_weakBuf.clear();
@@ -453,7 +453,7 @@ else if (f_cbSlice == f_cbUnpooledBuffer)
                     // double release of slice
                     LOGGER.log(Level.WARNING, getName() + " double release of '" + getBufferSize()
                             + "' buffer in generation " + decodeGeneration(f_cbSlice) +
-                            "; set the com.oracle.common.io.BufferManagers.checked system property to true to help identify suspects");
+                            "; set the com.oracle.coherence.common.io.BufferManagers.checked system property to true to help identify suspects");
                     }
 
                 return false;
diff --git a/prj/coherence-core/src/main/java/com/oracle/coherence/common/io/BufferManagers.java b/prj/coherence-core/src/main/java/com/oracle/coherence/common/io/BufferManagers.java
@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2000, 2024, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
  */
 package com.oracle.coherence.common.io;
 
-
 import com.oracle.coherence.common.internal.io.AbstractBufferManager;
 import com.oracle.coherence.common.internal.io.SegmentedBufferManager;
 import com.oracle.coherence.common.internal.io.CheckedBufferManager;
@@ -17,17 +16,16 @@
 import com.tangosol.coherence.config.Config;
 
 import java.nio.ByteBuffer;
+
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-
 /**
  * BufferManagers provides access to pre-defined system-wide managers.
  * <p>
- * The default size of each of the pools may be specified via the <tt>com.oracle.common.io.BufferManagers.pool</tt>
- * system property.  Additionally <tt>com.oracle.common.io.BufferManagers.checked</tt> can be used to default all
+ * The default size of each of the pools may be specified via the <tt>com.oracle.coherence.common.io.BufferManagers.pool</tt>
+ * system property. Additionally <tt>com.oracle.coherence.common.io.BufferManagers.checked</tt> can be used to default all
  * managers to utilize checked implementations to watch for pool usage issues.
- * </p>
  *
  * @author mf  2010.12.02
  */
@@ -180,7 +178,7 @@ protected void ensureCompatibility(ByteBuffer buff)
                 }
 
             mgr      = new NonDisposableBufferManager(mgr);
-            LOGGER.log(Level.FINE, "initialized HeapBufferManager " + mgr);
+            LOGGER.log(Level.FINEST, "initialized HeapBufferManager " + mgr);
             INSTANCE = Config.getBoolean(BufferManagers.class.getName() + ".heap.checked",
                                          Config.getBoolean(BufferManagers.class.getName() + ".checked"))
                             ? new CheckedBufferManager(mgr) : mgr;
@@ -242,7 +240,7 @@ protected void ensureCompatibility(ByteBuffer buff)
                 }
 
             mgr      = new NonDisposableBufferManager(mgr);
-            LOGGER.log(Level.FINE, "initialized DirectBufferManager " + mgr);
+            LOGGER.log(Level.FINEST, "initialized DirectBufferManager " + mgr);
             INSTANCE = Config.getBoolean(BufferManagers.class.getName() + ".direct.checked",
                                          Config.getBoolean(BufferManagers.class.getName() + ".checked"))
                             ? new CheckedBufferManager(mgr) : mgr;
