authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-05-24 10:39:07-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-05-27 20:56:48-07:00
log70e39c1a20842a2e1579d5ff76845cd1121a907b
tree2a319f54a05a4ce1e470b7cea34b75f7e9c8d479
parent2233d95b0f5edce5b2e0105ef78847fabe86f4d6

std.Progress: fixes

* bump default statically allocated resources * debug help when multiple instances of std.Progress are initialized * only handle sigwinch on supported operating systems * handle when reading from the pipe returns 0 bytes * avoid printing more lines than rows

1 files changed, 49 insertions(+), 16 deletions(-)

lib/std/Progress.zig+49-16
......@@ -293,12 +293,14 @@ var global_progress: Progress = .{
293293 .node_end_index = 0,
294294};
295295
296const default_node_storage_buffer_len = 100;
296const default_node_storage_buffer_len = 200;
297297var node_parents_buffer: [default_node_storage_buffer_len]Node.Parent = undefined;
298298var node_storage_buffer: [default_node_storage_buffer_len]Node.Storage = undefined;
299299var node_freelist_buffer: [default_node_storage_buffer_len]Node.OptionalIndex = undefined;
300300
301var default_draw_buffer: [2000]u8 = undefined;
301var default_draw_buffer: [4096]u8 = undefined;
302
303var debug_start_trace = std.debug.Trace.init;
302304
303305/// Initializes a global Progress instance.
304306///
......@@ -307,7 +309,11 @@ var default_draw_buffer: [2000]u8 = undefined;
307309/// Call `Node.end` when done.
308310pub fn start(options: Options) Node {
309311 // Ensure there is only 1 global Progress object.
310 assert(global_progress.node_end_index == 0);
312 if (global_progress.node_end_index != 0) {
313 debug_start_trace.dump();
314 unreachable;
315 }
316 debug_start_trace.add("first initialized here");
311317
312318 @memset(global_progress.node_parents, .unused);
313319 const root_node = Node.init(@enumFromInt(0), .none, options.root_name, options.estimated_total_items);
......@@ -347,14 +353,16 @@ pub fn start(options: Options) Node {
347353 return .{ .index = .none };
348354 }
349355
350 var act: posix.Sigaction = .{
351 .handler = .{ .sigaction = handleSigWinch },
352 .mask = posix.empty_sigset,
353 .flags = (posix.SA.SIGINFO | posix.SA.RESTART),
354 };
355 posix.sigaction(posix.SIG.WINCH, &act, null) catch |err| {
356 std.log.warn("failed to install SIGWINCH signal handler for noticing terminal resizes: {s}", .{@errorName(err)});
357 };
356 if (have_sigwinch) {
357 var act: posix.Sigaction = .{
358 .handler = .{ .sigaction = handleSigWinch },
359 .mask = posix.empty_sigset,
360 .flags = (posix.SA.SIGINFO | posix.SA.RESTART),
361 };
362 posix.sigaction(posix.SIG.WINCH, &act, null) catch |err| {
363 std.log.warn("failed to install SIGWINCH signal handler for noticing terminal resizes: {s}", .{@errorName(err)});
364 };
365 }
358366
359367 if (std.Thread.spawn(.{}, updateThreadRun, .{})) |thread| {
360368 global_progress.update_thread = thread;
......@@ -595,7 +603,7 @@ fn serializeIpc(start_serialized_len: usize) usize {
595603 const fd = main_storage.getIpcFd() orelse continue;
596604 var bytes_read: usize = 0;
597605 while (true) {
598 bytes_read += posix.read(fd, pipe_buf[bytes_read..]) catch |err| switch (err) {
606 const n = posix.read(fd, pipe_buf[bytes_read..]) catch |err| switch (err) {
599607 error.WouldBlock => break,
600608 else => |e| {
601609 std.log.warn("failed to read child progress data: {s}", .{@errorName(e)});
......@@ -604,6 +612,8 @@ fn serializeIpc(start_serialized_len: usize) usize {
604612 continue :main_loop;
605613 },
606614 };
615 if (n == 0) break;
616 bytes_read += n;
607617 }
608618 // Ignore all but the last message on the pipe.
609619 var input: []align(2) u8 = pipe_buf[0..bytes_read];
......@@ -831,12 +841,16 @@ fn computeNode(
831841 i += 1;
832842 global_progress.newline_count += 1;
833843
834 if (children[@intFromEnum(node_index)].child.unwrap()) |child| {
835 i = computeNode(buf, i, serialized, children, child);
844 if (global_progress.newline_count < global_progress.rows) {
845 if (children[@intFromEnum(node_index)].child.unwrap()) |child| {
846 i = computeNode(buf, i, serialized, children, child);
847 }
836848 }
837849
838 if (children[@intFromEnum(node_index)].sibling.unwrap()) |sibling| {
839 i = computeNode(buf, i, serialized, children, sibling);
850 if (global_progress.newline_count < global_progress.rows) {
851 if (children[@intFromEnum(node_index)].sibling.unwrap()) |sibling| {
852 i = computeNode(buf, i, serialized, children, sibling);
853 }
840854 }
841855
842856 return i;
......@@ -910,4 +924,23 @@ fn handleSigWinch(sig: i32, info: *const posix.siginfo_t, ctx_ptr: ?*anyopaque)
910924 global_progress.redraw_event.set();
911925}
912926
927const have_sigwinch = switch (builtin.os.tag) {
928 .linux,
929 .plan9,
930 .solaris,
931 .netbsd,
932 .openbsd,
933 .haiku,
934 .macos,
935 .ios,
936 .watchos,
937 .tvos,
938 .visionos,
939 .dragonfly,
940 .freebsd,
941 => true,
942
943 else => false,
944};
945
913946var stderr_mutex: std.Thread.Mutex = .{};