Merge pull request #5 from MDA2AV/9.0.3

9.0.3

Author: MDA2AV

Unhinged.Playground/Program.cs

@@ -8,14 +8,16 @@
 
 #pragma warning disable CA2014
 
+// dotnet publish -c Release /p:PublishAot=true /p:OptimizationPreference=Speed
+
 [SkipLocalsInit]
 internal static class Program
 {
     public static void Main(string[] args)
     {
         var builder = UnhingedEngine
             .CreateBuilder()
-            .SetNWorkersSolver(() => Environment.ProcessorCount / 2)
+            .SetNWorkersSolver(() => (Environment.ProcessorCount / 2) - 2)
             .SetBacklog(16384)
             .SetMaxEventsPerWake(512)
             .SetMaxNumberConnectionsPerWorker(512)
@@ -28,13 +30,25 @@ public static void Main(string[] args)
         engine.Run();
     }
 
-    private static void RequestHandler(Connection connection)
+    private static ValueTask RequestHandler(Connection connection)
     {
-       if(connection.HashedRoute == 291830056)          // /json
+       /*if(connection.HashedRoute == 291830056)          // /json
            CommitJsonResponse(connection);
        
        else if (connection.HashedRoute == 3454831873)   // /plaintext
+           CommitPlainTextResponse(connection);*/
+
+       if (connection.H1HeaderData.Route.Equals("/json"))
+       {
+           CommitJsonResponse(connection);
+       }
+       
+       else if (connection.H1HeaderData.Route.Equals("/plaintext"))
+       {
            CommitPlainTextResponse(connection);
+       }
+
+       return ValueTask.CompletedTask;
     }
 
     [ThreadStatic] private static Utf8JsonWriter? _tUtf8JsonWriter;

Unhinged/ABI/Native.cs

@@ -144,9 +144,12 @@ internal static unsafe class Native
     /// </summary>
     [DllImport("libc", SetLastError = true)] internal static extern int eventfd(uint initval, int flags);
 
-    [DllImport("libc", SetLastError = true)] internal static extern int sched_setaffinity(int pid, nuint cpusetsize, ref ulong mask);
-
-
+    [DllImport("libc", SetLastError = true)] internal static extern int sched_setaffinity(int pid, IntPtr cpusetsize, ref ulong mask);
+    
+    [DllImport("libc", SetLastError = true)] internal static extern int sched_setaffinity(int pid, IntPtr cpusetsize, ref cpu_set_t mask);
+    
+    [DllImport("libc")] internal static extern int gettid(); // Linux thread id
+    
     // =========================
     //     Struct definitions
     // =========================
@@ -264,4 +267,28 @@ internal struct Linger
     internal const int EPIPE          = 32;
     internal const int ECONNABORTED   = 103;
     internal const int ECONNRESET     = 104;
+    
+    public static void PinCurrentThreadToCpu(int cpuIndex)
+    {
+        if (cpuIndex < 0 || cpuIndex >= Environment.ProcessorCount)
+            throw new ArgumentOutOfRangeException(nameof(cpuIndex));
+
+        unsafe
+        {
+            var set = new cpu_set_t();
+            int word = cpuIndex / 64;
+            int bit  = cpuIndex % 64;
+            set.Bits[word] = 1UL << bit;
+
+            int tid = gettid();
+            int ret = sched_setaffinity(tid, (IntPtr)sizeof(cpu_set_t), ref set);
+            if (ret != 0)
+                throw new InvalidOperationException($"sched_setaffinity failed with errno {Marshal.GetLastPInvokeError()}");
+        }
+    }
 }
+
+internal unsafe struct cpu_set_t
+{
+    public fixed ulong Bits[16]; // 1024 bits (enough for up to 1024 CPUs)
+}

Unhinged/Engine/Connection.cs

@@ -24,8 +24,11 @@ public unsafe class Connection : IDisposable
     /// <summary>Writer over the send slab.</summary>
     public readonly FixedBufferWriter WriteBuffer;
 
-    // <summary>Fnv1a32 hashed route</summary>
-    public uint HashedRoute { get; set; }
+    /// <summary>
+    /// Header data, no allocations
+    /// </summary>
+    public BinaryH1HeaderData BinaryH1HeaderData { get; set; }
+    public H1HeaderData H1HeaderData { get; set; }
 
     /// <param name="maxConnections">Used to size the slabs (typically per-worker slab size).</param>
     /// <param name="inSlabSize">Bytes per connection for receive.</param>
@@ -40,6 +43,11 @@ public Connection(int maxConnections, int inSlabSize, int outSlabSize)
             outSlabSize);
     }
 
+    public void Clear()
+    {
+        H1HeaderData?.Clear();
+    }
+
     /// <summary>
     /// Frees the unmanaged slabs. Call exactly once when the connection is permanently done.
     /// </summary>

Unhinged/Engine/UnhingedEngine.Builder.cs

@@ -42,15 +42,17 @@ public sealed partial class UnhingedEngine
     private static Func<int>? _calculateNumberWorkers;
 
     // Default request handler (overridden via builder). Writes a minimal plaintext response.
-    private static Action<Connection> _sRequestHandler = DefaultRequestHandler;
+    private static Func<Connection, ValueTask> _sRequestHandler = DefaultRequestHandler;
 
-    private static void DefaultRequestHandler(Connection connection)
+    private static ValueTask DefaultRequestHandler(Connection connection)
     {
         connection.WriteBuffer.WriteUnmanaged("HTTP/1.1 200 OK\r\n"u8 +
                                               "Server: W\r\n"u8 +
                                               "Content-Type: text/plain\r\n"u8 +
                                               "Content-Length: 28\r\n\r\n"u8 +
                                               "Request handler was not set!"u8 );
+
+        return ValueTask.CompletedTask;
     }
 
     private UnhingedEngine() { }
@@ -134,7 +136,7 @@ public UnhingedBuilder SetNWorkersSolver(Func<int>? solver)
         /// <summary>
         /// Inject the request handler used by workers to serve requests.
         /// </summary>
-        public UnhingedBuilder InjectRequestHandler(Action<Connection> requestHandler)
+        public UnhingedBuilder InjectRequestHandler(Func<Connection, ValueTask> requestHandler)
         {
             _sRequestHandler = requestHandler;
             return this;

Unhinged/Engine/UnhingedEngine.Runner.cs

@@ -41,7 +41,14 @@ public void Run()
             // - IsBackground=true so the process can exit if only workers remain.
             // - Name aids debugging and logs.
             // - Stack size is configurable to accommodate stackalloc-heavy hot paths.
-            var t = new Thread(() => WorkerLoop(W[iCap]), _maxStackSizePerThread) // 1MB
+            var t = new Thread(() =>
+                {
+                    // Performance seems to be lower when pinning threads to cpu core
+                    //PinCurrentThreadToCpu(iCap);
+                    //Console.WriteLine($"Thread {iCap} pinned to CPU {iCap}");
+                    
+                    WorkerLoop(W[iCap]);
+                }, _maxStackSizePerThread) // 1MB
             {
                 IsBackground = true,
                 Name = $"worker-{iCap}"