RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-02-20 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

pselect, ppoll: add time64 syscall support, decouple 32-bit time_t

Browse Source 
time64 syscall is used only if it's the only one defined for the arch,
or if the requested timeout length does not fit in 32 bits. on current
32-bit archs where time_t is a 32-bit type, this makes it statically
unreachable.

on 64-bit archs, there are only superficial changes to the code after
preprocessing. both before and after these changes, these functions
copied their timeout arguments to avoid letting the kernel clobber the
caller's copies. now, the copying also serves to change the type from
userspace timespec to a pair of longs, which makes a difference only
in the 32-bit fallback case, not on 64-bit.
This commit is contained in:
Rich Felker 2019-07-28 18:15:22 -04:00
parent 1492bdf53c
commit 22276671d0
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/linux/ppoll.c
View File

@ -1,10 +1,26 @@
#define _GNU_SOURCE
#include <poll.h>
#include <signal.h>
#include <errno.h>
#include "syscall.h"
#define IS32BIT(x) !((x)+0x80000000ULL>>32)
#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
int ppoll(struct pollfd *fds, nfds_t n, const struct timespec *to, const sigset_t *mask)
{
time_t s = to ? to->tv_sec : 0;
long ns = to ? to->tv_nsec : 0;
#ifdef SYS_ppoll_time64
int r = -ENOSYS;
if (SYS_ppoll == SYS_ppoll_time64 || !IS32BIT(s))
r = __syscall_cp(SYS_ppoll_time64, fds, n,
to ? ((long long[]){s, ns}) : 0,
mask, _NSIG/8);
if (SYS_ppoll == SYS_ppoll_time64 || r != -ENOSYS)
return __syscall_ret(r);
s = CLAMP(s);
#endif
return syscall_cp(SYS_ppoll, fds, n,
to ? (struct timespec []){*to} : 0, mask, _NSIG/8);
to ? ((long[]){s, ns}) : 0, mask, _NSIG/8);
}

20
src/select/pselect.c
View File

@ -1,12 +1,26 @@
#include <sys/select.h>
#include <signal.h>
#include <stdint.h>
#include <errno.h>
#include "syscall.h"
#define IS32BIT(x) !((x)+0x80000000ULL>>32)
#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
int pselect(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, const struct timespec *restrict ts, const sigset_t *restrict mask)
{
syscall_arg_t data[2] = { (uintptr_t)mask, _NSIG/8 };
struct timespec ts_tmp;
if (ts) ts_tmp = *ts;
return syscall_cp(SYS_pselect6, n, rfds, wfds, efds, ts ? &ts_tmp : 0, data);
time_t s = ts ? ts->tv_sec : 0;
long ns = ts ? ts->tv_nsec : 0;
#ifdef SYS_pselect6_time64
int r = -ENOSYS;
if (SYS_pselect6 == SYS_pselect6_time64 || !IS32BIT(s))
r = __syscall_cp(SYS_pselect6_time64, n, rfds, wfds, efds,
ts ? ((long long[]){s, ns}) : 0, data);
if (SYS_pselect6 == SYS_pselect6_time64 || r!=-ENOSYS)
return __syscall_ret(r);
s = CLAMP(s);
#endif
return syscall_cp(SYS_pselect6, n, rfds, wfds, efds,
ts ? ((long[]){s, ns}) : 0, data);
}