mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-26 01:05:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21779 from ziglang/avoid-data-races

Browse Source 
link.MachO: remove buggy multi-threading
This commit is contained in:
Andrew Kelley 2024-10-23 16:27:09 -07:00 committed by GitHub
commit 33d07f4b6e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 51 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/std/Progress.zig
View File

@ -188,7 +188,8 @@ pub const Node = struct {
var opt_free_index = @atomicLoad(Node.OptionalIndex, freelist_head, .seq_cst);
while (opt_free_index.unwrap()) |free_index| {
const freelist_ptr = freelistByIndex(free_index);
opt_free_index = @cmpxchgWeak(Node.OptionalIndex, freelist_head, opt_free_index, freelist_ptr.*, .seq_cst, .seq_cst) orelse {
const next = @atomicLoad(Node.OptionalIndex, freelist_ptr, .seq_cst);
opt_free_index = @cmpxchgWeak(Node.OptionalIndex, freelist_head, opt_free_index, next, .seq_cst, .seq_cst) orelse {
// We won the allocation race.
return init(free_index, parent, name, estimated_total_items);
};
@ -249,7 +250,7 @@ pub const Node = struct {
const freelist_head = &global_progress.node_freelist_first;
var first = @atomicLoad(Node.OptionalIndex, freelist_head, .seq_cst);
while (true) {
freelistByIndex(index).* = first;
@atomicStore(Node.OptionalIndex, freelistByIndex(index), first, .seq_cst);
first = @cmpxchgWeak(Node.OptionalIndex, freelist_head, first, index.toOptional(), .seq_cst, .seq_cst) orelse break;
}
} else {

103
src/link/MachO.zig
View File

@ -875,18 +875,13 @@ pub fn parseInputFiles(self: *MachO) !void {
defer tracy.end();
const diags = &self.base.comp.link_diags;
const tp = self.base.comp.thread_pool;
var wg: WaitGroup = .{};
{
wg.reset();
defer wg.wait();
for (self.objects.items) |index| {
tp.spawnWg(&wg, parseInputFileWorker, .{ self, self.getFile(index).? });
parseInputFileWorker(self, self.getFile(index).?);
}
for (self.dylibs.items) |index| {
tp.spawnWg(&wg, parseInputFileWorker, .{ self, self.getFile(index).? });
parseInputFileWorker(self, self.getFile(index).?);
}
}
@ -1269,17 +1264,13 @@ fn markLive(self: *MachO) void {
}
fn convertTentativeDefsAndResolveSpecialSymbols(self: *MachO) !void {
const tp = self.base.comp.thread_pool;
const diags = &self.base.comp.link_diags;
var wg: WaitGroup = .{};
{
wg.reset();
defer wg.wait();
for (self.objects.items) |index| {
tp.spawnWg(&wg, convertTentativeDefinitionsWorker, .{ self, self.getFile(index).?.object });
convertTentativeDefinitionsWorker(self, self.getFile(index).?.object);
}
if (self.getInternalObject()) |obj| {
tp.spawnWg(&wg, resolveSpecialSymbolsWorker, .{ self, obj });
resolveSpecialSymbolsWorker(self, obj);
}
}
if (diags.hasErrors()) return error.LinkFailure;
@ -1327,19 +1318,15 @@ pub fn dedupLiterals(self: *MachO) !void {
try object.resolveLiterals(&lp, self);
}
const tp = self.base.comp.thread_pool;
var wg: WaitGroup = .{};
{
wg.reset();
defer wg.wait();
if (self.getZigObject()) |zo| {
tp.spawnWg(&wg, File.dedupLiterals, .{ zo.asFile(), lp, self });
File.dedupLiterals(zo.asFile(), lp, self);
}
for (self.objects.items) |index| {
tp.spawnWg(&wg, File.dedupLiterals, .{ self.getFile(index).?, lp, self });
File.dedupLiterals(self.getFile(index).?, lp, self);
}
if (self.getInternalObject()) |object| {
tp.spawnWg(&wg, File.dedupLiterals, .{ object.asFile(), lp, self });
File.dedupLiterals(object.asFile(), lp, self);
}
}
}
@ -1357,21 +1344,17 @@ fn checkDuplicates(self: *MachO) !void {
const tracy = trace(@src());
defer tracy.end();
const tp = self.base.comp.thread_pool;
const diags = &self.base.comp.link_diags;
var wg: WaitGroup = .{};
{
wg.reset();
defer wg.wait();
if (self.getZigObject()) |zo| {
tp.spawnWg(&wg, checkDuplicatesWorker, .{ self, zo.asFile() });
checkDuplicatesWorker(self, zo.asFile());
}
for (self.objects.items) |index| {
tp.spawnWg(&wg, checkDuplicatesWorker, .{ self, self.getFile(index).? });
checkDuplicatesWorker(self, self.getFile(index).?);
}
if (self.getInternalObject()) |obj| {
tp.spawnWg(&wg, checkDuplicatesWorker, .{ self, obj.asFile() });
checkDuplicatesWorker(self, obj.asFile());
}
}
@ -1428,23 +1411,17 @@ fn scanRelocs(self: *MachO) !void {
const tracy = trace(@src());
defer tracy.end();
const tp = self.base.comp.thread_pool;
const diags = &self.base.comp.link_diags;
var wg: WaitGroup = .{};
{
wg.reset();
defer wg.wait();
if (self.getZigObject()) |zo| {
tp.spawnWg(&wg, scanRelocsWorker, .{ self, zo.asFile() });
scanRelocsWorker(self, zo.asFile());
}
for (self.objects.items) |index| {
tp.spawnWg(&wg, scanRelocsWorker, .{ self, self.getFile(index).? });
scanRelocsWorker(self, self.getFile(index).?);
}
if (self.getInternalObject()) |obj| {
tp.spawnWg(&wg, scanRelocsWorker, .{ self, obj.asFile() });
scanRelocsWorker(self, obj.asFile());
}
}
@ -1888,38 +1865,34 @@ fn calcSectionSizes(self: *MachO) !void {
header.@"align" = 3;
}
const tp = self.base.comp.thread_pool;
var wg: WaitGroup = .{};
{
wg.reset();
defer wg.wait();
const slice = self.sections.slice();
for (slice.items(.header), slice.items(.atoms), 0..) |header, atoms, i| {
if (atoms.items.len == 0) continue;
if (self.requiresThunks() and header.isCode()) continue;
tp.spawnWg(&wg, calcSectionSizeWorker, .{ self, @as(u8, @intCast(i)) });
calcSectionSizeWorker(self, @as(u8, @intCast(i)));
}
if (self.requiresThunks()) {
for (slice.items(.header), slice.items(.atoms), 0..) |header, atoms, i| {
if (!header.isCode()) continue;
if (atoms.items.len == 0) continue;
tp.spawnWg(&wg, createThunksWorker, .{ self, @as(u8, @intCast(i)) });
createThunksWorker(self, @as(u8, @intCast(i)));
}
}
// At this point, we can also calculate most of the symtab and data-in-code linkedit section sizes
if (self.getZigObject()) |zo| {
tp.spawnWg(&wg, File.calcSymtabSize, .{ zo.asFile(), self });
File.calcSymtabSize(zo.asFile(), self);
}
for (self.objects.items) |index| {
tp.spawnWg(&wg, File.calcSymtabSize, .{ self.getFile(index).?, self });
File.calcSymtabSize(self.getFile(index).?, self);
}
for (self.dylibs.items) |index| {
tp.spawnWg(&wg, File.calcSymtabSize, .{ self.getFile(index).?, self });
File.calcSymtabSize(self.getFile(index).?, self);
}
if (self.getInternalObject()) |obj| {
tp.spawnWg(&wg, File.calcSymtabSize, .{ obj.asFile(), self });
File.calcSymtabSize(obj.asFile(), self);
}
}
@ -2403,23 +2376,18 @@ fn writeSectionsAndUpdateLinkeditSizes(self: *MachO) !void {
try self.strtab.resize(gpa, cmd.strsize);
self.strtab.items[0] = 0;
const tp = self.base.comp.thread_pool;
var wg: WaitGroup = .{};
{
wg.reset();
defer wg.wait();
for (self.objects.items) |index| {
tp.spawnWg(&wg, writeAtomsWorker, .{ self, self.getFile(index).? });
writeAtomsWorker(self, self.getFile(index).?);
}
if (self.getZigObject()) |zo| {
tp.spawnWg(&wg, writeAtomsWorker, .{ self, zo.asFile() });
writeAtomsWorker(self, zo.asFile());
}
if (self.getInternalObject()) |obj| {
tp.spawnWg(&wg, writeAtomsWorker, .{ self, obj.asFile() });
writeAtomsWorker(self, obj.asFile());
}
for (self.thunks.items) |thunk| {
tp.spawnWg(&wg, writeThunkWorker, .{ self, thunk });
writeThunkWorker(self, thunk);
}
const slice = self.sections.slice();
@ -2434,34 +2402,34 @@ fn writeSectionsAndUpdateLinkeditSizes(self: *MachO) !void {
}) |maybe_sect_id| {
if (maybe_sect_id) |sect_id| {
const out = slice.items(.out)[sect_id].items;
tp.spawnWg(&wg, writeSyntheticSectionWorker, .{ self, sect_id, out });
writeSyntheticSectionWorker(self, sect_id, out);
}
}
if (self.la_symbol_ptr_sect_index) |_| {
tp.spawnWg(&wg, updateLazyBindSizeWorker, .{self});
updateLazyBindSizeWorker(self);
}
tp.spawnWg(&wg, updateLinkeditSizeWorker, .{ self, .rebase });
tp.spawnWg(&wg, updateLinkeditSizeWorker, .{ self, .bind });
tp.spawnWg(&wg, updateLinkeditSizeWorker, .{ self, .weak_bind });
tp.spawnWg(&wg, updateLinkeditSizeWorker, .{ self, .export_trie });
tp.spawnWg(&wg, updateLinkeditSizeWorker, .{ self, .data_in_code });
updateLinkeditSizeWorker(self, .rebase);
updateLinkeditSizeWorker(self, .bind);
updateLinkeditSizeWorker(self, .weak_bind);
updateLinkeditSizeWorker(self, .export_trie);
updateLinkeditSizeWorker(self, .data_in_code);
if (self.getZigObject()) |zo| {
tp.spawnWg(&wg, File.writeSymtab, .{ zo.asFile(), self, self });
File.writeSymtab(zo.asFile(), self, self);
}
for (self.objects.items) |index| {
tp.spawnWg(&wg, File.writeSymtab, .{ self.getFile(index).?, self, self });
File.writeSymtab(self.getFile(index).?, self, self);
}
for (self.dylibs.items) |index| {
tp.spawnWg(&wg, File.writeSymtab, .{ self.getFile(index).?, self, self });
File.writeSymtab(self.getFile(index).?, self, self);
}
if (self.getInternalObject()) |obj| {
tp.spawnWg(&wg, File.writeSymtab, .{ obj.asFile(), self, self });
File.writeSymtab(obj.asFile(), self, self);
}
if (self.requiresThunks()) for (self.thunks.items) |th| {
tp.spawnWg(&wg, Thunk.writeSymtab, .{ th, self, self });
Thunk.writeSymtab(th, self, self);
};
}
@ -5370,7 +5338,6 @@ const Thunk = @import("MachO/Thunk.zig");
const TlvPtrSection = synthetic.TlvPtrSection;
const Value = @import("../Value.zig");
const UnwindInfo = @import("MachO/UnwindInfo.zig");
const WaitGroup = std.Thread.WaitGroup;
const WeakBind = bind.WeakBind;
const ZigObject = @import("MachO/ZigObject.zig");
const dev = @import("../dev.zig");

37
src/link/MachO/relocatable.zig
View File

@ -290,38 +290,33 @@ fn calcSectionSizes(macho_file: *MachO) !void {
zo.calcNumRelocs(macho_file);
}
const tp = macho_file.base.comp.thread_pool;
var wg: WaitGroup = .{};
{
wg.reset();
defer wg.wait();
for (macho_file.sections.items(.atoms), 0..) |atoms, i| {
if (atoms.items.len == 0) continue;
tp.spawnWg(&wg, calcSectionSizeWorker, .{ macho_file, @as(u8, @intCast(i)) });
calcSectionSizeWorker(macho_file, @as(u8, @intCast(i)));
}
if (macho_file.eh_frame_sect_index) |_| {
tp.spawnWg(&wg, calcEhFrameSizeWorker, .{macho_file});
calcEhFrameSizeWorker(macho_file);
}
if (macho_file.unwind_info_sect_index) |_| {
for (macho_file.objects.items) |index| {
tp.spawnWg(&wg, Object.calcCompactUnwindSizeRelocatable, .{
Object.calcCompactUnwindSizeRelocatable(
macho_file.getFile(index).?.object,
macho_file,
});
);
}
}
for (macho_file.objects.items) |index| {
tp.spawnWg(&wg, File.calcSymtabSize, .{ macho_file.getFile(index).?, macho_file });
File.calcSymtabSize(macho_file.getFile(index).?, macho_file);
}
if (macho_file.getZigObject()) |zo| {
tp.spawnWg(&wg, File.calcSymtabSize, .{ zo.asFile(), macho_file });
File.calcSymtabSize(zo.asFile(), macho_file);
}
tp.spawnWg(&wg, MachO.updateLinkeditSizeWorker, .{ macho_file, .data_in_code });
MachO.updateLinkeditSizeWorker(macho_file, .data_in_code);
}
if (macho_file.unwind_info_sect_index) |_| {
@ -601,29 +596,24 @@ fn writeSections(macho_file: *MachO) !void {
try macho_file.strtab.resize(gpa, cmd.strsize);
macho_file.strtab.items[0] = 0;
const tp = macho_file.base.comp.thread_pool;
var wg: WaitGroup = .{};
{
wg.reset();
defer wg.wait();
for (macho_file.objects.items) |index| {
tp.spawnWg(&wg, writeAtomsWorker, .{ macho_file, macho_file.getFile(index).? });
tp.spawnWg(&wg, File.writeSymtab, .{ macho_file.getFile(index).?, macho_file, macho_file });
writeAtomsWorker(macho_file, macho_file.getFile(index).?);
File.writeSymtab(macho_file.getFile(index).?, macho_file, macho_file);
}
if (macho_file.getZigObject()) |zo| {
tp.spawnWg(&wg, writeAtomsWorker, .{ macho_file, zo.asFile() });
tp.spawnWg(&wg, File.writeSymtab, .{ zo.asFile(), macho_file, macho_file });
writeAtomsWorker(macho_file, zo.asFile());
File.writeSymtab(zo.asFile(), macho_file, macho_file);
}
if (macho_file.eh_frame_sect_index) |_| {
tp.spawnWg(&wg, writeEhFrameWorker, .{macho_file});
writeEhFrameWorker(macho_file);
}
if (macho_file.unwind_info_sect_index) |_| {
for (macho_file.objects.items) |index| {
tp.spawnWg(&wg, writeCompactUnwindWorker, .{ macho_file, macho_file.getFile(index).?.object });
writeCompactUnwindWorker(macho_file, macho_file.getFile(index).?.object);
}
}
}
@ -777,4 +767,3 @@ const File = @import("file.zig").File;
const MachO = @import("../MachO.zig");
const Object = @import("Object.zig");
const Symbol = @import("Symbol.zig");
const WaitGroup = std.Thread.WaitGroup;