(io_uring) Simplify new entry creation

Also add fix for rebase
Syndica · Feb 4, 2025 · 85136f9 · 85136f9
1 parent 8c68446
commit 85136f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/rpc/server/linux_io_uring.zig b/src/rpc/server/linux_io_uring.zig
@@ -138,22 +138,17 @@ fn consumeOurCqe(
         const buffer = try server_ctx.allocator.alloc(u8, server_ctx.read_buffer_size);
         errdefer server_ctx.allocator.free(buffer);
 
-        const new_recv_entry: Entry = entry: {
-            const data_ptr = try server_ctx.allocator.create(EntryData);
-            errdefer comptime unreachable;
-
-            data_ptr.* = .{
-                .buffer = buffer,
-                .stream = stream,
-                .state = EntryState.INIT,
-            };
-            break :entry .{ .ptr = data_ptr };
+        const data_ptr = try server_ctx.allocator.create(EntryData);
+        errdefer server_ctx.allocator.destroy(data_ptr);
+        data_ptr.* = .{
+            .buffer = buffer,
+            .stream = stream,
+            .state = EntryState.INIT,
         };
-        errdefer if (new_recv_entry.ptr) |data_ptr| server_ctx.allocator.destroy(data_ptr);
 
         const sqe = try getSqeRetry(&liou.io_uring);
         sqe.prep_recv(stream.handle, buffer, 0);
-        sqe.user_data = @bitCast(new_recv_entry);
+        sqe.user_data = @bitCast(Entry{ .ptr = data_ptr });
         return;
     };
     errdefer server_ctx.wait_group.finish();

diff --git a/src/rpc/server/requests.zig b/src/rpc/server/requests.zig
@@ -78,7 +78,7 @@ pub const MAX_TARGET_LEN: usize = blk: {
     break :blk "/".len + SnapSpec.fmtLenValue(.{
         .base_slot = std.math.maxInt(sig.core.Slot),
         .slot = std.math.maxInt(sig.core.Slot),
-        .hash = sig.core.Hash.base58String(.{ .data = .{255} ** sig.core.Hash.size }).constSlice(),
+        .hash = sig.core.Hash.base58String(.{ .data = .{255} ** sig.core.Hash.SIZE }).constSlice(),
     });
 };
 pub const TargetBoundedStr = std.BoundedArray(u8, MAX_TARGET_LEN);