wip: replace spans per memory spans

Author: CypherPotato

cadente/Sisk.Cadente.CoreEngine/Sisk.Cadente.CoreEngine.csproj

@@ -47,7 +47,7 @@
 	<PropertyGroup>
 		<AssemblyVersion>1.6.0</AssemblyVersion>
 		<FileVersion>1.6.0</FileVersion>
-		<Version>1.6.0-beta4</Version>
+		<Version>1.6.0-beta5</Version>
 	</PropertyGroup>
 
 	<!-- licensing, readme, signing -->

cadente/Sisk.Cadente/HttpConnection.cs

@@ -28,18 +28,20 @@ sealed class HttpConnection : IDisposable {
 #endif
 
     // buffer dedicated to headers.
-    public const int RESERVED_BUFFER_SIZE = 8192;
+    public const int RESERVED_BUFFER_SIZE = 8 * 1024;
 
     internal readonly Stream networkStream;
-    internal IMemoryOwner<byte> sharedPool;
+    internal IMemoryOwner<byte> requestPool, responsePool;
 
     public HttpConnection ( HttpHostClient client, Stream connectionStream, HttpHost host, IPEndPoint endpoint ) {
         _client = client;
         _host = host;
         _endpoint = endpoint;
 
         networkStream = connectionStream;
-        sharedPool = MemoryPool<byte>.Shared.Rent ( RESERVED_BUFFER_SIZE );
+
+        requestPool = MemoryPool<byte>.Shared.Rent ( RESERVED_BUFFER_SIZE );
+        responsePool = MemoryPool<byte>.Shared.Rent ( RESERVED_BUFFER_SIZE );
     }
 
     [MethodImpl ( MethodImplOptions.AggressiveOptimization )]
@@ -48,7 +50,7 @@ public async Task<HttpConnectionState> HandleConnectionEventsAsync () {
 
         while (!disposedValue) {
 
-            HttpRequestBase? nextRequest = await HttpRequestReader.TryReadHttpRequestAsync ( sharedPool.Memory, networkStream ).ConfigureAwait ( false );
+            HttpRequestBase? nextRequest = await HttpRequestReader.TryReadHttpRequestAsync ( requestPool.Memory, networkStream ).ConfigureAwait ( false );
 
             if (nextRequest is null) {
                 return HttpConnectionState.ConnectionClosed;
@@ -65,8 +67,7 @@ public async Task<HttpConnectionState> HandleConnectionEventsAsync () {
             if (!managedSession.ResponseHeadersAlreadySent) {
                 managedSession.Response.Headers.Set ( new HttpHeader ( HttpHeaderName.ContentLength, "0" ) );
 
-                if (!await managedSession.WriteHttpResponseHeadersAsync ())
-                    return HttpConnectionState.ResponseWriteException;
+                await managedSession.WriteHttpResponseHeadersAsync ();
             }
 
             await networkStream.FlushAsync ().ConfigureAwait ( false );
@@ -83,7 +84,8 @@ private void Dispose ( bool disposing ) {
         if (!disposedValue) {
             if (disposing) {
                 networkStream.Dispose ();
-                sharedPool.Dispose ();
+                requestPool.Dispose ();
+                responsePool.Dispose ();
             }
 
             disposedValue = true;

cadente/Sisk.Cadente/HttpHeaderList.cs

@@ -7,15 +7,10 @@
 // File name:   HttpHeaderList.cs
 // Repository:  https://github.com/sisk-http/core
 
-using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reflection.PortableExecutable;
+using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace Sisk.Cadente;
 
@@ -24,7 +19,8 @@ namespace Sisk.Cadente;
 /// </summary>
 public sealed class HttpHeaderList : IList<HttpHeader> {
 
-    private static HttpHeaderListNameComparer _nameComparer = new ();
+    private static readonly HttpHeaderListNameComparer _nameComparer = new ();
+
     internal List<HttpHeader> _headers;
     internal bool isReadOnly = false;
 
@@ -82,7 +78,7 @@ public void Add ( HttpHeader item ) {
     /// </summary>
     public void Set ( HttpHeader header ) {
         Remove ( header );
-        Add ( header );
+        ((ICollection<HttpHeader>) _headers).Add ( header );
     }
 
     /// <summary>
@@ -93,7 +89,14 @@ public void Set ( HttpHeader header ) {
     /// An array of header values that match the specified name. If no headers match, an empty array is returned.
     /// </returns>
     public string [] Get ( string name ) {
-        return _headers.Where ( h => h.Name.Equals ( name, StringComparison.OrdinalIgnoreCase ) ).Select ( h => h.Value ).ToArray ();
+        var result = new List<string> ();
+        var span = CollectionsMarshal.AsSpan ( _headers );
+        for (int i = 0; i < span.Length; i++) {
+            ref readonly var header = ref span [ i ];
+            if (Ascii.EqualsIgnoreCase ( name, header.NameBytes.Span ))
+                result.Add ( header.Value );
+        }
+        return result.ToArray ();
     }
 
     /// <inheritdoc/>
@@ -105,7 +108,13 @@ public void Clear () {
 
     /// <inheritdoc/>
     public bool Contains ( HttpHeader item ) {
-        return ((ICollection<HttpHeader>) _headers).Contains ( item, _nameComparer );
+        ReadOnlySpan<HttpHeader> span = CollectionsMarshal.AsSpan ( _headers );
+        for (int i = 0; i < span.Length; i++) {
+            ref readonly var header = ref span [ i ];
+            if (_nameComparer.Equals ( header, item ))
+                return true;
+        }
+        return false;
     }
 
     /// <summary>
@@ -116,7 +125,13 @@ public bool Contains ( HttpHeader item ) {
     /// <see langword="true"/> if a header with the specified name is found; otherwise, <see langword="false"/>.
     /// </returns>
     public bool Contains ( string name ) {
-        return Contains ( new HttpHeader ( name, string.Empty ) );
+        ReadOnlySpan<HttpHeader> span = CollectionsMarshal.AsSpan ( _headers );
+        for (int i = 0; i < span.Length; i++) {
+            ref readonly var header = ref span [ i ];
+            if (Ascii.EqualsIgnoreCase ( name, header.NameBytes.Span ))
+                return true;
+        }
+        return false;
     }
 
     /// <inheritdoc/>
@@ -157,6 +172,7 @@ public bool Remove ( HttpHeader item ) {
 
             if (_nameComparer.Equals ( h, item )) {
                 _headers.RemoveAt ( i );
+                removed++;
             }
         }
 

cadente/Sisk.Cadente/HttpHostContext.cs

@@ -8,7 +8,6 @@
 // Repository:  https://github.com/sisk-http/core
 
 using System.Runtime.CompilerServices;
-using System.Text;
 using Sisk.Cadente.HttpSerializer;
 using Sisk.Cadente.Streams;
 using Sisk.Core.Http;
@@ -27,13 +26,13 @@ public sealed class HttpHostContext {
     internal bool ResponseHeadersAlreadySent = false;
 
     [MethodImpl ( MethodImplOptions.AggressiveInlining )]
-    internal async ValueTask<bool> WriteHttpResponseHeadersAsync () {
+    internal Task WriteHttpResponseHeadersAsync () {
         if (ResponseHeadersAlreadySent) {
-            return true;
+            return Task.FromResult ( true );
         }
 
         ResponseHeadersAlreadySent = true;
-        return await HttpResponseSerializer.WriteHttpResponseHeaders ( _connection.sharedPool.Memory, _connection.networkStream, Response );
+        return HttpResponseSerializer.WriteHttpResponseHeaders ( _connection.responsePool.Memory, _connection.networkStream, Response );
     }
 
     /// <summary>
@@ -125,7 +124,7 @@ public Stream GetRequestStream () {
         internal HttpRequest ( HttpRequestBase request, HttpRequestStream requestStream ) {
             _baseRequest = request;
             _requestStream = requestStream;
-            Headers = new HttpHeaderList ( _baseRequest.HeadersAR, readOnly: true );
+            Headers = new HttpHeaderList ( _baseRequest.Headers.ToArray (), readOnly: true );
         }
     }
 
@@ -174,9 +173,7 @@ public async Task<Stream> GetResponseStreamAsync ( bool chunked = false ) {
                 }
             }
 
-            if (!await _session.WriteHttpResponseHeadersAsync ()) {
-                throw new InvalidOperationException ( "Unable to obtain an output stream for the response." );
-            }
+            await _session.WriteHttpResponseHeadersAsync ();
 
             headersSent = true;
             return chunked switch {

cadente/Sisk.Cadente/HttpSerializer/HttpRequestBase.cs

@@ -7,7 +7,6 @@
 // File name:   HttpRequestBase.cs
 // Repository:  https://github.com/sisk-http/core
 
-using System.Buffers;
 using System.Text;
 
 namespace Sisk.Cadente.HttpSerializer;
@@ -16,7 +15,6 @@ sealed class HttpRequestBase {
 
     private string? _method;
     private string? _path;
-    private HttpHeader []? _headers;
 
     public bool IsExpecting100;
     public bool IsChunked;
@@ -25,10 +23,8 @@ sealed class HttpRequestBase {
     public bool CanKeepAlive;
 
     public required ReadOnlyMemory<byte> BufferedContent;
-
     public required ReadOnlyMemory<byte> MethodRef;
     public required ReadOnlyMemory<byte> PathRef;
-
     public required ReadOnlyMemory<HttpHeader> Headers;
 
     public string Method {
@@ -44,11 +40,4 @@ public string Path {
             return _path;
         }
     }
-
-    public HttpHeader [] HeadersAR {
-        get {
-            _headers ??= Headers.ToArray ();
-            return _headers;
-        }
-    }
 }