mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

build runner: fix recursive locking of max_rss_mutex

Browse Source
This commit is contained in:
Andrew Kelley 2025-11-24 14:33:59 -08:00
parent ece62a0223
commit 84353183c7
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/compiler/build_runner.zig
View File

@ -1306,6 +1306,7 @@ fn workerMakeOneStep(
run: *Run, run: *Run,
) void { ) void {
const io = b.graph.io; const io = b.graph.io;
const gpa = run.gpa;
// First, check the conditions for running this step. If they are not met, // First, check the conditions for running this step. If they are not met,
// then we return without doing the step, relying on another worker to // then we return without doing the step, relying on another worker to
@ -1341,7 +1342,7 @@ fn workerMakeOneStep(
if (new_claimed_rss > run.max_rss) { if (new_claimed_rss > run.max_rss) {
// Running this step right now could possibly exceed the allotted RSS. // Running this step right now could possibly exceed the allotted RSS.
// Add this step to the queue of memory-blocked steps. // Add this step to the queue of memory-blocked steps.
run.memory_blocked_steps.append(run.gpa, s) catch @panic("OOM"); run.memory_blocked_steps.append(gpa, s) catch @panic("OOM");
return; return;
} }
@ -1366,7 +1367,7 @@ fn workerMakeOneStep(
.web_server = if (run.web_server) |*ws| ws else null, .web_server = if (run.web_server) |*ws| ws else null,
.ttyconf = run.ttyconf, .ttyconf = run.ttyconf,
.unit_test_timeout_ns = run.unit_test_timeout_ns, .unit_test_timeout_ns = run.unit_test_timeout_ns,
.gpa = run.gpa, .gpa = gpa,
}); });
// No matter the result, we want to display error/warning messages. // No matter the result, we want to display error/warning messages.
@ -1377,7 +1378,7 @@ fn workerMakeOneStep(
const bw, _ = std.debug.lockStderrWriter(&stdio_buffer_allocation); const bw, _ = std.debug.lockStderrWriter(&stdio_buffer_allocation);
defer std.debug.unlockStderrWriter(); defer std.debug.unlockStderrWriter();
const ttyconf = run.ttyconf; const ttyconf = run.ttyconf;
printErrorMessages(run.gpa, s, .{}, bw, ttyconf, run.error_style, run.multiline_errors) catch {}; printErrorMessages(gpa, s, .{}, bw, ttyconf, run.error_style, run.multiline_errors) catch {};
} }
handle_result: { handle_result: {
@ -1406,6 +1407,11 @@ fn workerMakeOneStep(
// If this is a step that claims resources, we must now queue up other // If this is a step that claims resources, we must now queue up other
// steps that are waiting for resources. // steps that are waiting for resources.
if (s.max_rss != 0) { if (s.max_rss != 0) {
var dispatch_deps: std.ArrayList(*Step) = .empty;
defer dispatch_deps.deinit(gpa);
dispatch_deps.ensureUnusedCapacity(gpa, run.memory_blocked_steps.items.len) catch @panic("OOM");
{
run.max_rss_mutex.lockUncancelable(io); run.max_rss_mutex.lockUncancelable(io);
defer run.max_rss_mutex.unlock(io); defer run.max_rss_mutex.unlock(io);
@ -1415,14 +1421,11 @@ fn workerMakeOneStep(
// enough resources. // enough resources.
var remaining = run.max_rss - run.claimed_rss; var remaining = run.max_rss - run.claimed_rss;
var i: usize = 0; var i: usize = 0;
var j: usize = 0; for (run.memory_blocked_steps.items) |dep| {
while (j < run.memory_blocked_steps.items.len) : (j += 1) {
const dep = run.memory_blocked_steps.items[j];
assert(dep.max_rss != 0); assert(dep.max_rss != 0);
if (dep.max_rss <= remaining) { if (dep.max_rss <= remaining) {
remaining -= dep.max_rss; remaining -= dep.max_rss;
dispatch_deps.appendAssumeCapacity(dep);
group.async(io, workerMakeOneStep, .{ group, b, dep, prog_node, run });
} else { } else {
run.memory_blocked_steps.items[i] = dep; run.memory_blocked_steps.items[i] = dep;
i += 1; i += 1;
@ -1430,6 +1433,11 @@ fn workerMakeOneStep(
} }
run.memory_blocked_steps.shrinkRetainingCapacity(i); run.memory_blocked_steps.shrinkRetainingCapacity(i);
} }
for (dispatch_deps.items) |dep| {
// Must be called without max_rss_mutex held in case it executes recursively.
group.async(io, workerMakeOneStep, .{ group, b, dep, prog_node, run });
}
}
} }
pub fn printErrorMessages( pub fn printErrorMessages(