Few tweaks

- Fixed buffer list management
- Disposed pool when the transport is disposed
- Added project to slnf so running tests in VS was possible

Author: davidfowl

src/Servers/Kestrel/Kestrel.slnf

@@ -35,7 +35,8 @@
       "src\\Servers\\Kestrel\\test\\Sockets.BindTests\\Sockets.BindTests.csproj",
       "src\\Servers\\Kestrel\\test\\Sockets.FunctionalTests\\Sockets.FunctionalTests.csproj",
       "src\\Servers\\Kestrel\\tools\\CodeGenerator\\CodeGenerator.csproj",
-      "src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj"
+      "src\\ObjectPool\\src\\Microsoft.Extensions.ObjectPool.csproj",
+      "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj"
     ]
   }
 }

src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketSender.cs

@@ -69,20 +69,25 @@ private void SetBufferList(in ReadOnlySequence<byte> buffer)
             Debug.Assert(!buffer.IsEmpty);
             Debug.Assert(!buffer.IsSingleSegment);
 
-            if (BufferList == null)
+            var buffers = BufferList;
+
+            if (buffers == null)
             {
-                BufferList = new List<ArraySegment<byte>>();
+                buffers = new List<ArraySegment<byte>>();
             }
             else
             {
                 // Buffers are pooled, so it's OK to root them until the next multi-buffer write.
-                BufferList.Clear();
+                buffers.Clear();
             }
 
             foreach (var b in buffer)
             {
-                BufferList.Add(b.GetArray());
+                buffers.Add(b.GetArray());
             }
+
+            // The act of setting this list, sets the buffers in the internal buffer list
+            BufferList = buffers;
         }
     }
 }

src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketSenderPool.cs

@@ -1,14 +1,16 @@
+using System;
 using System.Collections.Concurrent;
 using System.IO.Pipelines;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal
 {
-    internal class SocketSenderPool
+    internal class SocketSenderPool : IDisposable
     {
         private const int MaxQueueSize = 1024; // REVIEW: Is this good enough?
 
         private readonly ConcurrentQueue<SocketSender> _queue = new();
         private readonly PipeScheduler _scheduler;
+        private bool _disposed;
 
         public SocketSenderPool(PipeScheduler scheduler)
         {
@@ -26,7 +28,7 @@ public SocketSender Rent()
 
         public void Return(SocketSender sender)
         {
-            if (_queue.Count > MaxQueueSize)
+            if (_disposed || _queue.Count > MaxQueueSize)
             {
                 sender.Dispose();
                 return;
@@ -36,5 +38,18 @@ public void Return(SocketSender sender)
 
             _queue.Enqueue(sender);
         }
+
+        public void Dispose()
+        {
+            if (!_disposed)
+            {
+                _disposed = true;
+                while (_queue.TryDequeue(out var sender))
+                {
+                    sender.Dispose();
+                }
+            }
+        }
+
     }
 }

src/Servers/Kestrel/Transport.Sockets/src/SocketConnectionListener.cs

@@ -204,6 +204,13 @@ public ValueTask DisposeAsync()
 
             // Dispose the memory pool
             _memoryPool.Dispose();
+
+            // Dispose any pooled senders
+            foreach (var setting in _settings)
+            {
+                setting.SocketSenderPool.Dispose();
+            }
+
             return default;
         }