authorgravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2020-04-01 10:00:37+00:00
committergravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2020-04-01 12:23:18+02:00
log4209ab90a8a9922bcc407e12b0e58b827a179a91
tree6ac13422bc623d261d90ef1a64ab70375dc2538e
parent070ace4b22810116f7816eeccbc1ce600be5b2a2

std: Use the versioned libc symbols if needed

Many symbols on NetBSD and some on OSX require the definition of an alias.

3 files changed, 50 insertions(+), 39 deletions(-)

lib/std/c.zig+45-12
......@@ -73,7 +73,6 @@ pub extern "c" fn abort() noreturn;
7373pub extern "c" fn exit(code: c_int) noreturn;
7474pub extern "c" fn isatty(fd: fd_t) c_int;
7575pub extern "c" fn close(fd: fd_t) c_int;
76pub extern "c" fn fstat(fd: fd_t, buf: *Stat) c_int;
7776pub extern "c" fn fstatat(dirfd: fd_t, path: [*:0]const u8, stat_buf: *Stat, flags: u32) c_int;
7877pub extern "c" fn lseek(fd: fd_t, offset: off_t, whence: c_int) off_t;
7978pub 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;
8685pub extern "c" fn preadv(fd: c_int, iov: [*]const iovec, iovcnt: c_uint, offset: u64) isize;
8786pub extern "c" fn writev(fd: c_int, iov: [*]const iovec_const, iovcnt: c_uint) isize;
8887pub extern "c" fn pwritev(fd: c_int, iov: [*]const iovec_const, iovcnt: c_uint, offset: u64) isize;
89pub extern "c" fn stat(noalias path: [*:0]const u8, noalias buf: *Stat) c_int;
9088pub extern "c" fn write(fd: fd_t, buf: [*]const u8, nbyte: usize) isize;
9189pub extern "c" fn pwrite(fd: fd_t, buf: [*]const u8, nbyte: usize, offset: u64) isize;
9290pub 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;
114112pub extern "c" fn readlink(noalias path: [*:0]const u8, noalias buf: [*]u8, bufsize: usize) isize;
115113pub extern "c" fn readlinkat(dirfd: fd_t, noalias path: [*:0]const u8, noalias buf: [*]u8, bufsize: usize) isize;
116114pub extern "c" fn realpath(noalias file_name: [*:0]const u8, noalias resolved_name: [*]u8) ?[*:0]u8;
117pub extern "c" fn sigprocmask(how: c_int, noalias set: ?*const sigset_t, noalias oset: ?*sigset_t) c_int;
118pub extern "c" fn gettimeofday(noalias tv: ?*timeval, noalias tz: ?*timezone) c_int;
119pub extern "c" fn sigaction(sig: c_int, noalias act: *const Sigaction, noalias oact: ?*Sigaction) c_int;
120pub extern "c" fn nanosleep(rqtp: *const timespec, rmtp: ?*timespec) c_int;
121115pub extern "c" fn setreuid(ruid: c_uint, euid: c_uint) c_int;
122116pub extern "c" fn setregid(rgid: c_uint, egid: c_uint) c_int;
123117pub extern "c" fn rmdir(path: [*:0]const u8) c_int;
124118pub extern "c" fn getenv(name: [*:0]const u8) ?[*:0]u8;
125pub extern "c" fn getrusage(who: c_int, usage: *rusage) c_int;
126119pub extern "c" fn sysctl(name: [*]const c_int, namelen: c_uint, oldp: ?*c_void, oldlenp: ?*usize, newp: ?*c_void, newlen: usize) c_int;
127120pub extern "c" fn sysctlbyname(name: [*:0]const u8, oldp: ?*c_void, oldlenp: ?*usize, newp: ?*c_void, newlen: usize) c_int;
128121pub 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;
133126
134127pub extern "c" fn gethostname(name: [*]u8, len: usize) c_int;
135128pub extern "c" fn bind(socket: fd_t, address: ?*const sockaddr, address_len: socklen_t) c_int;
136pub extern "c" fn socket(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
137129pub extern "c" fn socketpair(domain: c_uint, sock_type: c_uint, protocol: c_uint, sv: *[2]fd_t) c_int;
138130pub extern "c" fn listen(sockfd: fd_t, backlog: c_uint) c_int;
139131pub extern "c" fn getsockname(sockfd: fd_t, noalias addr: *sockaddr, noalias addrlen: *socklen_t) c_int;
......@@ -161,12 +153,55 @@ pub extern fn recvfrom(
161153 noalias addrlen: ?*socklen_t,
162154) isize;
163155
156pub usingnamespace switch (builtin.os.tag) {
157 .netbsd => struct {
158 pub const clock_getres = __clock_getres50;
159 pub const clock_gettime = __clock_gettime50;
160 pub const fstat = __fstat50;
161 pub const getdents = __getdents30;
162 pub const getrusage = __getrusage50;
163 pub const gettimeofday = __gettimeofday50;
164 pub const nanosleep = __nanosleep50;
165 pub const sched_yield = __libc_thr_yield;
166 pub const sigaction = __sigaction14;
167 pub const sigaltstack = __sigaltstack14;
168 pub const sigprocmask = __sigprocmask14;
169 pub const stat = __stat50;
170 },
171 .macosx, .ios, .watchos, .tvos => struct {
172 // XXX: close -> close$NOCANCEL
173 // XXX: getdirentries -> _getdirentries64
174 pub extern "c" fn clock_getres(clk_id: c_int, tp: *timespec) c_int;
175 pub extern "c" fn clock_gettime(clk_id: c_int, tp: *timespec) c_int;
176 pub const fstat = @"fstat$INODE64";
177 pub extern "c" fn getrusage(who: c_int, usage: *rusage) c_int;
178 pub extern "c" fn gettimeofday(noalias tv: ?*timeval, noalias tz: ?*timezone) c_int;
179 pub extern "c" fn nanosleep(rqtp: *const timespec, rmtp: ?*timespec) c_int;
180 pub extern "c" fn sched_yield() c_int;
181 pub extern "c" fn sigaction(sig: c_int, noalias act: *const Sigaction, noalias oact: ?*Sigaction) c_int;
182 pub extern "c" fn sigprocmask(how: c_int, noalias set: ?*const sigset_t, noalias oset: ?*sigset_t) c_int;
183 pub extern "c" fn socket(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
184 pub extern "c" fn stat(noalias path: [*:0]const u8, noalias buf: *Stat) c_int;
185 },
186 else => struct {
187 pub extern "c" fn clock_getres(clk_id: c_int, tp: *timespec) c_int;
188 pub extern "c" fn clock_gettime(clk_id: c_int, tp: *timespec) c_int;
189 pub extern "c" fn fstat(fd: fd_t, buf: *Stat) c_int;
190 pub extern "c" fn getrusage(who: c_int, usage: *rusage) c_int;
191 pub extern "c" fn gettimeofday(noalias tv: ?*timeval, noalias tz: ?*timezone) c_int;
192 pub extern "c" fn nanosleep(rqtp: *const timespec, rmtp: ?*timespec) c_int;
193 pub extern "c" fn sched_yield() c_int;
194 pub extern "c" fn sigaction(sig: c_int, noalias act: *const Sigaction, noalias oact: ?*Sigaction) c_int;
195 pub extern "c" fn sigprocmask(how: c_int, noalias set: ?*const sigset_t, noalias oset: ?*sigset_t) c_int;
196 pub extern "c" fn socket(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
197 pub extern "c" fn stat(noalias path: [*:0]const u8, noalias buf: *Stat) c_int;
198 },
199};
200
164201pub extern "c" fn kill(pid: pid_t, sig: c_int) c_int;
165202pub extern "c" fn getdirentries(fd: fd_t, buf_ptr: [*]u8, nbytes: usize, basep: *i64) isize;
166203pub extern "c" fn setgid(ruid: c_uint, euid: c_uint) c_int;
167204pub extern "c" fn setuid(uid: c_uint) c_int;
168pub extern "c" fn clock_gettime(clk_id: c_int, tp: *timespec) c_int;
169pub extern "c" fn clock_getres(clk_id: c_int, tp: *timespec) c_int;
170205
171206pub extern "c" fn aligned_alloc(alignment: usize, size: usize) ?*c_void;
172207pub extern "c" fn malloc(usize) ?*c_void;
......@@ -229,8 +264,6 @@ pub extern "c" fn dn_expand(
229264 length: c_int,
230265) c_int;
231266
232pub extern "c" fn sched_yield() c_int;
233
234267pub const PTHREAD_MUTEX_INITIALIZER = pthread_mutex_t{};
235268pub extern "c" fn pthread_mutex_lock(mutex: *pthread_mutex_t) c_int;
236269pub extern "c" fn pthread_mutex_unlock(mutex: *pthread_mutex_t) c_int;
lib/std/c/netbsd.zig+1-1
......@@ -21,7 +21,7 @@ pub extern "c" fn __sigprocmask14(how: c_int, noalias set: ?*const sigset_t, noa
2121pub extern "c" fn __socket30(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
2222pub extern "c" fn __gettimeofday50(noalias tv: ?*timeval, noalias tz: ?*timezone) c_int;
2323pub extern "c" fn __getrusage50(who: c_int, usage: *rusage) c_int;
24// instead of sched_yield
24// libc aliases this as sched_yield
2525pub extern "c" fn __libc_thr_yield() c_int;
2626
2727pub const pthread_mutex_t = extern struct {
lib/std/os.zig+4-26
......@@ -2553,14 +2553,7 @@ pub const FStatError = error{
25532553pub fn fstat(fd: fd_t) FStatError!Stat {
25542554 var stat: Stat = undefined;
25552555
2556 const symbol_name = if (comptime std.Target.current.isDarwin())
2557 "fstat$INODE64"
2558 else if (std.Target.current.os.tag == .netbsd)
2559 "__fstat50"
2560 else
2561 "fstat";
2562
2563 switch (errno(@field(system, symbol_name)(fd, &stat))) {
2556 switch (errno(system.fstat(fd, &stat))) {
25642557 0 => return stat,
25652558 EINVAL => unreachable,
25662559 EBADF => unreachable, // Always a race condition.
......@@ -3427,12 +3420,7 @@ pub fn clock_gettime(clk_id: i32, tp: *timespec) ClockGetTimeError!void {
34273420 return;
34283421 }
34293422
3430 const symbol_name = if (std.Target.current.os.tag == .netbsd)
3431 "__clock_gettime50"
3432 else
3433 "clock_gettime";
3434
3435 switch (errno(@field(system, symbol_name)(clk_id, tp))) {
3423 switch (errno(system.clock_gettime(clk_id, tp))) {
34363424 0 => return,
34373425 EFAULT => unreachable,
34383426 EINVAL => return error.UnsupportedClock,
......@@ -3454,12 +3442,7 @@ pub fn clock_getres(clk_id: i32, res: *timespec) ClockGetTimeError!void {
34543442 return;
34553443 }
34563444
3457 const symbol_name = if (std.Target.current.os.tag == .netbsd)
3458 "__clock_getres50"
3459 else
3460 "clock_getres";
3461
3462 switch (errno(@field(system, symbol_name)(clk_id, res))) {
3445 switch (errno(system.clock_getres(clk_id, res))) {
34633446 0 => return,
34643447 EFAULT => unreachable,
34653448 EINVAL => return error.UnsupportedClock,
......@@ -3525,12 +3508,7 @@ pub const SigaltstackError = error{
35253508} || UnexpectedError;
35263509
35273510pub fn sigaltstack(ss: ?*stack_t, old_ss: ?*stack_t) SigaltstackError!void {
3528 const symbol_name = if (std.Target.current.os.tag == .netbsd)
3529 "__sigaltstack14"
3530 else
3531 "sigaltstack";
3532
3533 switch (errno(@field(system, symbol_name)(ss, old_ss))) {
3511 switch (errno(system.sigaltstack(ss, old_ss))) {
35343512 0 => return,
35353513 EFAULT => unreachable,
35363514 EINVAL => unreachable,