|
@@ -4,22 +4,40 @@
|
|
|
#include <errno.h>
|
|
|
#include "syscall.h"
|
|
|
|
|
|
+#define IS32BIT(x) !((x)+0x80000000ULL>>32)
|
|
|
+#define CLAMP(x) (int)(IS32BIT(x) ? (x) : 0x7fffffffU+((0ULL+(x))>>63))
|
|
|
+
|
|
|
int select(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, struct timeval *restrict tv)
|
|
|
{
|
|
|
+ time_t s = tv ? tv->tv_sec : 0;
|
|
|
+ suseconds_t us = tv ? tv->tv_usec : 0;
|
|
|
+ long ns;
|
|
|
+ const time_t max_time = (1ULL<<8*sizeof(time_t)-1)-1;
|
|
|
+
|
|
|
+ if (s<0 || us<0) return __syscall_ret(-EINVAL);
|
|
|
+ if (us/1000000 > max_time - s) {
|
|
|
+ s = max_time;
|
|
|
+ us = 999999;
|
|
|
+ ns = 999999999;
|
|
|
+ } else {
|
|
|
+ s += us/1000000;
|
|
|
+ us %= 1000000;
|
|
|
+ ns = us*1000;
|
|
|
+ }
|
|
|
+
|
|
|
+#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,
|
|
|
+ tv ? ((long long[]){s, ns}) : 0,
|
|
|
+ ((syscall_arg_t[]){ 0, _NSIG/8 }));
|
|
|
+ if (SYS_pselect6 == SYS_pselect6_time64 || r!=-ENOSYS)
|
|
|
+ return __syscall_ret(r);
|
|
|
+#endif
|
|
|
#ifdef SYS_select
|
|
|
- return syscall_cp(SYS_select, n, rfds, wfds, efds, tv);
|
|
|
+ return syscall_cp(SYS_select, n, rfds, wfds, efds, ((long[]){s, us}));
|
|
|
#else
|
|
|
- syscall_arg_t data[2] = { 0, _NSIG/8 };
|
|
|
- struct timespec ts;
|
|
|
- if (tv) {
|
|
|
- if (tv->tv_sec < 0 || tv->tv_usec < 0)
|
|
|
- return __syscall_ret(-EINVAL);
|
|
|
- time_t extra_secs = tv->tv_usec / 1000000;
|
|
|
- ts.tv_nsec = tv->tv_usec % 1000000 * 1000;
|
|
|
- const time_t max_time = (1ULL<<8*sizeof(time_t)-1)-1;
|
|
|
- ts.tv_sec = extra_secs > max_time - tv->tv_sec ?
|
|
|
- max_time : tv->tv_sec + extra_secs;
|
|
|
- }
|
|
|
- return syscall_cp(SYS_pselect6, n, rfds, wfds, efds, tv ? &ts : 0, data);
|
|
|
+ return syscall_cp(SYS_pselect6, n, rfds, wfds, efds,
|
|
|
+ tv ? ((long[]){s, ns}) : 0, ((syscall_arg_t[]){ 0, _NSIG/8 }));
|
|
|
#endif
|
|
|
}
|