Remove unused useHandlesForPin (#465)

* remove unused useHandlesForPin * remove gchandle
microsoft · Jun 14, 2024 · 7d00ab9 · 7d00ab9
1 parent 92f4274
commit 7d00ab9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 41 deletions.
diff --git a/libs/common/Memory/LimitedFixedBufferPool.cs b/libs/common/Memory/LimitedFixedBufferPool.cs
@@ -20,7 +20,6 @@ public sealed class LimitedFixedBufferPool : IDisposable
     {
         readonly PoolLevel[] pool;
         readonly int numLevels, minAllocationSize, maxEntriesPerLevel;
-        readonly bool useHandlesForPin;
         readonly ILogger logger;
 
         /// <summary>
@@ -33,12 +32,11 @@ public sealed class LimitedFixedBufferPool : IDisposable
         /// <summary>
         /// Constructor
         /// </summary>
-        public LimitedFixedBufferPool(int minAllocationSize, int maxEntriesPerLevel = 16, int numLevels = 4, bool useHandlesForPin = false, ILogger logger = null)
+        public LimitedFixedBufferPool(int minAllocationSize, int maxEntriesPerLevel = 16, int numLevels = 4, ILogger logger = null)
         {
             this.minAllocationSize = minAllocationSize;
             this.maxEntriesPerLevel = maxEntriesPerLevel;
             this.numLevels = numLevels;
-            this.useHandlesForPin = useHandlesForPin;
             this.logger = logger;
             pool = new PoolLevel[numLevels];
         }
@@ -97,7 +95,7 @@ public unsafe PoolEntry Get(int size)
                     return page;
                 }
             }
-            return new PoolEntry(size, this, useHandlesForPin);
+            return new PoolEntry(size, this);
         }
 
         /// <summary>

diff --git a/libs/common/Memory/PoolEntry.cs b/libs/common/Memory/PoolEntry.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
 namespace Garnet.common
 {
@@ -23,38 +22,26 @@ public unsafe class PoolEntry : IDisposable
         /// </summary>
         public byte* entryPtr;
 
-        readonly bool useHandlesForPin;
-        GCHandle handle;
         readonly LimitedFixedBufferPool pool;
         bool disposed;
 
         /// <summary>
         /// Constructor
         /// </summary>
-        public PoolEntry(int size, LimitedFixedBufferPool pool, bool useHandlesForPin = false)
+        public PoolEntry(int size, LimitedFixedBufferPool pool)
         {
             Debug.Assert(pool != null);
             this.pool = pool;
-            this.useHandlesForPin = useHandlesForPin;
             this.disposed = false;
-            if (useHandlesForPin)
-            {
-                entry = new byte[size];
-                Pin();
-            }
-            else
-            {
-                entry = GC.AllocateArray<byte>(size, pinned: true);
-                entryPtr = (byte*)Unsafe.AsPointer(ref entry[0]);
-            }
+            entry = GC.AllocateArray<byte>(size, pinned: true);
+            entryPtr = (byte*)Unsafe.AsPointer(ref entry[0]);
         }
 
         /// <inheritdoc />
         public void Dispose()
         {
             Debug.Assert(!disposed);
             disposed = true;
-            Unpin();
             pool.Return(this);
         }
 
@@ -65,27 +52,6 @@ public void Reuse()
         {
             Debug.Assert(disposed);
             disposed = false;
-            Pin();
-        }
-
-        /// <summary>
-        /// Pin
-        /// </summary>
-        void Pin()
-        {
-            if (useHandlesForPin)
-            {
-                handle = GCHandle.Alloc(entry, GCHandleType.Pinned);
-                entryPtr = (byte*)handle.AddrOfPinnedObject();
-            }
-        }
-
-        /// <summary>
-        /// Unpin
-        /// </summary>
-        void Unpin()
-        {
-            if (useHandlesForPin) handle.Free();
         }
     }
 }