More WIP

- Added shared options between server and client
- Null memory pool

Author: davidfowl

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

@@ -0,0 +1,30 @@
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets
+{
+    public class SharedSocketOptions
+    {
+        /// <summary>
+        /// Set to false to enable Nagle's algorithm for all connections.
+        /// </summary>
+        /// <remarks>
+        /// Defaults to true.
+        /// </remarks>
+        public bool NoDelay { get; set; } = true;
+
+        /// <summary>
+        /// The maximum size before the transport will stop proactively reading from the transport.
+        /// </summary>
+        public long? MaxReadBufferSize { get; set; } = 1024 * 1024;
+
+        /// <summary>
+        /// The maximum size the transport will buffer outside of OS buffers before pausing writes.
+        /// </summary>
+        public long? MaxWriteBufferSize { get; set; } = 64 * 1024;
+
+        internal Func<MemoryPool<byte>> MemoryPoolFactory { get; set; } = System.Buffers.SlabMemoryPoolFactory.Create;
+    }
+}

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

@@ -0,0 +1,17 @@
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.IO.Pipelines;
+using System.Text;
+using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal;
+
+namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets
+{
+    public class SocketClientOptions : SharedSocketOptions
+    {
+        /// <summary>
+        /// Determines where read and write callbacks run.
+        /// </summary>
+        public PipeScheduler Scheduler { get; set; } = new IOQueue();
+    }
+}

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

@@ -1,14 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.IO.Pipelines;
 using System.Net;
 using System.Net.Sockets;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets
 {
@@ -18,13 +15,16 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets
     public class SocketConnectionFactory : IConnectionFactory
     {
         private readonly ILogger _logger;
+        private readonly SocketClientOptions _options;
 
         /// <summary>
         /// Creates the <see cref="SocketConnectionFactory"/>.
         /// </summary>
+        /// <param name="options">The options for this transport</param>
         /// <param name="loggerFactory">The logger factory</param>
-        public SocketConnectionFactory(ILoggerFactory loggerFactory)
+        public SocketConnectionFactory(IOptions<SocketClientOptions> options, ILoggerFactory loggerFactory)
         {
+            _options = options.Value;
             _logger = loggerFactory.CreateLogger<SocketConnectionFactory>();
         }
 
@@ -42,9 +42,15 @@ public async ValueTask<ConnectionContext> ConnectAsync(EndPoint endPoint, Cancel
 
             var socket = new Socket(endPoint.AddressFamily, SocketType.Stream, protocolType);
 
+            // Only apply no delay to Tcp based endpoints
+            if (protocolType == ProtocolType.Tcp)
+            {
+                socket.NoDelay = _options.NoDelay;
+            }
+
             await socket.ConnectAsync(endPoint);
 
-            var connection = new SocketConnection(socket, memoryPool: null, PipeScheduler.ThreadPool, new SocketsTrace(_logger));
+            var connection = new SocketConnection(socket, memoryPool: null, _options.Scheduler, new SocketsTrace(_logger), _options.MaxReadBufferSize, _options.MaxWriteBufferSize);
             connection.Start();
 
             return connection;

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

@@ -2,11 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Buffers;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets
 {
-    public class SocketTransportOptions
+    public class SocketTransportOptions : SharedSocketOptions
     {
         /// <summary>
         /// The number of I/O queues used to process requests. Set to 0 to directly schedule I/O to the ThreadPool.
@@ -15,19 +14,5 @@ public class SocketTransportOptions
         /// Defaults to <see cref="Environment.ProcessorCount" /> rounded down and clamped between 1 and 16.
         /// </remarks>
         public int IOQueueCount { get; set; } = Math.Min(Environment.ProcessorCount, 16);
-
-        /// <summary>
-        /// Set to false to enable Nagle's algorithm for all connections.
-        /// </summary>
-        /// <remarks>
-        /// Defaults to true.
-        /// </remarks>
-        public bool NoDelay { get; set; } = true;
-
-        public long? MaxReadBufferSize { get; set; } = 1024 * 1024;
-
-        public long? MaxWriteBufferSize { get; set; } = 64 * 1024;
-
-        internal Func<MemoryPool<byte>> MemoryPoolFactory { get; set; } = System.Buffers.SlabMemoryPoolFactory.Create;
     }
 }