Commit e8a1e2a1d8f2903d5951339f7d3e0dbdfc85704c | zig

lib/std/c.zig+45-12

 @@ -73,7 +73,6 @@ pub extern "c" fn abort() noreturn;
 pub extern "c" fn exit(code: c_int) noreturn;
 pub extern "c" fn isatty(fd: fd_t) c_int;
 pub extern "c" fn close(fd: fd_t) c_int;
-pub extern "c" fn fstat(fd: fd_t, buf: *Stat) c_int;
 pub extern "c" fn fstatat(dirfd: fd_t, path: [*:0]const u8, stat_buf: *Stat, flags: u32) c_int;
 pub extern "c" fn lseek(fd: fd_t, offset: off_t, whence: c_int) off_t;
 pub extern "c" fn open(path: [*:0]const u8, oflag: c_uint, ...) c_int;
 @@ -86,7 +85,6 @@ pub extern "c" fn pread(fd: fd_t, buf: [*]u8, nbyte: usize, offset: u64) isize;
 pub extern "c" fn preadv(fd: c_int, iov: [*]const iovec, iovcnt: c_uint, offset: u64) isize;
 pub extern "c" fn writev(fd: c_int, iov: [*]const iovec_const, iovcnt: c_uint) isize;
 pub extern "c" fn pwritev(fd: c_int, iov: [*]const iovec_const, iovcnt: c_uint, offset: u64) isize;
-pub extern "c" fn stat(noalias path: [*:0]const u8, noalias buf: *Stat) c_int;
 pub extern "c" fn write(fd: fd_t, buf: [*]const u8, nbyte: usize) isize;
 pub extern "c" fn pwrite(fd: fd_t, buf: [*]const u8, nbyte: usize, offset: u64) isize;
 pub extern "c" fn mmap(addr: ?*align(page_size) c_void, len: usize, prot: c_uint, flags: c_uint, fd: fd_t, offset: u64) *c_void;
 @@ -114,15 +112,10 @@ pub extern "c" fn dup2(old_fd: fd_t, new_fd: fd_t) c_int;
 pub extern "c" fn readlink(noalias path: [*:0]const u8, noalias buf: [*]u8, bufsize: usize) isize;
 pub extern "c" fn readlinkat(dirfd: fd_t, noalias path: [*:0]const u8, noalias buf: [*]u8, bufsize: usize) isize;
 pub extern "c" fn realpath(noalias file_name: [*:0]const u8, noalias resolved_name: [*]u8) ?[*:0]u8;
-pub extern "c" fn sigprocmask(how: c_int, noalias set: ?*const sigset_t, noalias oset: ?*sigset_t) c_int;
-pub extern "c" fn gettimeofday(noalias tv: ?*timeval, noalias tz: ?*timezone) c_int;
-pub extern "c" fn sigaction(sig: c_int, noalias act: *const Sigaction, noalias oact: ?*Sigaction) c_int;
-pub extern "c" fn nanosleep(rqtp: *const timespec, rmtp: ?*timespec) c_int;
 pub extern "c" fn setreuid(ruid: c_uint, euid: c_uint) c_int;
 pub extern "c" fn setregid(rgid: c_uint, egid: c_uint) c_int;
 pub extern "c" fn rmdir(path: [*:0]const u8) c_int;
 pub extern "c" fn getenv(name: [*:0]const u8) ?[*:0]u8;
-pub extern "c" fn getrusage(who: c_int, usage: *rusage) c_int;
 pub extern "c" fn sysctl(name: [*]const c_int, namelen: c_uint, oldp: ?*c_void, oldlenp: ?*usize, newp: ?*c_void, newlen: usize) c_int;
 pub extern "c" fn sysctlbyname(name: [*:0]const u8, oldp: ?*c_void, oldlenp: ?*usize, newp: ?*c_void, newlen: usize) c_int;
 pub extern "c" fn sysctlnametomib(name: [*:0]const u8, mibp: ?*c_int, sizep: ?*usize) c_int;
 @@ -133,7 +126,6 @@ pub extern "c" fn uname(buf: *utsname) c_int;
 pub extern "c" fn gethostname(name: [*]u8, len: usize) c_int;
 pub extern "c" fn bind(socket: fd_t, address: ?*const sockaddr, address_len: socklen_t) c_int;
-pub extern "c" fn socket(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
 pub extern "c" fn socketpair(domain: c_uint, sock_type: c_uint, protocol: c_uint, sv: *[2]fd_t) c_int;
 pub extern "c" fn listen(sockfd: fd_t, backlog: c_uint) c_int;
 pub extern "c" fn getsockname(sockfd: fd_t, noalias addr: *sockaddr, noalias addrlen: *socklen_t) c_int;
 @@ -161,12 +153,55 @@ pub extern fn recvfrom(
     noalias addrlen: ?*socklen_t,
 ) isize;
+pub usingnamespace switch (builtin.os.tag) {
+    .netbsd => struct {
+        pub const clock_getres = __clock_getres50;
+        pub const clock_gettime = __clock_gettime50;
+        pub const fstat = __fstat50;
+        pub const getdents = __getdents30;
+        pub const getrusage = __getrusage50;
+        pub const gettimeofday = __gettimeofday50;
+        pub const nanosleep = __nanosleep50;
+        pub const sched_yield = __libc_thr_yield;
+        pub const sigaction = __sigaction14;
+        pub const sigaltstack = __sigaltstack14;
+        pub const sigprocmask = __sigprocmask14;
+        pub const stat = __stat50;
+    },
+    .macosx, .ios, .watchos, .tvos => struct {
+        // XXX: close -> close$NOCANCEL
+        // XXX: getdirentries -> _getdirentries64
+        pub extern "c" fn clock_getres(clk_id: c_int, tp: *timespec) c_int;
+        pub extern "c" fn clock_gettime(clk_id: c_int, tp: *timespec) c_int;
+        pub const fstat = @"fstat$INODE64";
+        pub extern "c" fn getrusage(who: c_int, usage: *rusage) c_int;
+        pub extern "c" fn gettimeofday(noalias tv: ?*timeval, noalias tz: ?*timezone) c_int;
+        pub extern "c" fn nanosleep(rqtp: *const timespec, rmtp: ?*timespec) c_int;
+        pub extern "c" fn sched_yield() c_int;
+        pub extern "c" fn sigaction(sig: c_int, noalias act: *const Sigaction, noalias oact: ?*Sigaction) c_int;
+        pub extern "c" fn sigprocmask(how: c_int, noalias set: ?*const sigset_t, noalias oset: ?*sigset_t) c_int;
+        pub extern "c" fn socket(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
+        pub extern "c" fn stat(noalias path: [*:0]const u8, noalias buf: *Stat) c_int;
+    },
+    else => struct {
+        pub extern "c" fn clock_getres(clk_id: c_int, tp: *timespec) c_int;
+        pub extern "c" fn clock_gettime(clk_id: c_int, tp: *timespec) c_int;
+        pub extern "c" fn fstat(fd: fd_t, buf: *Stat) c_int;
+        pub extern "c" fn getrusage(who: c_int, usage: *rusage) c_int;
+        pub extern "c" fn gettimeofday(noalias tv: ?*timeval, noalias tz: ?*timezone) c_int;
+        pub extern "c" fn nanosleep(rqtp: *const timespec, rmtp: ?*timespec) c_int;
+        pub extern "c" fn sched_yield() c_int;
+        pub extern "c" fn sigaction(sig: c_int, noalias act: *const Sigaction, noalias oact: ?*Sigaction) c_int;
+        pub extern "c" fn sigprocmask(how: c_int, noalias set: ?*const sigset_t, noalias oset: ?*sigset_t) c_int;
+        pub extern "c" fn socket(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
+        pub extern "c" fn stat(noalias path: [*:0]const u8, noalias buf: *Stat) c_int;
+    },
+};
 pub extern "c" fn kill(pid: pid_t, sig: c_int) c_int;
 pub extern "c" fn getdirentries(fd: fd_t, buf_ptr: [*]u8, nbytes: usize, basep: *i64) isize;
 pub extern "c" fn setgid(ruid: c_uint, euid: c_uint) c_int;
 pub extern "c" fn setuid(uid: c_uint) c_int;
-pub extern "c" fn clock_gettime(clk_id: c_int, tp: *timespec) c_int;
-pub extern "c" fn clock_getres(clk_id: c_int, tp: *timespec) c_int;
 pub extern "c" fn aligned_alloc(alignment: usize, size: usize) ?*c_void;
 pub extern "c" fn malloc(usize) ?*c_void;
 @@ -229,8 +264,6 @@ pub extern "c" fn dn_expand(
     length: c_int,
 ) c_int;
-pub extern "c" fn sched_yield() c_int;
 pub const PTHREAD_MUTEX_INITIALIZER = pthread_mutex_t{};
 pub extern "c" fn pthread_mutex_lock(mutex: *pthread_mutex_t) c_int;
 pub extern "c" fn pthread_mutex_unlock(mutex: *pthread_mutex_t) c_int;

lib/std/c/netbsd.zig+33-11

...	@@ -10,36 +10,58 @@ pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize	...	@@ -10,36 +10,58 @@ pub const dl_iterate_phdr_callback = extern fn (info: *dl_phdr_info, size: usize
10	pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;	10	pub extern "c" fn dl_iterate_phdr(callback: dl_iterate_phdr_callback, data: ?*c_void) c_int;
11		11
12	pub extern "c" fn __fstat50(fd: fd_t, buf: *Stat) c_int;	12	pub extern "c" fn __fstat50(fd: fd_t, buf: *Stat) c_int;
		13	pub extern "c" fn __stat50(path: [:0]const u8, buf: Stat) c_int;
13	pub extern "c" fn __clock_gettime50(clk_id: c_int, tp: *timespec) c_int;	14	pub extern "c" fn __clock_gettime50(clk_id: c_int, tp: *timespec) c_int;
14	pub extern "c" fn __clock_getres50(clk_id: c_int, tp: *timespec) c_int;	15	pub extern "c" fn __clock_getres50(clk_id: c_int, tp: *timespec) c_int;
15	pub extern "c" fn __getdents30(fd: c_int, buf_ptr: [*]u8, nbytes: usize) c_int;	16	pub extern "c" fn __getdents30(fd: c_int, buf_ptr: [*]u8, nbytes: usize) c_int;
16	pub extern "c" fn __sigaltstack14(ss: ?stack_t, old_ss: ?stack_t) c_int;	17	pub extern "c" fn __sigaltstack14(ss: ?stack_t, old_ss: ?stack_t) c_int;
		18	pub extern "c" fn __nanosleep50(rqtp: const timespec, rmtp: ?timespec) c_int;
		19	pub extern "c" fn __sigaction14(sig: c_int, noalias act: const Sigaction, noalias oact: ?Sigaction) c_int;
		20	pub extern "c" fn __sigprocmask14(how: c_int, noalias set: ?const sigset_t, noalias oset: ?sigset_t) c_int;
		21	pub extern "c" fn __socket30(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
		22	pub extern "c" fn __gettimeofday50(noalias tv: ?timeval, noalias tz: ?timezone) c_int;
		23	pub extern "c" fn __getrusage50(who: c_int, usage: *rusage) c_int;
		24	// libc aliases this as sched_yield
		25	pub extern "c" fn __libc_thr_yield() c_int;
17		26
18	pub const pthread_mutex_t = extern struct {	27	pub const pthread_mutex_t = extern struct {
19	ptm_magic: c_uint = 0x33330003,	28	ptm_magic: u32 = 0x33330003,
20	ptm_errorcheck: padded_spin_t = 0,	29	ptm_errorcheck: padded_pthread_spin_t = 0,
21	ptm_unused: padded_spin_t = 0,	30	ptm_ceiling: padded_pthread_spin_t = 0,
22	ptm_owner: usize = 0,	31	ptm_owner: usize = 0,
23	ptm_waiters: ?*u8 = null,	32	ptm_waiters: ?*u8 = null,
24	ptm_recursed: c_uint = 0,	33	ptm_recursed: u32 = 0,
25	ptm_spare2: ?*c_void = null,	34	ptm_spare2: ?*c_void = null,
26	};	35	};
		36
27	pub const pthread_cond_t = extern struct {	37	pub const pthread_cond_t = extern struct {
28	ptc_magic: c_uint = 0x55550005,	38	ptc_magic: u32 = 0x55550005,
29	ptc_lock: pthread_spin_t = 0,	39	ptc_lock: pthread_spin_t = 0,
30	ptc_waiters_first: ?*u8 = null,	40	ptc_waiters_first: ?*u8 = null,
31	ptc_waiters_last: ?*u8 = null,	41	ptc_waiters_last: ?*u8 = null,
32	ptc_mutex: ?*pthread_mutex_t = null,	42	ptc_mutex: ?*pthread_mutex_t = null,
33	ptc_private: ?*c_void = null,	43	ptc_private: ?*c_void = null,
34	};	44	};
35	const pthread_spin_t = if (builtin.arch == .arm or .arch == .powerpc) c_int else u8;	45
36	const padded_spin_t = switch (builtin.arch) {	46	const pthread_spin_t = switch (builtin.arch) {
37	.sparc, .sparcel, .sparcv9, .i386, .x86_64, .le64 => u32,	47	.aarch64, .aarch64_be, .aarch64_32 => u8,
38	else => spin_t,	48	.mips, .mipsel, .mips64, .mips64el => u32,
		49	.powerpc, .powerpc64, .powerpc64le => i32,
		50	.i386, .x86_64 => u8,
		51	.arm, .armeb, .thumb, .thumbeb => i32,
		52	.sparc, .sparcel, .sparcv9 => u8,
		53	.riscv32, .riscv64 => u32,
		54	else => @compileError("undefined pthread_spin_t for this arch"),
		55	};
		56
		57	const padded_pthread_spin_t = switch (builtin.arch) {
		58	.i386, .x86_64 => u32,
		59	.sparc, .sparcel, .sparcv9 => u32,
		60	else => pthread_spin_t,
39	};	61	};
40		62
41	pub const pthread_attr_t = extern struct {	63	pub const pthread_attr_t = extern struct {
42	pta_magic: u32,	64	pta_magic: u32,
43	pta_flags: c_int,	65	pta_flags: i32,
44	pta_private: *c_void,	66	pta_private: ?*c_void,
45	};	67	};

lib/std/debug.zig+11-3

 @@ -1666,7 +1666,11 @@ fn getDebugInfoAllocator() *mem.Allocator {
 }
 /// Whether or not the current target can print useful debug information when a segfault occurs.
-pub const have_segfault_handling_support = builtin.os.tag == .linux or builtin.os.tag == .windows;
+pub const have_segfault_handling_support = switch (builtin.os.tag) {
+    .linux, .netbsd => true,
+    .windows => true,
+    else => false,
+};
 pub const enable_segfault_handler: bool = if (@hasDecl(root, "enable_segfault_handler"))
     root.enable_segfault_handler
 else
 @@ -1718,13 +1722,17 @@ fn resetSegfaultHandler() void {
     os.sigaction(os.SIGBUS, &act, null);
 }
-fn handleSegfaultLinux(sig: i32, info: *const os.siginfo_t, ctx_ptr: *const c_void) callconv(.C) noreturn {
+fn handleSegfaultLinux(sig: i32, info: *const os.siginfo_t, ctx_ptr: ?*const c_void) callconv(.C) noreturn {
     // Reset to the default handler so that if a segfault happens in this handler it will crash
     // the process. Also when this handler returns, the original instruction will be repeated
     // and the resulting segfault will crash the process rather than continually dump stack traces.
     resetSegfaultHandler();
-    const addr = @ptrToInt(info.fields.sigfault.addr);
+    const addr = switch (builtin.os.tag) {
+        .linux => @ptrToInt(info.fields.sigfault.addr),
+        .netbsd => @ptrToInt(info.info.reason.fault.addr),
+        else => unreachable,
+    };
     switch (sig) {
         os.SIGSEGV => std.debug.warn("Segmentation fault at address 0x{x}\n", .{addr}),
         os.SIGILL => std.debug.warn("Illegal instruction at address 0x{x}\n", .{addr}),

lib/std/os.zig+4-26

 @@ -2553,14 +2553,7 @@ pub const FStatError = error{
 pub fn fstat(fd: fd_t) FStatError!Stat {
     var stat: Stat = undefined;
-    const symbol_name = if (comptime std.Target.current.isDarwin())
+    switch (errno(system.fstat(fd, &stat))) {
-        "fstat$INODE64"
-    else if (std.Target.current.os.tag == .netbsd)
-        "__fstat50"
-    else
-        "fstat";
-    switch (errno(@field(system, symbol_name)(fd, &stat))) {
         0 => return stat,
         EINVAL => unreachable,
         EBADF => unreachable, // Always a race condition.
 @@ -3427,12 +3420,7 @@ pub fn clock_gettime(clk_id: i32, tp: *timespec) ClockGetTimeError!void {
         return;
     }
-    const symbol_name = if (std.Target.current.os.tag == .netbsd)
+    switch (errno(system.clock_gettime(clk_id, tp))) {
-        "__clock_gettime50"
-    else
-        "clock_gettime";
-    switch (errno(@field(system, symbol_name)(clk_id, tp))) {
         0 => return,
         EFAULT => unreachable,
         EINVAL => return error.UnsupportedClock,
 @@ -3454,12 +3442,7 @@ pub fn clock_getres(clk_id: i32, res: *timespec) ClockGetTimeError!void {
         return;
     }
-    const symbol_name = if (std.Target.current.os.tag == .netbsd)
+    switch (errno(system.clock_getres(clk_id, res))) {
-        "__clock_getres50"
-    else
-        "clock_getres";
-    switch (errno(@field(system, symbol_name)(clk_id, res))) {
         0 => return,
         EFAULT => unreachable,
         EINVAL => return error.UnsupportedClock,
 @@ -3525,12 +3508,7 @@ pub const SigaltstackError = error{
 } || UnexpectedError;
 pub fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) SigaltstackError!void {
-    const symbol_name = if (std.Target.current.os.tag == .netbsd)
+    switch (errno(system.sigaltstack(ss, old_ss))) {
-        "__sigaltstack14"
-    else
-        "sigaltstack";
-    switch (errno(@field(system, symbol_name)(ss, old_ss))) {
         0 => return,
         EFAULT => unreachable,
         EINVAL => unreachable,

lib/std/os/bits/linux.zig+8-6

 @@ -813,13 +813,13 @@ pub const app_mask: sigset_t = [2]u32{ 0xfffffffc, 0x7fffffff } ++ [_]u32{0xffff
 pub const k_sigaction = if (is_mips)
     extern struct {
         flags: usize,
-        sigaction: ?extern fn (i32, *siginfo_t, *c_void) void,
+        sigaction: ?extern fn (i32, *siginfo_t, ?*c_void) void,
         mask: [4]u32,
         restorer: extern fn () void,
     }
 else
     extern struct {
-        sigaction: ?extern fn (i32, *siginfo_t, *c_void) void,
+        sigaction: ?extern fn (i32, *siginfo_t, ?*c_void) void,
         flags: usize,
         restorer: extern fn () void,
         mask: [2]u32,
 @@ -827,15 +827,17 @@ else
 /// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
 pub const Sigaction = extern struct {
-    sigaction: ?extern fn (i32, *siginfo_t, *c_void) void,
+    pub const sigaction_fn = fn (i32, *siginfo_t, ?*c_void) callconv(.C) void;
+    sigaction: ?sigaction_fn,
     mask: sigset_t,
     flags: u32,
     restorer: ?extern fn () void = null,
 };
-pub const SIG_ERR = @intToPtr(extern fn (i32, *siginfo_t, *c_void) void, maxInt(usize));
+pub const SIG_ERR = @intToPtr(?Sigaction.sigaction_fn, maxInt(usize));
-pub const SIG_DFL = @intToPtr(?extern fn (i32, *siginfo_t, *c_void) void, 0);
+pub const SIG_DFL = @intToPtr(?Sigaction.sigaction_fn, 0);
-pub const SIG_IGN = @intToPtr(extern fn (i32, *siginfo_t, *c_void) void, 1);
+pub const SIG_IGN = @intToPtr(?Sigaction.sigaction_fn, 1);
 pub const empty_sigset = [_]u32{0} ** sigset_t.len;
 pub const in_port_t = u16;

lib/std/os/bits/netbsd.zig+114-26

...	@@ -1,12 +1,22 @@	...	@@ -1,12 +1,22 @@
1	const std = @import("../../std.zig");	1	const std = @import("../../std.zig");
		2	const builtin = std.builtin;
2	const maxInt = std.math.maxInt;	3	const maxInt = std.math.maxInt;
3		4
		5	pub const blkcnt_t = i64;
		6	pub const blksize_t = i32;
		7	pub const clock_t = u32;
		8	pub const dev_t = u64;
4	pub const fd_t = i32;	9	pub const fd_t = i32;
5	pub const pid_t = i32;	10	pub const gid_t = u32;
6	pub const mode_t = u32;
7	pub const ino_t = u64;	11	pub const ino_t = u64;
		12	pub const mode_t = u32;
		13	pub const nlink_t = u32;
8	pub const off_t = i64;	14	pub const off_t = i64;
		15	pub const pid_t = i32;
9	pub const socklen_t = u32;	16	pub const socklen_t = u32;
		17	pub const time_t = i64;
		18	pub const uid_t = u32;
		19	pub const lwpid_t = i32;
10		20
11	/// Renamed from `kevent` to `Kevent` to avoid conflict with function name.	21	/// Renamed from `kevent` to `Kevent` to avoid conflict with function name.
12	pub const Kevent = extern struct {	22	pub const Kevent = extern struct {
...	@@ -137,23 +147,20 @@ pub const msghdr_const = extern struct {	...	@@ -137,23 +147,20 @@ pub const msghdr_const = extern struct {
137	/// in C, macros are used to hide the differences. Here we use	147	/// in C, macros are used to hide the differences. Here we use
138	/// methods to accomplish this.	148	/// methods to accomplish this.
139	pub const Stat = extern struct {	149	pub const Stat = extern struct {
140	dev: u64,	150	dev: dev_t,
141	mode: u32,	151	mode: mode_t,
142	ino: ino_t,	152	ino: ino_t,
143	nlink: usize,	153	nlink: nlink_t,
144		154	uid: uid_t,
145	uid: u32,	155	gid: gid_t,
146	gid: u32,	156	rdev: dev_t,
147	rdev: u64,
148
149	atim: timespec,	157	atim: timespec,
150	mtim: timespec,	158	mtim: timespec,
151	ctim: timespec,	159	ctim: timespec,
152	birthtim: timespec,	160	birthtim: timespec,
153
154	size: off_t,	161	size: off_t,
155	blocks: i64,	162	blocks: blkcnt_t,
156	blksize: isize,	163	blksize: blksize_t,
157	flags: u32,	164	flags: u32,
158	gen: u32,	165	gen: u32,
159	__spare: [2]u32,	166	__spare: [2]u32,
...	@@ -176,12 +183,14 @@ pub const timespec = extern struct {	...	@@ -176,12 +183,14 @@ pub const timespec = extern struct {
176	tv_nsec: isize,	183	tv_nsec: isize,
177	};	184	};
178		185
		186	pub const MAXNAMLEN = 511;
		187
179	pub const dirent = extern struct {	188	pub const dirent = extern struct {
180	d_fileno: u64,	189	d_fileno: ino_t,
181	d_reclen: u16,	190	d_reclen: u16,
182	d_namlen: u16,	191	d_namlen: u16,
183	d_type: u8,	192	d_type: u8,
184	d_name: [512]u8,	193	d_name: [MAXNAMLEN:0]u8,
185		194
186	pub fn reclen(self: dirent) u16 {	195	pub fn reclen(self: dirent) u16 {
187	return self.d_reclen;	196	return self.d_reclen;
...	@@ -685,23 +694,74 @@ pub const winsize = extern struct {	...	@@ -685,23 +694,74 @@ pub const winsize = extern struct {
685		694
686	const NSIG = 32;	695	const NSIG = 32;
687		696
688	pub const SIG_ERR = @intToPtr(extern fn (i32) void, maxInt(usize));	697	pub const SIG_ERR = @intToPtr(?Sigaction.sigaction_fn, maxInt(usize));
689	pub const SIG_DFL = @intToPtr(extern fn (i32) void, 0);	698	pub const SIG_DFL = @intToPtr(?Sigaction.sigaction_fn, 0);
690	pub const SIG_IGN = @intToPtr(extern fn (i32) void, 1);	699	pub const SIG_IGN = @intToPtr(?Sigaction.sigaction_fn, 1);
691		700
692	/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.	701	/// Renamed from `sigaction` to `Sigaction` to avoid conflict with the syscall.
693	pub const Sigaction = extern struct {	702	pub const Sigaction = extern struct {
		703	pub const sigaction_fn = fn (i32, siginfo_t, ?c_void) callconv(.C) void;
694	/// signal handler	704	/// signal handler
695	__sigaction_u: extern union {	705	sigaction: ?sigaction_fn,
696	__sa_handler: extern fn (i32) void,	706	/// signal mask to apply
697	__sa_sigaction: extern fn (i32, *__siginfo, usize) void,	707	mask: sigset_t,
698	},	708	/// signal options
		709	flags: u32,
		710	};
699		711
700	/// see signal options	712	pub const sigval_t = extern union {
701	sa_flags: u32,	713	int: i32,
		714	ptr: ?*c_void,
		715	};
702		716
703	/// signal mask to apply	717	pub const siginfo_t = extern union {
704	sa_mask: sigset_t,	718	pad: [128]u8,
		719	info: _ksiginfo,
		720	};
		721
		722	pub const _ksiginfo = extern struct {
		723	signo: i32,
		724	code: i32,
		725	errno: i32,
		726	// 64bit architectures insert 4bytes of padding here, this is done by
		727	// correctly aligning the reason field
		728	reason: extern union {
		729	rt: extern struct {
		730	pid: pid_t,
		731	uid: uid_t,
		732	value: sigval_t,
		733	},
		734	child: extern struct {
		735	pid: pid_t,
		736	uid: uid_t,
		737	status: i32,
		738	utime: clock_t,
		739	stime: clock_t,
		740	},
		741	fault: extern struct {
		742	addr: ?*c_void,
		743	trap: i32,
		744	trap2: i32,
		745	trap3: i32,
		746	},
		747	poll: extern struct {
		748	band: i32,
		749	fd: i32,
		750	},
		751	syscall: extern struct {
		752	sysnum: i32,
		753	retval: [2]i32,
		754	@"error": i32,
		755	args: [8]u64,
		756	},
		757	ptrace_state: extern struct {
		758	pe_report_event: i32,
		759	option: extern union {
		760	pe_other_pid: pid_t,
		761	pe_lwp: lwpid_t,
		762	},
		763	},
		764	} align(@sizeOf(usize)),
705	};	765	};
706		766
707	pub const _SIG_WORDS = 4;	767	pub const _SIG_WORDS = 4;
...	@@ -724,6 +784,34 @@ pub const sigset_t = extern struct {	...	@@ -724,6 +784,34 @@ pub const sigset_t = extern struct {
724	__bits: [_SIG_WORDS]u32,	784	__bits: [_SIG_WORDS]u32,
725	};	785	};
726		786
		787	pub const empty_sigset = sigset_t{ .__bits = [_]u32{0} ** _SIG_WORDS };
		788
		789	// XXX x86_64 specific
		790	pub const mcontext_t = extern struct {
		791	gregs: [26]u64,
		792	mc_tlsbase: u64,
		793	fpregs: [512]u8 align(8),
		794	};
		795
		796	pub const REG_RBP = 12;
		797	pub const REG_RIP = 21;
		798	pub const REG_RSP = 24;
		799
		800	pub const ucontext_t = extern struct {
		801	flags: u32,
		802	link: ?*ucontext_t,
		803	sigmask: sigset_t,
		804	stack: stack_t,
		805	mcontext: mcontext_t,
		806	__pad: [switch (builtin.arch) {
		807	.i386 => 4,
		808	.mips, .mipsel, .mips64, .mips64el => 14,
		809	.arm, .armeb, .thumb, .thumbeb => 1,
		810	.sparc, .sparcel, .sparcv9 => if (@sizeOf(usize) == 4) 43 else 8,
		811	else => 0,
		812	}]u32,
		813	};
		814
727	pub const EPERM = 1; // Operation not permitted	815	pub const EPERM = 1; // Operation not permitted
728	pub const ENOENT = 2; // No such file or directory	816	pub const ENOENT = 2; // No such file or directory
729	pub const ESRCH = 3; // No such process	817	pub const ESRCH = 3; // No such process

author	Andrew Kelley <andrew@ziglang.org> 2020-04-01 10:24:54-04:00
committer	GitHub <noreply@github.com> 2020-04-01 10:24:54-04:00
log	e8a1e2a1d8f2903d5951339f7d3e0dbdfc85704c
tree	41f671fd9924644bb3e3f1bcd771822087a527d0
parent	0628c2e2bae0a847dee4863521d9e6f4d9383e83
parent	5047cd3d782c51474216eda92ea457315bc4f8b5
signature	Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #4894 from LemonBoy/netbsd-p2