iis

Author: BrennanConroy

src/Servers/IIS/IIS/src/Core/IISHttpServer.cs

@@ -3,10 +3,10 @@
 
 using System.Buffers;
 using System.Diagnostics;
-using System.Diagnostics.Metrics;
 using System.Runtime.InteropServices;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
 using Microsoft.AspNetCore.Http.Features;
@@ -19,17 +19,10 @@ namespace Microsoft.AspNetCore.Server.IIS.Core;
 
 internal sealed class IISHttpServer : IServer
 {
-    internal sealed class DummyMeterFactory : IMeterFactory
-    {
-        public Meter Create(MeterOptions options) => new Meter(options);
-
-        public void Dispose() { }
-    }
-
     private const string WebSocketVersionString = "WEBSOCKET_VERSION";
 
     private IISContextFactory? _iisContextFactory;
-    private readonly MemoryPool<byte> _memoryPool = new PinnedBlockMemoryPool(new DummyMeterFactory());
+    private readonly MemoryPool<byte> _memoryPool;
     private GCHandle _httpServerHandle;
     private readonly IHostApplicationLifetime _applicationLifetime;
     private readonly ILogger<IISHttpServer> _logger;
@@ -68,10 +61,12 @@ public IISHttpServer(
         IHostApplicationLifetime applicationLifetime,
         IAuthenticationSchemeProvider authentication,
         IConfiguration configuration,
+        IMemoryPoolFactory<byte> memoryPoolFactory,
         IOptions<IISServerOptions> options,
         ILogger<IISHttpServer> logger
         )
     {
+        _memoryPool = memoryPoolFactory.Create();
         _nativeApplication = nativeApplication;
         _applicationLifetime = applicationLifetime;
         _logger = logger;

src/Servers/IIS/IIS/src/WebHostBuilderIISExtensions.cs

@@ -1,11 +1,14 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Buffers;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Server.IIS;
 using Microsoft.AspNetCore.Server.IIS.Core;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Microsoft.AspNetCore.Hosting;
 
@@ -53,6 +56,8 @@ public static IWebHostBuilder UseIIS(this IWebHostBuilder hostBuilder)
                             options.IisMaxRequestSizeLimit = iisConfigData.maxRequestBodySize;
                         }
                     );
+
+                    services.TryAddSingleton<IMemoryPoolFactory<byte>, DefaultMemoryPoolFactory>();
                 });
         }
 

src/Servers/Kestrel/Core/src/Internal/PinnedBlockMemoryPoolFactory.cs

@@ -24,13 +24,14 @@ public PinnedBlockMemoryPoolFactory(IMeterFactory meterFactory, TimeProvider? ti
     public MemoryPool<byte> Create()
     {
         var pool = new PinnedBlockMemoryPool(_meterFactory);
+
+        _pools.TryAdd(pool, pool);
+
         pool.DisposeCallback = (self) =>
         {
             _pools.TryRemove(self, out _);
         };
 
-        _pools.TryAdd(pool, pool);
-
         return pool;
     }
 

src/Shared/Buffers.MemoryPool/DefaultMemoryPoolFactory.cs

@@ -8,6 +8,8 @@
 
 namespace System.Buffers;
 
+#nullable enable
+
 internal sealed class DefaultMemoryPoolFactory : IMemoryPoolFactory<byte>, IDisposable
 {
     private readonly IMeterFactory _meterFactory;
@@ -40,13 +42,14 @@ public DefaultMemoryPoolFactory(IMeterFactory? meterFactory = null)
     public MemoryPool<byte> Create()
     {
         var pool = new PinnedBlockMemoryPool(_meterFactory);
+
+        _pools.TryAdd(pool, pool);
+
         pool.DisposeCallback = (self) =>
         {
             _pools.TryRemove(self, out _);
         };
 
-        _pools.TryAdd(pool, pool);
-
         return pool;
     }