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

std.Thread: more fixes

Browse Source
This commit is contained in:
kprotty 2021-06-25 12:43:03 -05:00
parent 5f4a40e6aa
commit 009c95b8ec
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/std/Thread.zig
View File

@ -397,17 +397,17 @@ const PosixThreadImpl = struct {
assert(c.pthread_attr_setguardsize(&attr, std.mem.page_size) == 0);
var handle: c.pthread_t = undefined;
return switch (c.pthread_create(
switch (c.pthread_create(
&handle,
&attr,
Instance.entryFn,
@ptrCast(*c_void, args_ptr),
)) {
0 => .{ .handle = handle },
os.EAGAIN => error.SystemResources,
0 => return Impl{ .handle = handle },
os.EAGAIN => return error.SystemResources,
os.EPERM => unreachable,
os.EINVAL => unreachable,
else => |err| os.unexpectedErrno(err),
else => |err| return os.unexpectedErrno(err),
};
}
@ -563,7 +563,7 @@ const LinuxThreadImpl = struct {
os.CLONE_PARENT_SETTID | os.CLONE_CHILD_CLEARTID |
os.CLONE_DETACHED | os.CLONE_SETTLS;
return switch (linux.getErrno(linux.clone(
switch (linux.getErrno(linux.clone(
Instance.entryFn,
@ptrToInt(&mapped[stack_offset]),
flags,
@ -572,14 +572,14 @@ const LinuxThreadImpl = struct {
tls_ptr,
&instance.thread.child_tid.value,
))) {
0 => .{ .thread = &instance.thread },
os.EAGAIN => error.ThreadQuotaExceeded,
0 => return Impl{ .thread = &instance.thread },
os.EAGAIN => return error.ThreadQuotaExceeded,
os.EINVAL => unreachable,
os.ENOMEM => error.SystemResources,
os.ENOMEM => return error.SystemResources,
os.ENOSPC => unreachable,
os.EPERM => unreachable,
os.EUSERS => unreachable,
else => |err| os.unexpectedErrno(err),
else => |err| return os.unexpectedErrno(err),
};
}
@ -655,7 +655,7 @@ const LinuxThreadImpl = struct {
\\ movl $60, %eax
\\ syscall
),
.arm, .armeb, .thumb, .thumb_eb => (
.arm, .armeb, .thumb, .thumbeb => (
\\.syntax unified
\\.text
\\.global __unmap_and_exit

2
lib/std/os/test.zig
View File

@ -372,7 +372,7 @@ test "thread local storage" {
if (builtin.single_threaded) return error.SkipZigTest;
const thread1 = try Thread.spawn(.{}, testTls, .{});
const thread2 = try Thread.spawn(.{}, testTls, .{});
try testTls({});
try testTls();
thread1.join();
thread2.join();
}