From 0da6906ed448f2e4dea363e11692955959067942 Mon Sep 17 00:00:00 2001
From: Karl Seguin <k@openmymind.io>
Date: Fri, 2 Feb 2024 20:08:25 +0800
Subject: [PATCH] fix signal reader

---
 readme.md           |  2 +-
 src/httpz.zig       |  5 ++++-
 src/thread_pool.zig |  4 ++--
 src/worker.zig      | 11 +++++------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/readme.md b/readme.md
index 93b41e0..a95dd44 100644
--- a/readme.md
+++ b/readme.md
@@ -637,7 +637,7 @@ try httpz.listen(allocator, &router, .{
         // The maximum number of pending requests that the thread pool will accept
         // This applies back pressure to the above workers and ensures that, under load
         // pending requests get precendence over processing new requests.
-        .backlog = 512,
+        .backlog = 500,
     },
 
     // defaults to null
diff --git a/src/httpz.zig b/src/httpz.zig
index b8ea552..394cb8c 100644
--- a/src/httpz.zig
+++ b/src/httpz.zig
@@ -231,7 +231,10 @@ pub fn ServerCtx(comptime G: type, comptime R: type) type {
                 var_config.address = "127.0.0.1";
             }
 
-            var thread_pool = try ThreadPool(Self.handler).init(allocator, .{});
+            var thread_pool = try ThreadPool(Self.handler).init(allocator, .{
+                .count = config.thread_pool.count orelse 4,
+                .backlog = config.thread_pool.backlog orelse 500,
+            });
             errdefer thread_pool.deinit(allocator);
 
             const signals = try allocator.alloc([2]fd_t, config.workers.count orelse DEFAULT_WORKERS);
diff --git a/src/thread_pool.zig b/src/thread_pool.zig
index 625dc47..712e026 100644
--- a/src/thread_pool.zig
+++ b/src/thread_pool.zig
@@ -4,8 +4,8 @@ const Thread = std.Thread;
 const Allocator = std.mem.Allocator;
 
 pub const Opts = struct {
-    count: u32 = 2,
-    backlog: u32 = 500,
+    count: u32,
+    backlog: u32,
 };
 
 pub fn ThreadPool(comptime F: anytype) type {
diff --git a/src/worker.zig b/src/worker.zig
index 1bd5539..dd31b2e 100644
--- a/src/worker.zig
+++ b/src/worker.zig
@@ -46,7 +46,7 @@ pub fn Worker(comptime S: type) type {
         config: *const Config,
 
         signal_pos: usize,
-        signal_buf: [@sizeOf(usize) * 8]u8,
+        signal_buf: [@sizeOf(usize) * 64]u8,
 
         const Self = @This();
 
@@ -216,8 +216,8 @@ pub fn Worker(comptime S: type) type {
         fn processSignal(self: *Self, signal: os.fd_t) bool {
             const s_t = @sizeOf(usize);
 
-            const start = self.signal_pos;
             const buf = &self.signal_buf;
+            const start = self.signal_pos;
 
             const n = os.read(signal, buf[start..]) catch |err| switch (err) {
                 error.WouldBlock => return false,
@@ -230,17 +230,16 @@ pub fn Worker(comptime S: type) type {
             }
 
             const pos = start + n;
-            const data_len = pos - start;
-            const connections = data_len / s_t;
+            const connections = pos / s_t;
 
             for (0..connections) |i| {
-                const data_start = start + (i * s_t);
+                const data_start = (i * s_t);
                 const data_end = data_start + s_t;
                 const conn: *Conn = @ptrFromInt(@as(*usize, @alignCast(@ptrCast(buf[data_start..data_end]))).*);
                 self.processHandover(conn);
             }
 
-            const partial_len = @mod(data_len, s_t);
+            const partial_len = @mod(pos, s_t);
             const partial_start = pos - partial_len;
             for (0..partial_len) |i| {
                 buf[i] = buf[partial_start + i];