authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-05-24 10:35:33-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-05-27 20:56:48-07:00
log2233d95b0f5edce5b2e0105ef78847fabe86f4d6
tree2141b4df2b95c2cac305618bbe9bd049f583610e
parentb27fdf92fb366aa7b28235822c7871ab9eae9859

main: avoid creating multiple std.Progress instances

1 files changed, 21 insertions(+), 21 deletions(-)

src/main.zig+21-21
......@@ -3408,7 +3408,11 @@ fn buildOutputType(
34083408 return cmdTranslateC(comp, arena, null);
34093409 }
34103410
3411 updateModule(comp, color) catch |err| switch (err) {
3411 const root_prog_node = std.Progress.start(.{
3412 .disable_printing = (color == .off),
3413 });
3414
3415 updateModule(comp, color, root_prog_node) catch |err| switch (err) {
34123416 error.SemanticAnalyzeFail => {
34133417 assert(listen == .none);
34143418 saveState(comp, debug_incremental);
......@@ -4381,16 +4385,8 @@ fn runOrTestHotSwap(
43814385 }
43824386}
43834387
4384fn updateModule(comp: *Compilation, color: Color) !void {
4385 {
4386 // If the terminal is dumb, we dont want to show the user all the output.
4387 const main_progress_node = std.Progress.start(.{
4388 .disable_printing = color == .off,
4389 });
4390 defer main_progress_node.end();
4391
4392 try comp.update(main_progress_node);
4393 }
4388fn updateModule(comp: *Compilation, color: Color, prog_node: std.Progress.Node) !void {
4389 try comp.update(prog_node);
43944390
43954391 var errors = try comp.getAllErrorsAlloc();
43964392 defer errors.deinit(comp.gpa);
......@@ -4797,6 +4793,10 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
47974793 const work_around_btrfs_bug = native_os == .linux and
47984794 EnvVar.ZIG_BTRFS_WORKAROUND.isSet();
47994795 const color: Color = .auto;
4796 const root_prog_node = std.Progress.start(.{
4797 .disable_printing = (color == .off),
4798 });
4799 defer root_prog_node.end();
48004800
48014801 const target_query: std.Target.Query = .{};
48024802 const resolved_target: Package.Module.ResolvedTarget = .{
......@@ -4952,10 +4952,8 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
49524952 config,
49534953 );
49544954 } else {
4955 const root_prog_node = std.Progress.start(.{
4956 .root_name = "Fetch Packages",
4957 });
4958 defer root_prog_node.end();
4955 const fetch_prog_node = root_prog_node.start("Fetch Packages", 0);
4956 defer fetch_prog_node.end();
49594957
49604958 var job_queue: Package.Fetch.JobQueue = .{
49614959 .http_client = &http_client,
......@@ -4996,7 +4994,7 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
49964994 .lazy_status = .eager,
49974995 .parent_package_root = build_mod.root,
49984996 .parent_manifest_ast = null,
4999 .prog_node = root_prog_node,
4997 .prog_node = fetch_prog_node,
50004998 .job_queue = &job_queue,
50014999 .omit_missing_hash_error = true,
50025000 .allow_missing_paths_field = false,
......@@ -5135,7 +5133,7 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
51355133 };
51365134 defer comp.destroy();
51375135
5138 updateModule(comp, color) catch |err| switch (err) {
5136 updateModule(comp, color, root_prog_node) catch |err| switch (err) {
51395137 error.SemanticAnalyzeFail => process.exit(2),
51405138 else => |e| return e,
51415139 };
......@@ -5229,7 +5227,7 @@ const JitCmdOptions = struct {
52295227 prepend_zig_exe_path: bool = false,
52305228 depend_on_aro: bool = false,
52315229 capture: ?*[]u8 = null,
5232 /// Send progress and error bundles via std.zig.Server over stdout
5230 /// Send error bundles via std.zig.Server over stdout
52335231 server: bool = false,
52345232};
52355233
......@@ -5240,6 +5238,9 @@ fn jitCmd(
52405238 options: JitCmdOptions,
52415239) !void {
52425240 const color: Color = .auto;
5241 const root_prog_node = std.Progress.start(.{
5242 .disable_printing = (color == .off),
5243 });
52435244
52445245 const target_query: std.Target.Query = .{};
52455246 const resolved_target: Package.Module.ResolvedTarget = .{
......@@ -5377,14 +5378,13 @@ fn jitCmd(
53775378 defer comp.destroy();
53785379
53795380 if (options.server) {
5380 const main_progress_node = std.Progress.start(.{});
53815381 var server = std.zig.Server{
53825382 .out = std.io.getStdOut(),
53835383 .in = undefined, // won't be receiving messages
53845384 .receive_fifo = undefined, // won't be receiving messages
53855385 };
53865386
5387 try comp.update(main_progress_node);
5387 try comp.update(root_prog_node);
53885388
53895389 var error_bundle = try comp.getAllErrorsAlloc();
53905390 defer error_bundle.deinit(comp.gpa);
......@@ -5393,7 +5393,7 @@ fn jitCmd(
53935393 process.exit(2);
53945394 }
53955395 } else {
5396 updateModule(comp, color) catch |err| switch (err) {
5396 updateModule(comp, color, root_prog_node) catch |err| switch (err) {
53975397 error.SemanticAnalyzeFail => process.exit(2),
53985398 else => |e| return e,
53995399 };