| author |  Andrew Kelley <andrew@ziglang.org> 2024-07-14 22:27:51-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2024-07-14 22:27:51-07:00 |
| log | 445bd7a06fc34c9a59c6458774769bfaa2757a2f |
| tree | af9b8bd71c260c2e5d9539df6d2371f29cffa224 |
| parent | 987f63208e4bdd044768465f1581d03ee8964e28 |
build runner: update watch caption to include subprocesses
3 files changed, 12 insertions(+), 5 deletions(-)
lib- compiler
lib/compiler/build_runner.zig+10-3
| ... | ... | @@ -72,7 +72,6 @@ pub fn main() !void { |
| 72 | 72 | .query = .{}, |
| 73 | 73 | .result = try std.zig.system.resolveTargetQuery(.{}), |
| 74 | 74 | }, |
| 75 | .incremental = null, | |
| 76 | 75 | }; |
| 77 | 76 | |
| 78 | 77 | graph.cache.addPrefix(.{ .path = null, .handle = std.fs.cwd() }); |
| ... | ... | @@ -411,8 +410,8 @@ pub fn main() !void { |
| 411 | 410 | // trigger a rebuild on all steps with modified inputs, as well as their |
| 412 | 411 | // recursive dependants. |
| 413 | 412 | var caption_buf: [std.Progress.Node.max_name_len]u8 = undefined; |
| 414 | const caption = std.fmt.bufPrint(&caption_buf, "Watching {d} Directories", .{ | |
| 415 | w.dir_table.entries.len, | |
| 413 | const caption = std.fmt.bufPrint(&caption_buf, "watching {d} directories, {d} processes", .{ | |
| 414 | w.dir_table.entries.len, countSubProcesses(run.step_stack.keys()), | |
| 416 | 415 | }) catch &caption_buf; |
| 417 | 416 | var debouncing_node = main_progress_node.start(caption, 0); |
| 418 | 417 | var debounce_timeout: Watch.Timeout = .none; |
| ... | ... | @@ -445,6 +444,14 @@ fn markFailedStepsDirty(gpa: Allocator, all_steps: []const *Step) void { |
| 445 | 444 | }; |
| 446 | 445 | } |
| 447 | 446 | |
| 447 | fn countSubProcesses(all_steps: []const *Step) usize { | |
| 448 | var count: usize = 0; | |
| 449 | for (all_steps) |s| { | |
| 450 | count += @intFromBool(s.getZigProcess() != null); | |
| 451 | } | |
| 452 | return count; | |
| 453 | } | |
| 454 | ||
| 448 | 455 | const Run = struct { |
| 449 | 456 | max_rss: u64, |
| 450 | 457 | max_rss_is_default: bool, |
lib/std/Build.zig+1-1
| ... | ... | @@ -120,7 +120,7 @@ pub const Graph = struct { |
| 120 | 120 | needed_lazy_dependencies: std.StringArrayHashMapUnmanaged(void) = .{}, |
| 121 | 121 | /// Information about the native target. Computed before build() is invoked. |
| 122 | 122 | host: ResolvedTarget, |
| 123 | incremental: ?bool, | |
| 123 | incremental: ?bool = null, | |
| 124 | 124 | }; |
| 125 | 125 | |
| 126 | 126 | const AvailableDeps = []const struct { []const u8, []const u8 }; |
lib/std/Build/Step.zig+1-1
| ... | ... | @@ -603,7 +603,7 @@ fn zigProcessUpdate(s: *Step, zp: *ZigProcess, watch: bool) !?[]const u8 { |
| 603 | 603 | return result; |
| 604 | 604 | } |
| 605 | 605 | |
| 606 | fn getZigProcess(s: *Step) ?*ZigProcess { | |
| 606 | pub fn getZigProcess(s: *Step) ?*ZigProcess { | |
| 607 | 607 | return switch (s.id) { |
| 608 | 608 | .compile => s.cast(Compile).?.zig_process, |
| 609 | 609 | else => null, |