std.Progress: tree form and line truncation

lib/compiler/test_runner.zig

@@ -129,6 +129,7 @@ fn mainTerminal() void {
     var fail_count: usize = 0;
     var progress = std.Progress{
         .dont_print_on_dumb = true,
+        .emulate_one_line_bar = true,
     };
     const root_node = progress.start("Test", test_fn_list.len);
     const have_tty = progress.terminal != null and

lib/std/zig/Server.zig

@@ -134,7 +134,7 @@ pub fn receiveBody_u32(s: *Server) !u32 {
     return bswap(result);
 }
 
-pub fn serveStringMessage(s: *Server, tag: OutMessage.Tag, msg: []const u8) !void {
+pub fn serveStringMessage(s: *const Server, tag: OutMessage.Tag, msg: []const u8) !void {
     return s.serveMessage(.{
         .tag = tag,
         .bytes_len = @as(u32, @intCast(msg.len)),

src/main.zig

@@ -4031,10 +4031,9 @@ fn serve(
             .unprotected_estimated_total_items = 0,
             .unprotected_completed_items = 0,
         },
-        .columns_written = 0,
-        .prev_refresh_timestamp = 0,
         .timer = null,
         .done = false,
+        .emulate_one_line_bar = true,
     };
     const main_progress_node = &progress.root;
     main_progress_node.context = &progress;
@@ -4045,7 +4044,7 @@ fn serve(
         switch (hdr.tag) {
             .exit => return cleanExit(),
             .update => {
-                assert(main_progress_node.recently_updated_child == null);
+                for (main_progress_node.children) |child| assert(child == null);
                 tracy.frameMark();
 
                 if (arg_mode == .translate_c) {
@@ -4110,7 +4109,7 @@ fn serve(
             },
             .hot_update => {
                 tracy.frameMark();
-                assert(main_progress_node.recently_updated_child == null);
+                for (main_progress_node.children) |child| assert(child == null);
                 if (child_pid) |pid| {
                     try comp.hotCodeSwap(main_progress_node, pid);
                     try serveUpdateResults(&server, comp);
@@ -4149,51 +4148,19 @@ fn progressThread(progress: *std.Progress, server: *const Server, reset: *std.Th
             error.Timeout => {},
         }
 
-        var buf: std.BoundedArray(u8, 160) = .{};
+        progress.refresh();
 
-        {
-            progress.update_mutex.lock();
-            defer progress.update_mutex.unlock();
-
-            var need_ellipse = false;
-            var maybe_node: ?*std.Progress.Node = &progress.root;
-            while (maybe_node) |node| {
-                if (need_ellipse) {
-                    buf.appendSlice("... ") catch {};
-                }
-                need_ellipse = false;
-                const eti = @atomicLoad(usize, &node.unprotected_estimated_total_items, .monotonic);
-                const completed_items = @atomicLoad(usize, &node.unprotected_completed_items, .monotonic);
-                const current_item = completed_items + 1;
-                if (node.name.len != 0 or eti > 0) {
-                    if (node.name.len != 0) {
-                        buf.appendSlice(node.name) catch {};
-                        need_ellipse = true;
-                    }
-                    if (eti > 0) {
-                        if (need_ellipse) buf.appendSlice(" ") catch {};
-                        buf.writer().print("[{d}/{d}] ", .{ current_item, eti }) catch {};
-                        need_ellipse = false;
-                    } else if (completed_items != 0) {
-                        if (need_ellipse) buf.appendSlice(" ") catch {};
-                        buf.writer().print("[{d}] ", .{current_item}) catch {};
-                        need_ellipse = false;
-                    }
-                }
-                maybe_node = @atomicLoad(?*std.Progress.Node, &node.recently_updated_child, .acquire);
+        // TODO: Provisional. This should be better integrated.
+        for (progress.output_buffer[0 .. progress.rows_written + 1], 0..) |output_row, row_index| {
+            if (row_index != 0) {
+                server.serveStringMessage(.progress, "\n") catch |err| {
+                    fatal("unable to write to client: {s}", .{@errorName(err)});
+                };
             }
+            server.serveStringMessage(.progress, output_row[0..progress.columns_written[row_index]]) catch |err| {
+                fatal("unable to write to client: {s}", .{@errorName(err)});
+            };
         }
-
-        const progress_string = buf.slice();
-
-        server.serveMessage(.{
-            .tag = .progress,
-            .bytes_len = @as(u32, @intCast(progress_string.len)),
-        }, &.{
-            progress_string,
-        }) catch |err| {
-            fatal("unable to write to client: {s}", .{@errorName(err)});
-        };
     }
 }
 
@@ -4466,7 +4433,7 @@ fn runOrTestHotSwap(
 fn updateModule(comp: *Compilation, color: Color) !void {
     {
         // If the terminal is dumb, we dont want to show the user all the output.
-        var progress: std.Progress = .{ .dont_print_on_dumb = true };
+        var progress: std.Progress = .{ .dont_print_on_dumb = true, .emulate_one_line_bar = true };
         const main_progress_node = progress.start("", 0);
         defer main_progress_node.end();
         switch (color) {
@@ -4730,7 +4697,7 @@ const usage_build =
 ;
 
 fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
-    var progress: std.Progress = .{ .dont_print_on_dumb = true };
+    var progress: std.Progress = .{ .dont_print_on_dumb = true, .emulate_one_line_bar = true };
 
     var build_file: ?[]const u8 = null;
     var override_lib_dir: ?[]const u8 = try EnvVar.ZIG_LIB_DIR.get(arena);
@@ -5475,10 +5442,10 @@ fn jitCmd(
                     .unprotected_estimated_total_items = 0,
                     .unprotected_completed_items = 0,
                 },
-                .columns_written = 0,
                 .prev_refresh_timestamp = 0,
                 .timer = null,
                 .done = false,
+                .emulate_one_line_bar = true,
             };
             const main_progress_node = &progress.root;
             main_progress_node.context = &progress;
@@ -6812,7 +6779,7 @@ fn cmdFetch(
 
     try http_client.initDefaultProxies(arena);
 
-    var progress: std.Progress = .{ .dont_print_on_dumb = true };
+    var progress: std.Progress = .{ .dont_print_on_dumb = true, .emulate_one_line_bar = true };
     const root_prog_node = progress.start("Fetch", 0);
     defer root_prog_node.end();
 

test/src/Cases.zig

@@ -1438,7 +1438,7 @@ fn resolveTargetQuery(query: std.Target.Query) std.Build.ResolvedTarget {
 fn runCases(self: *Cases, zig_exe_path: []const u8) !void {
     const host = try std.zig.system.resolveTargetQuery(.{});
 
-    var progress = std.Progress{};
+    var progress = std.Progress{ .emulate_one_line_bar = true };
     const root_node = progress.start("compiler", self.cases.items.len);
     progress.terminal = null;
     defer root_node.end();

tools/doctest.zig

@@ -1011,7 +1011,11 @@ fn termColor(allocator: Allocator, input: []const u8) ![]u8 {
             },
             .after_number => switch (c) {
                 ';' => state = .arg,
-                'D' => state = .start,
+                'A'...'G' => state = .start,
+                'J' => {
+                    buf.items.len = last_new_line;
+                    state = .start;
+                },
                 'K' => {
                     buf.items.len = last_new_line;
                     state = .start;

tools/update_cpu_features.zig

@@ -1022,7 +1022,7 @@ pub fn main() anyerror!void {
     var zig_src_dir = try fs.cwd().openDir(zig_src_root, .{});
     defer zig_src_dir.close();
 
-    var progress = std.Progress{};
+    var progress = std.Progress{ .emulate_one_line_bar = true };
     const root_progress = progress.start("", llvm_targets.len);
     defer root_progress.end();