authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2024-07-08 17:58:41-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-07-09 16:40:28-04:00
log1824bee579fffad3f17b639ebb1a94fd890ad68d
treeacd800b3bb9c8ef9cc9f67d646de087f41df85a4
parent0cc42d090fefcdd10ab64f6ae484404a6c6a710e

Progress: suppress tsan races

This removes the undefined behavior, but not the actual races. Closes #20477

1 files changed, 5 insertions(+), 7 deletions(-)

lib/std/Progress.zig+5-7
......@@ -285,13 +285,11 @@ pub const Node = struct {
285285 assert(parent == .none or @intFromEnum(parent) < node_storage_buffer_len);
286286
287287 const storage = storageByIndex(free_index);
288 storage.* = .{
289 .completed_count = 0,
290 .estimated_total_count = std.math.lossyCast(u32, estimated_total_items),
291 .name = [1]u8{0} ** max_name_len,
292 };
288 @atomicStore(u32, &storage.completed_count, 0, .monotonic);
289 @atomicStore(u32, &storage.estimated_total_count, std.math.lossyCast(u32, estimated_total_items), .monotonic);
293290 const name_len = @min(max_name_len, name.len);
294 @memcpy(storage.name[0..name_len], name[0..name_len]);
291 for (storage.name[0..name_len], name[0..name_len]) |*dest, src| @atomicStore(u8, dest, src, .monotonic);
292 for (storage.name[name_len..]) |*dest| @atomicStore(u8, dest, 0, .monotonic);
295293
296294 const parent_ptr = parentByIndex(free_index);
297295 assert(parent_ptr.* == .unused);
......@@ -765,7 +763,7 @@ fn serialize(serialized_buffer: *Serialized.Buffer) Serialized {
765763 var begin_parent = @atomicLoad(Node.Parent, parent_ptr, .acquire);
766764 while (begin_parent != .unused) {
767765 const dest_storage = &serialized_buffer.storage[serialized_len];
768 @memcpy(&dest_storage.name, &storage_ptr.name);
766 for (&dest_storage.name, &storage_ptr.name) |*dest, *src| dest.* = @atomicLoad(u8, src, .monotonic);
769767 dest_storage.estimated_total_count = @atomicLoad(u32, &storage_ptr.estimated_total_count, .acquire);
770768 dest_storage.completed_count = @atomicLoad(u32, &storage_ptr.completed_count, .monotonic);
771769 const end_parent = @atomicLoad(Node.Parent, parent_ptr, .acquire);