authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-10-13 17:34:07-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-10-29 06:20:49-07:00
loge0e463bcf711f660cf8df5e8d31e82f855c0a967
treec22b756f5e2c2081b8c5c3f484a8079d0dd36af1
parent4d62f0839382a9aa611f9c898a1ef7a6050bd92a

std.Io.net.Stream.Reader: fix not using buffer

3 files changed, 27 insertions(+), 18 deletions(-)

lib/std/Io.zig+3-2
......@@ -680,8 +680,9 @@ pub const VTable = struct {
680680 netConnectUnix: *const fn (?*anyopaque, net.UnixAddress) net.UnixAddress.ConnectError!net.Socket.Handle,
681681 netSend: *const fn (?*anyopaque, net.Socket.Handle, []net.OutgoingMessage, net.SendFlags) struct { ?net.Socket.SendError, usize },
682682 netReceive: *const fn (?*anyopaque, net.Socket.Handle, message_buffer: []net.IncomingMessage, data_buffer: []u8, net.ReceiveFlags, Timeout) struct { ?net.Socket.ReceiveTimeoutError, usize },
683 netRead: *const fn (?*anyopaque, src: net.Stream, data: [][]u8) net.Stream.Reader.Error!usize,
684 netWrite: *const fn (?*anyopaque, dest: net.Stream, header: []const u8, data: []const []const u8, splat: usize) net.Stream.Writer.Error!usize,
683 /// Returns 0 on end of stream.
684 netRead: *const fn (?*anyopaque, src: net.Socket.Handle, data: [][]u8) net.Stream.Reader.Error!usize,
685 netWrite: *const fn (?*anyopaque, dest: net.Socket.Handle, header: []const u8, data: []const []const u8, splat: usize) net.Stream.Writer.Error!usize,
685686 netClose: *const fn (?*anyopaque, handle: net.Socket.Handle) void,
686687 netInterfaceNameResolve: *const fn (?*anyopaque, *const net.Interface.Name) net.Interface.Name.ResolveError!net.Interface,
687688 netInterfaceName: *const fn (?*anyopaque, net.Interface) net.Interface.NameError!net.Interface.Name,
lib/std/Io/Threaded.zig+7-13
......@@ -1986,9 +1986,8 @@ fn netAcceptPosix(userdata: ?*anyopaque, listen_fd: Io.net.Socket.Handle) Io.net
19861986 } };
19871987}
19881988
1989fn netReadPosix(userdata: ?*anyopaque, stream: Io.net.Stream, data: [][]u8) Io.net.Stream.Reader.Error!usize {
1989fn netReadPosix(userdata: ?*anyopaque, fd: Io.net.Socket.Handle, data: [][]u8) Io.net.Stream.Reader.Error!usize {
19901990 const pool: *Pool = @ptrCast(@alignCast(userdata));
1991 const fd = stream.socket.handle;
19921991
19931992 var iovecs_buffer: [max_iovecs_len]posix.iovec = undefined;
19941993 var i: usize = 0;
......@@ -2006,11 +2005,9 @@ fn netReadPosix(userdata: ?*anyopaque, stream: Io.net.Stream, data: [][]u8) Io.n
20062005 try pool.checkCancel();
20072006 var n: usize = undefined;
20082007 switch (std.os.wasi.fd_read(fd, dest.ptr, dest.len, &n)) {
2009 .SUCCESS => {
2010 if (n == 0) return error.EndOfStream;
2011 return n;
2012 },
2008 .SUCCESS => return n,
20132009 .INTR => continue,
2010
20142011 .INVAL => |err| return errnoBug(err),
20152012 .FAULT => |err| return errnoBug(err),
20162013 .AGAIN => |err| return errnoBug(err),
......@@ -2029,12 +2026,9 @@ fn netReadPosix(userdata: ?*anyopaque, stream: Io.net.Stream, data: [][]u8) Io.n
20292026 try pool.checkCancel();
20302027 const rc = posix.system.readv(fd, dest.ptr, @intCast(dest.len));
20312028 switch (posix.errno(rc)) {
2032 .SUCCESS => {
2033 const n: usize = @intCast(rc);
2034 if (n == 0) return error.EndOfStream;
2035 return n;
2036 },
2029 .SUCCESS => return @intCast(rc),
20372030 .INTR => continue,
2031
20382032 .INVAL => |err| return errnoBug(err),
20392033 .FAULT => |err| return errnoBug(err),
20402034 .AGAIN => |err| return errnoBug(err),
......@@ -2359,7 +2353,7 @@ fn netReceive(
23592353
23602354fn netWritePosix(
23612355 userdata: ?*anyopaque,
2362 stream: Io.net.Stream,
2356 fd: Io.net.Socket.Handle,
23632357 header: []const u8,
23642358 data: []const []const u8,
23652359 splat: usize,
......@@ -2406,7 +2400,7 @@ fn netWritePosix(
24062400 },
24072401 };
24082402 const flags = posix.MSG.NOSIGNAL;
2409 return posix.sendmsg(stream.socket.handle, &msg, flags);
2403 return posix.sendmsg(fd, &msg, flags);
24102404}
24112405
24122406fn addBuf(v: []posix.iovec_const, i: *@FieldType(posix.msghdr_const, "iovlen"), bytes: []const u8) void {
lib/std/Io/net.zig+17-3
......@@ -1076,6 +1076,8 @@ pub const Socket = struct {
10761076pub const Stream = struct {
10771077 socket: Socket,
10781078
1079 const max_iovecs_len = 8;
1080
10791081 pub fn close(s: *Stream, io: Io) void {
10801082 io.vtable.netClose(io.userdata, s.socket.handle);
10811083 s.* = undefined;
......@@ -1097,7 +1099,6 @@ pub const Stream = struct {
10971099 /// from it.
10981100 AccessDenied,
10991101 NetworkDown,
1100 EndOfStream,
11011102 } || Io.Cancelable || Io.UnexpectedError;
11021103
11031104 pub fn init(stream: Stream, io: Io, buffer: []u8) Reader {
......@@ -1128,10 +1129,22 @@ pub const Stream = struct {
11281129 fn readVec(io_r: *Io.Reader, data: [][]u8) Io.Reader.Error!usize {
11291130 const r: *Reader = @alignCast(@fieldParentPtr("interface", io_r));
11301131 const io = r.io;
1131 return io.vtable.netRead(io.userdata, r.stream, data) catch |err| {
1132 var iovecs_buffer: [max_iovecs_len][]u8 = undefined;
1133 const dest_n, const data_size = try io_r.writableVector(&iovecs_buffer, data);
1134 const dest = iovecs_buffer[0..dest_n];
1135 assert(dest[0].len > 0);
1136 const n = io.vtable.netRead(io.userdata, r.stream.socket.handle, dest) catch |err| {
11321137 r.err = err;
11331138 return error.ReadFailed;
11341139 };
1140 if (n == 0) {
1141 return error.EndOfStream;
1142 }
1143 if (n > data_size) {
1144 r.interface.end += n - data_size;
1145 return data_size;
1146 }
1147 return n;
11351148 }
11361149 };
11371150
......@@ -1166,7 +1179,8 @@ pub const Stream = struct {
11661179 const w: *Writer = @alignCast(@fieldParentPtr("interface", io_w));
11671180 const io = w.io;
11681181 const buffered = io_w.buffered();
1169 const n = io.vtable.netWrite(io.userdata, w.stream, buffered, data, splat) catch |err| {
1182 const handle = w.stream.socket.handle;
1183 const n = io.vtable.netWrite(io.userdata, handle, buffered, data, splat) catch |err| {
11701184 w.err = err;
11711185 return error.WriteFailed;
11721186 };