aboutsummaryrefslogtreecommitdiff
path: root/lib/std/event/loop.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2021-02-28 20:42:34 -0800
committerGitHub <noreply@github.com>2021-02-28 20:42:34 -0800
commit9550db33cbb7dadd555842ef6d7214660e2b00d6 (patch)
treeffcf41a01dc8a55f06f5a630ed174550be33dad3 /lib/std/event/loop.zig
parenta5a3ad4f956bae1ca0e5a49de2e9ac7145170039 (diff)
parentd3d3e55fae2299d1ff594c77da2f1f41f44ab525 (diff)
downloadzig-9550db33cbb7dadd555842ef6d7214660e2b00d6.tar.gz
zig-9550db33cbb7dadd555842ef6d7214660e2b00d6.zip
Merge pull request #8097 from LemonBoy/thread-spawn-order
std: Swap arguments in Thread.spawn
Diffstat (limited to 'lib/std/event/loop.zig')
-rw-r--r--lib/std/event/loop.zig10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/std/event/loop.zig b/lib/std/event/loop.zig
index 912f99e961..878cea4aa6 100644
--- a/lib/std/event/loop.zig
+++ b/lib/std/event/loop.zig
@@ -185,7 +185,7 @@ pub const Loop = struct {
errdefer self.deinitOsData();
if (!builtin.single_threaded) {
- self.fs_thread = try Thread.spawn(self, posixFsRun);
+ self.fs_thread = try Thread.spawn(posixFsRun, self);
}
errdefer if (!builtin.single_threaded) {
self.posixFsRequest(&self.fs_end_request);
@@ -264,7 +264,7 @@ pub const Loop = struct {
}
}
while (extra_thread_index < extra_thread_count) : (extra_thread_index += 1) {
- self.extra_threads[extra_thread_index] = try Thread.spawn(self, workerRun);
+ self.extra_threads[extra_thread_index] = try Thread.spawn(workerRun, self);
}
},
.macos, .freebsd, .netbsd, .dragonfly, .openbsd => {
@@ -329,7 +329,7 @@ pub const Loop = struct {
}
}
while (extra_thread_index < extra_thread_count) : (extra_thread_index += 1) {
- self.extra_threads[extra_thread_index] = try Thread.spawn(self, workerRun);
+ self.extra_threads[extra_thread_index] = try Thread.spawn(workerRun, self);
}
},
.windows => {
@@ -378,7 +378,7 @@ pub const Loop = struct {
}
}
while (extra_thread_index < extra_thread_count) : (extra_thread_index += 1) {
- self.extra_threads[extra_thread_index] = try Thread.spawn(self, workerRun);
+ self.extra_threads[extra_thread_index] = try Thread.spawn(workerRun, self);
}
},
else => {},
@@ -798,7 +798,7 @@ pub const Loop = struct {
.event = std.Thread.AutoResetEvent{},
.is_running = true,
// Must be last so that it can read the other state, such as `is_running`.
- .thread = try std.Thread.spawn(self, DelayQueue.run),
+ .thread = try std.Thread.spawn(DelayQueue.run, self),
};
}