cleanup

Author: BrennanConroy

src/Servers/Connections.Abstractions/src/IMemoryPoolFactory.cs

@@ -6,13 +6,13 @@
 namespace Microsoft.AspNetCore.Connections;
 
 /// <summary>
-/// 
+/// Interface for creating memory pools.
 /// </summary>
 public interface IMemoryPoolFactory<T>
 {
     /// <summary>
-    /// 
+    /// Creates a new instance of a memory pool.
     /// </summary>
-    /// <returns></returns>
+    /// <returns>A new memory pool instance.</returns>
     MemoryPool<T> Create();
 }

src/Servers/Kestrel/Kestrel/src/WebHostBuilderKestrelExtensions.cs

@@ -81,9 +81,6 @@ public static IWebHostBuilder UseKestrelCore(this IWebHostBuilder hostBuilder)
         hostBuilder.UseSockets();
         hostBuilder.ConfigureServices(services =>
         {
-            // Don't override an already-configured transport
-            //services.TryAddSingleton<IConnectionListenerFactory, SocketTransportFactory>();
-
             services.AddTransient<IConfigureOptions<KestrelServerOptions>, KestrelServerOptionsSetup>();
             services.AddSingleton<IHttpsConfigurationService, HttpsConfigurationService>();
             services.AddSingleton<IServer, KestrelServerImpl>();

src/Shared/Buffers.MemoryPool/PinnedBlockMemoryPool.cs

@@ -92,9 +92,7 @@ public override IMemoryOwner<byte> Rent(int size = AnySize)
             MemoryPoolThrowHelper.ThrowObjectDisposedException(MemoryPoolThrowHelper.ExceptionArgument.MemoryPool);
         }
 
-        //Interlocked.Increment(ref _rentCount);
-        //++_rentCount;
-        ScalableCount(ref _rentCount);
+        Interlocked.Increment(ref _rentCount);
 
         if (_blocks.TryDequeue(out var block))
         {
@@ -108,13 +106,11 @@ public override IMemoryOwner<byte> Rent(int size = AnySize)
 
         _metrics.IncrementTotalMemory(BlockSize);
         _metrics.Rent(BlockSize);
-        //Interlocked.Increment(ref _rentCount);
-        //++_rentCount;
 
         // We already counted this Rent call above, but since we're now allocating (need more blocks)
         // that means the pool is 'very' active and we probably shouldn't evict blocks, so we count again
         // to reduce the chance of eviction occurring this cycle.
-        ScalableCount(ref _rentCount);
+        Interlocked.Increment(ref _rentCount);
 
         return new MemoryPoolBlock(this, BlockSize);
     }
@@ -135,9 +131,7 @@ internal void Return(MemoryPoolBlock block)
             block.IsLeased = false;
 #endif
 
-        //Interlocked.Increment(ref _returnCount);
-        //++_returnCount;
-        ScalableCount(ref _returnCount);
+        Interlocked.Increment(ref _returnCount);
 
         if (!_isDisposed)
         {
@@ -248,32 +242,4 @@ public void Dispose()
         {
         }
     }
-
-    // https://github.com/dotnet/runtime/blob/db681fb307d754c3746ffb40e0634e4c4e0caa9e/docs/design/features/ScalableApproximateCounting.md
-    static void ScalableCount(ref uint counter)
-    {
-        // Start using random for counting after 2^12 (4096)
-        //const int threshold = 12;
-        uint count = counter;
-        uint delta = 1;
-#if false
-        if (count > 0)
-        {
-            int logCount = 31 - (int)uint.LeadingZeroCount(count);
-
-            if (logCount >= threshold)
-            {
-                delta = 1u << (logCount - (threshold - 1));
-                uint rand = (uint)Random.Shared.Next();
-                bool update = (rand & (delta - 1)) == 0;
-                if (!update)
-                {
-                    return;
-                }
-            }
-        }
-#endif
-
-        Interlocked.Add(ref counter, delta);
-    }
 }