authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-12-26 16:41:16-08:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-12-26 19:58:56-08:00
log252c4e57c68d8ed0c2eecc17dfa5f6c63e672df2
treee983f35e8dae664e3276cd735c9af93ff70fd27d
parent28810f5e3d41597116773b2eb6686f3d8e272b36

std.Progress: fix compilation on Windows

by using std.Io.File.readStreaming rather than posix.read

1 files changed, 23 insertions(+), 22 deletions(-)

lib/std/Progress.zig+23-22
......@@ -127,20 +127,20 @@ pub const Node = struct {
127127 name: [max_name_len]u8 align(@alignOf(usize)),
128128
129129 /// Not thread-safe.
130 fn getIpcFd(s: Storage) ?posix.fd_t {
131 return if (s.estimated_total_count == std.math.maxInt(u32)) switch (@typeInfo(posix.fd_t)) {
130 fn getIpcFd(s: Storage) ?Io.File.Handle {
131 return if (s.estimated_total_count == std.math.maxInt(u32)) switch (@typeInfo(Io.File.Handle)) {
132132 .int => @bitCast(s.completed_count),
133133 .pointer => @ptrFromInt(s.completed_count),
134 else => @compileError("unsupported fd_t of " ++ @typeName(posix.fd_t)),
134 else => @compileError("unsupported fd_t of " ++ @typeName(Io.File.Handle)),
135135 } else null;
136136 }
137137
138138 /// Thread-safe.
139 fn setIpcFd(s: *Storage, fd: posix.fd_t) void {
140 const integer: u32 = switch (@typeInfo(posix.fd_t)) {
139 fn setIpcFd(s: *Storage, fd: Io.File.Handle) void {
140 const integer: u32 = switch (@typeInfo(Io.File.Handle)) {
141141 .int => @bitCast(fd),
142142 .pointer => @intFromPtr(fd),
143 else => @compileError("unsupported fd_t of " ++ @typeName(posix.fd_t)),
143 else => @compileError("unsupported fd_t of " ++ @typeName(Io.File.Handle)),
144144 };
145145 // `estimated_total_count` max int indicates the special state that
146146 // causes `completed_count` to be treated as a file descriptor, so
......@@ -340,7 +340,7 @@ pub const Node = struct {
340340 }
341341
342342 /// Posix-only. Used by `std.process.Child`. Thread-safe.
343 pub fn setIpcFd(node: Node, fd: posix.fd_t) void {
343 pub fn setIpcFd(node: Node, fd: Io.File.Handle) void {
344344 const index = node.index.unwrap() orelse return;
345345 assert(fd >= 0);
346346 assert(fd != posix.STDOUT_FILENO);
......@@ -351,14 +351,14 @@ pub const Node = struct {
351351
352352 /// Posix-only. Thread-safe. Assumes the node is storing an IPC file
353353 /// descriptor.
354 pub fn getIpcFd(node: Node) ?posix.fd_t {
354 pub fn getIpcFd(node: Node) ?Io.File.Handle {
355355 const index = node.index.unwrap() orelse return null;
356356 const storage = storageByIndex(index);
357357 const int = @atomicLoad(u32, &storage.completed_count, .monotonic);
358 return switch (@typeInfo(posix.fd_t)) {
358 return switch (@typeInfo(Io.File.Handle)) {
359359 .int => @bitCast(int),
360360 .pointer => @ptrFromInt(int),
361 else => @compileError("unsupported fd_t of " ++ @typeName(posix.fd_t)),
361 else => @compileError("unsupported fd_t of " ++ @typeName(Io.File.Handle)),
362362 };
363363 }
364364
......@@ -479,10 +479,10 @@ pub fn start(io: Io, options: Options) Node {
479479 if (std.process.parseEnvVarInt("ZIG_PROGRESS", u31, 10)) |ipc_fd| {
480480 global_progress.update_worker = io.concurrent(ipcThreadRun, .{
481481 io,
482 @as(Io.File, .{ .handle = switch (@typeInfo(posix.fd_t)) {
482 @as(Io.File, .{ .handle = switch (@typeInfo(Io.File.Handle)) {
483483 .int => ipc_fd,
484484 .pointer => @ptrFromInt(ipc_fd),
485 else => @compileError("unsupported fd_t of " ++ @typeName(posix.fd_t)),
485 else => @compileError("unsupported fd_t of " ++ @typeName(Io.File.Handle)),
486486 } }),
487487 }) catch |err| {
488488 global_progress.start_failure = .{ .spawn_ipc_worker = err };
......@@ -934,11 +934,11 @@ const SavedMetadata = struct {
934934const Fd = enum(i32) {
935935 _,
936936
937 fn init(fd: posix.fd_t) Fd {
937 fn init(fd: Io.File.Handle) Fd {
938938 return @enumFromInt(if (is_windows) @as(isize, @bitCast(@intFromPtr(fd))) else fd);
939939 }
940940
941 fn get(fd: Fd) posix.fd_t {
941 fn get(fd: Fd) Io.File.Handle {
942942 return if (is_windows)
943943 @ptrFromInt(@as(usize, @bitCast(@as(isize, @intFromEnum(fd)))))
944944 else
......@@ -949,6 +949,7 @@ const Fd = enum(i32) {
949949var ipc_metadata_len: u8 = 0;
950950
951951fn serializeIpc(start_serialized_len: usize, serialized_buffer: *Serialized.Buffer) usize {
952 const io = global_progress.io;
952953 const ipc_metadata_fds_copy = &serialized_buffer.ipc_metadata_fds_copy;
953954 const ipc_metadata_copy = &serialized_buffer.ipc_metadata_copy;
954955 const ipc_metadata_fds = &serialized_buffer.ipc_metadata_fds;
......@@ -967,11 +968,11 @@ fn serializeIpc(start_serialized_len: usize, serialized_buffer: *Serialized.Buff
967968 0..,
968969 ) |main_parent, *main_storage, main_index| {
969970 if (main_parent == .unused) continue;
970 const fd = main_storage.getIpcFd() orelse continue;
971 const opt_saved_metadata = findOld(fd, old_ipc_metadata_fds, old_ipc_metadata);
971 const file: Io.File = .{ .handle = main_storage.getIpcFd() orelse continue };
972 const opt_saved_metadata = findOld(file.handle, old_ipc_metadata_fds, old_ipc_metadata);
972973 var bytes_read: usize = 0;
973974 while (true) {
974 const n = posix.read(fd, pipe_buf[bytes_read..]) catch |err| switch (err) {
975 const n = file.readStreaming(io, &.{pipe_buf[bytes_read..]}) catch |err| switch (err) {
975976 error.WouldBlock => break,
976977 else => |e| {
977978 std.log.debug("failed to read child progress data: {t}", .{e});
......@@ -1000,7 +1001,7 @@ fn serializeIpc(start_serialized_len: usize, serialized_buffer: *Serialized.Buff
10001001 // Ignore all but the last message on the pipe.
10011002 var input: []u8 = pipe_buf[0..bytes_read];
10021003 if (input.len == 0) {
1003 serialized_len = useSavedIpcData(serialized_len, serialized_buffer, main_storage, main_index, opt_saved_metadata, 0, fd);
1004 serialized_len = useSavedIpcData(serialized_len, serialized_buffer, main_storage, main_index, opt_saved_metadata, 0, file.handle);
10041005 continue;
10051006 }
10061007
......@@ -1010,7 +1011,7 @@ fn serializeIpc(start_serialized_len: usize, serialized_buffer: *Serialized.Buff
10101011 if (input.len < expected_bytes) {
10111012 // Ignore short reads. We'll handle the next full message when it comes instead.
10121013 const remaining_read_trash_bytes: u16 = @intCast(expected_bytes - input.len);
1013 serialized_len = useSavedIpcData(serialized_len, serialized_buffer, main_storage, main_index, opt_saved_metadata, remaining_read_trash_bytes, fd);
1014 serialized_len = useSavedIpcData(serialized_len, serialized_buffer, main_storage, main_index, opt_saved_metadata, remaining_read_trash_bytes, file.handle);
10141015 continue :main_loop;
10151016 }
10161017 if (input.len > expected_bytes) {
......@@ -1028,7 +1029,7 @@ fn serializeIpc(start_serialized_len: usize, serialized_buffer: *Serialized.Buff
10281029 const nodes_len: u8 = @intCast(@min(parents.len - 1, serialized_buffer.storage.len - serialized_len));
10291030
10301031 // Remember in case the pipe is empty on next update.
1031 ipc_metadata_fds[ipc_metadata_len] = Fd.init(fd);
1032 ipc_metadata_fds[ipc_metadata_len] = Fd.init(file.handle);
10321033 ipc_metadata[ipc_metadata_len] = .{
10331034 .remaining_read_trash_bytes = 0,
10341035 .start_index = @intCast(serialized_len),
......@@ -1086,7 +1087,7 @@ fn copyRoot(dest: *Node.Storage, src: *align(1) Node.Storage) void {
10861087}
10871088
10881089fn findOld(
1089 ipc_fd: posix.fd_t,
1090 ipc_fd: Io.File.Handle,
10901091 old_metadata_fds: []Fd,
10911092 old_metadata: []SavedMetadata,
10921093) ?*SavedMetadata {
......@@ -1104,7 +1105,7 @@ fn useSavedIpcData(
11041105 main_index: usize,
11051106 opt_saved_metadata: ?*SavedMetadata,
11061107 remaining_read_trash_bytes: u16,
1107 fd: posix.fd_t,
1108 fd: Io.File.Handle,
11081109) usize {
11091110 const parents_copy = &serialized_buffer.parents_copy;
11101111 const storage_copy = &serialized_buffer.storage_copy;