diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2023-02-19 10:20:19 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2023-02-19 10:20:19 -0700 |
| commit | b5b634e4e8a2a1fe32fba50ccd175257b4213936 (patch) | |
| tree | 4eed625db81dd4d6907e386084df36ec3ac85687 /lib/std/Thread/Mutex.zig | |
| parent | efdc94c10712f610e7de5e49fd9cd6f88b4bbbae (diff) | |
| parent | 02f5d2673f1bb21e7329acdd664fed565ecd4317 (diff) | |
| download | zig-b5b634e4e8a2a1fe32fba50ccd175257b4213936.tar.gz zig-b5b634e4e8a2a1fe32fba50ccd175257b4213936.zip | |
Merge remote-tracking branch 'origin/master' into llvm16
Diffstat (limited to 'lib/std/Thread/Mutex.zig')
| -rw-r--r-- | lib/std/Thread/Mutex.zig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/std/Thread/Mutex.zig b/lib/std/Thread/Mutex.zig index ecb3556b6c..89dedaf2b7 100644 --- a/lib/std/Thread/Mutex.zig +++ b/lib/std/Thread/Mutex.zig @@ -245,7 +245,7 @@ const NonAtomicCounter = struct { } fn inc(self: *NonAtomicCounter) void { - for (@bitCast([2]u64, self.get() + 1)) |v, i| { + for (@bitCast([2]u64, self.get() + 1), 0..) |v, i| { @ptrCast(*volatile u64, &self.value[i]).* = v; } } @@ -277,7 +277,7 @@ test "Mutex - many uncontended" { }; var runners = [_]Runner{.{}} ** num_threads; - for (runners) |*r| r.thread = try Thread.spawn(.{}, Runner.run, .{r}); + for (&runners) |*r| r.thread = try Thread.spawn(.{}, Runner.run, .{r}); for (runners) |r| r.thread.join(); for (runners) |r| try testing.expectEqual(r.counter.get(), num_increments); } @@ -312,7 +312,7 @@ test "Mutex - many contended" { var runner = Runner{}; var threads: [num_threads]Thread = undefined; - for (threads) |*t| t.* = try Thread.spawn(.{}, Runner.run, .{&runner}); + for (&threads) |*t| t.* = try Thread.spawn(.{}, Runner.run, .{&runner}); for (threads) |t| t.join(); try testing.expectEqual(runner.counter.get(), num_increments * num_threads); |
