aboutsummaryrefslogtreecommitdiff
path: root/lib/std/Progress.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2021-01-24 12:22:51 -0700
committerAndrew Kelley <andrew@ziglang.org>2021-01-24 12:22:51 -0700
commitb56e916fa1d3508a01a6fc0b62f3f64dd3843b85 (patch)
treec9892387883f0d563ed377692bacf23d10a0d1bc /lib/std/Progress.zig
parent15278b7f4b74e659fd968571cb9b96929da3d82c (diff)
parent2b321c25ce07953799300febf248ea7a7268bbd2 (diff)
downloadzig-b56e916fa1d3508a01a6fc0b62f3f64dd3843b85.tar.gz
zig-b56e916fa1d3508a01a6fc0b62f3f64dd3843b85.zip
Merge branch 'FireFox317-deadlock-windows-fix'
Merges #7861
Diffstat (limited to 'lib/std/Progress.zig')
-rw-r--r--lib/std/Progress.zig4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/std/Progress.zig b/lib/std/Progress.zig
index b75ad106a4..131aff2d2b 100644
--- a/lib/std/Progress.zig
+++ b/lib/std/Progress.zig
@@ -103,8 +103,10 @@ pub const Node = struct {
}
parent.completeOne();
} else {
+ const held = self.context.update_lock.acquire();
+ defer held.release();
self.context.done = true;
- self.context.refresh();
+ self.context.refreshWithHeldLock();
}
}