| ... | ... | @@ -155,6 +155,10 @@ pub const Node = struct { |
| 155 | 155 | /// |
| 156 | 156 | /// Passing 0 for `estimated_total_items` means unknown. |
| 157 | 157 | pub fn start(node: Node, name: []const u8, estimated_total_items: usize) Node { |
| 158 | if (noop_impl) { |
| 159 | assert(node.index == .none); |
| 160 | return .{ .index = .none }; |
| 161 | } |
| 158 | 162 | const node_index = node.index.unwrap() orelse return .{ .index = .none }; |
| 159 | 163 | const parent = node_index.toParent(); |
| 160 | 164 | |
| ... | ... | @@ -208,6 +212,10 @@ pub const Node = struct { |
| 208 | 212 | |
| 209 | 213 | /// Finish a started `Node`. Thread-safe. |
| 210 | 214 | pub fn end(n: Node) void { |
| 215 | if (noop_impl) { |
| 216 | assert(n.index == .none); |
| 217 | return; |
| 218 | } |
| 211 | 219 | const index = n.index.unwrap() orelse return; |
| 212 | 220 | const parent_ptr = parentByIndex(index); |
| 213 | 221 | if (parent_ptr.unwrap()) |parent_index| { |
| ... | ... | @@ -296,6 +304,11 @@ var default_draw_buffer: [4096]u8 = undefined; |
| 296 | 304 | |
| 297 | 305 | var debug_start_trace = std.debug.Trace.init; |
| 298 | 306 | |
| 307 | const noop_impl = builtin.single_threaded or switch (builtin.os.tag) { |
| 308 | .wasi, .freestanding => true, |
| 309 | else => false, |
| 310 | }; |
| 311 | |
| 299 | 312 | /// Initializes a global Progress instance. |
| 300 | 313 | /// |
| 301 | 314 | /// Asserts there is only one global Progress instance. |
| ... | ... | @@ -319,6 +332,9 @@ pub fn start(options: Options) Node { |
| 319 | 332 | global_progress.refresh_rate_ns = options.refresh_rate_ns; |
| 320 | 333 | global_progress.initial_delay_ns = options.initial_delay_ns; |
| 321 | 334 | |
| 335 | if (noop_impl) |
| 336 | return .{ .index = .none }; |
| 337 | |
| 322 | 338 | if (std.process.parseEnvVarInt("ZIG_PROGRESS", u31, 10)) |ipc_fd| { |
| 323 | 339 | global_progress.update_thread = std.Thread.spawn(.{}, ipcThreadRun, .{ |
| 324 | 340 | @as(posix.fd_t, switch (@typeInfo(posix.fd_t)) { |
| ... | ... | @@ -507,7 +523,7 @@ fn computeClear(buf: []u8, start_i: usize) usize { |
| 507 | 523 | global_progress.newline_count = 0; |
| 508 | 524 | buf[i] = '\r'; |
| 509 | 525 | i += 1; |
| 510 | | for (1..prev_nl_n) |_| { |
| 526 | for (0..prev_nl_n) |_| { |
| 511 | 527 | buf[i..][0..up_one_line.len].* = up_one_line.*; |
| 512 | 528 | i += up_one_line.len; |
| 513 | 529 | } |
| ... | ... | @@ -841,9 +857,6 @@ fn computeRedraw(serialized_buffer: *Serialized.Buffer) []u8 { |
| 841 | 857 | const root_node_index: Node.Index = @enumFromInt(0); |
| 842 | 858 | i = computeNode(buf, i, serialized, children, root_node_index); |
| 843 | 859 | |
| 844 | | // Truncate trailing newline. |
| 845 | | if (buf[i - 1] == '\n') i -= 1; |
| 846 | | |
| 847 | 860 | buf[i..][0..finish_sync.len].* = finish_sync.*; |
| 848 | 861 | i += finish_sync.len; |
| 849 | 862 | |
| ... | ... | @@ -932,8 +945,10 @@ fn computeNode( |
| 932 | 945 | } |
| 933 | 946 | |
| 934 | 947 | fn withinRowLimit(p: *Progress) bool { |
| 935 | | // The +1 here is so that the PS1 is not scrolled off the top of the terminal. |
| 936 | | return p.newline_count + 1 < p.rows; |
| 948 | // The +2 here is so that the PS1 is not scrolled off the top of the terminal. |
| 949 | // one because we keep the cursor on the next line |
| 950 | // one more to account for the PS1 |
| 951 | return p.newline_count + 2 < p.rows; |
| 937 | 952 | } |
| 938 | 953 | |
| 939 | 954 | fn write(buf: []const u8) void { |
Andrew Kelley <andrew@ziglang.org> 2024-05-27 09:48:13-07:00
lib