authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-08-31 19:27:54-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-09-01 17:54:07-07:00
log0932b0d9b309e654951d7c7f94dae823d7cdd154
treea2a73a7937ed3298f714d34c9158ae3a64c630f1
parent1a492d5156df400d33a00c5717e049e17f514153

std.os reorg: regression fixes to stack_t, and std.Thread

8 files changed, 29 insertions(+), 27 deletions(-)

lib/std/Thread.zig+1-1
...@@ -558,7 +558,7 @@ const PosixThreadImpl = struct {...@@ -558,7 +558,7 @@ const PosixThreadImpl = struct {
558 .openbsd => {558 .openbsd => {
559 var count: c_int = undefined;559 var count: c_int = undefined;
560 var count_size: usize = @sizeOf(c_int);560 var count_size: usize = @sizeOf(c_int);
561 const mib = [_]c_int{ os.CTL.HW, os.HW_NCPUONLINE };561 const mib = [_]c_int{ os.CTL.HW, os.system.HW_NCPUONLINE };
562 os.sysctl(&mib, &count, &count_size, null, 0) catch |err| switch (err) {562 os.sysctl(&mib, &count, &count_size, null, 0) catch |err| switch (err) {
563 error.NameTooLong, error.UnknownName => unreachable,563 error.NameTooLong, error.UnknownName => unreachable,
564 else => |e| return e,564 else => |e| return e,
lib/std/c/darwin.zig+3-3
...@@ -1436,9 +1436,9 @@ pub const SS_ONSTACK = 1;...@@ -1436,9 +1436,9 @@ pub const SS_ONSTACK = 1;
1436pub const SS_DISABLE = 4;1436pub const SS_DISABLE = 4;
14371437
1438pub const stack_t = extern struct {1438pub const stack_t = extern struct {
1439 ss_sp: [*]u8,1439 sp: [*]u8,
1440 ss_size: isize,1440 size: isize,
1441 ss_flags: i32,1441 flags: i32,
1442};1442};
14431443
1444pub const S = struct {1444pub const S = struct {
lib/std/c/dragonfly.zig+3-3
...@@ -547,9 +547,9 @@ pub const NOTE_FFCOPY = 3221225472;...@@ -547,9 +547,9 @@ pub const NOTE_FFCOPY = 3221225472;
547pub const NOTE_PCTRLMASK = 4026531840;547pub const NOTE_PCTRLMASK = 4026531840;
548548
549pub const stack_t = extern struct {549pub const stack_t = extern struct {
550 ss_sp: [*]u8,550 sp: [*]u8,
551 ss_size: isize,551 size: isize,
552 ss_flags: i32,552 flags: i32,
553};553};
554554
555pub const S = struct {555pub const S = struct {
lib/std/c/haiku.zig+3-3
...@@ -1006,9 +1006,9 @@ pub const SS_ONSTACK = 1;...@@ -1006,9 +1006,9 @@ pub const SS_ONSTACK = 1;
1006pub const SS_DISABLE = 4;1006pub const SS_DISABLE = 4;
10071007
1008pub const stack_t = extern struct {1008pub const stack_t = extern struct {
1009 ss_sp: [*]u8,1009 sp: [*]u8,
1010 ss_size: isize,1010 size: isize,
1011 ss_flags: i32,1011 flags: i32,
1012};1012};
10131013
1014pub const S = struct {1014pub const S = struct {
lib/std/c/netbsd.zig+8-6
...@@ -1039,9 +1039,11 @@ pub const mcontext_t = extern struct {...@@ -1039,9 +1039,11 @@ pub const mcontext_t = extern struct {
1039 fpregs: [512]u8 align(8),1039 fpregs: [512]u8 align(8),
1040};1040};
10411041
1042pub const REG_RBP = 12;1042pub const REG = struct {
1043pub const REG_RIP = 21;1043 pub const RBP = 12;
1044pub const REG_RSP = 24;1044 pub const RIP = 21;
1045 pub const RSP = 24;
1046};
10451047
1046pub const ucontext_t = extern struct {1048pub const ucontext_t = extern struct {
1047 flags: u32,1049 flags: u32,
...@@ -1206,9 +1208,9 @@ pub const SS_ONSTACK = 1;...@@ -1206,9 +1208,9 @@ pub const SS_ONSTACK = 1;
1206pub const SS_DISABLE = 4;1208pub const SS_DISABLE = 4;
12071209
1208pub const stack_t = extern struct {1210pub const stack_t = extern struct {
1209 ss_sp: [*]u8,1211 sp: [*]u8,
1210 ss_size: isize,1212 size: isize,
1211 ss_flags: i32,1213 flags: i32,
1212};1214};
12131215
1214pub const S = struct {1216pub const S = struct {
lib/std/c/openbsd.zig+3-3
...@@ -1007,9 +1007,9 @@ pub const SS_ONSTACK = 0x0001;...@@ -1007,9 +1007,9 @@ pub const SS_ONSTACK = 0x0001;
1007pub const SS_DISABLE = 0x0004;1007pub const SS_DISABLE = 0x0004;
10081008
1009pub const stack_t = extern struct {1009pub const stack_t = extern struct {
1010 ss_sp: [*]u8,1010 sp: [*]u8,
1011 ss_size: usize,1011 size: usize,
1012 ss_flags: c_int,1012 flags: c_int,
1013};1013};
10141014
1015pub const S = struct {1015pub const S = struct {
lib/std/os/linux.zig+6-6
...@@ -3080,15 +3080,15 @@ pub const SS_AUTODISARM = 1 << 31;...@@ -3080,15 +3080,15 @@ pub const SS_AUTODISARM = 1 << 31;
3080pub const stack_t = if (is_mips)3080pub const stack_t = if (is_mips)
3081 // IRIX compatible stack_t3081 // IRIX compatible stack_t
3082 extern struct {3082 extern struct {
3083 ss_sp: [*]u8,3083 sp: [*]u8,
3084 ss_size: usize,3084 size: usize,
3085 ss_flags: i32,3085 flags: i32,
3086 }3086 }
3087else3087else
3088 extern struct {3088 extern struct {
3089 ss_sp: [*]u8,3089 sp: [*]u8,
3090 ss_flags: i32,3090 flags: i32,
3091 ss_size: usize,3091 size: usize,
3092 };3092 };
30933093
3094pub const sigval = extern union {3094pub const sigval = extern union {
lib/std/os/test.zig+2-2
...@@ -394,8 +394,8 @@ test "sigaltstack" {...@@ -394,8 +394,8 @@ test "sigaltstack" {
394 var st: os.stack_t = undefined;394 var st: os.stack_t = undefined;
395 try os.sigaltstack(null, &st);395 try os.sigaltstack(null, &st);
396 // Setting a stack size less than MINSIGSTKSZ returns ENOMEM396 // Setting a stack size less than MINSIGSTKSZ returns ENOMEM
397 st.ss_flags = 0;397 st.flags = 0;
398 st.ss_size = 1;398 st.size = 1;
399 try testing.expectError(error.SizeTooSmall, os.sigaltstack(&st, null));399 try testing.expectError(error.SizeTooSmall, os.sigaltstack(&st, null));
400}400}
401401