Index: distrib/sets/lists/comp/mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/comp/mi,v retrieving revision 1.2331 diff -u -r1.2331 mi --- distrib/sets/lists/comp/mi 30 May 2020 20:47:58 -0000 1.2331 +++ distrib/sets/lists/comp/mi 1 Jun 2020 16:00:48 -0000 @@ -4518,8 +4518,9 @@ ./usr/share/man/cat2/pipe2.0 comp-c-catman .cat ./usr/share/man/cat2/pmc_control.0 comp-obsolete obsolete ./usr/share/man/cat2/pmc_get_info.0 comp-obsolete obsolete +./usr/share/man/cat2/ppoll.0 comp-c-catman .cat ./usr/share/man/cat2/poll.0 comp-c-catman .cat -./usr/share/man/cat2/pollts.0 comp-c-catman .cat +./usr/share/man/cat2/pollts.0 comp-obsolete obsolete ./usr/share/man/cat2/posix_fadvise.0 comp-c-catman .cat ./usr/share/man/cat2/posix_fallocate.0 comp-c-catman .cat ./usr/share/man/cat2/posix_madvise.0 comp-c-catman .cat @@ -12682,8 +12683,9 @@ ./usr/share/man/html2/pipe2.html comp-c-htmlman html ./usr/share/man/html2/pmc_control.html comp-obsolete obsolete ./usr/share/man/html2/pmc_get_info.html comp-obsolete obsolete +./usr/share/man/html2/ppoll.html comp-c-htmlman html ./usr/share/man/html2/poll.html comp-c-htmlman html -./usr/share/man/html2/pollts.html comp-c-htmlman html +./usr/share/man/html2/pollts.html comp-obsolete obsolete ./usr/share/man/html2/posix_fadvise.html comp-c-htmlman html ./usr/share/man/html2/posix_fallocate.html comp-c-htmlman html ./usr/share/man/html2/posix_madvise.html comp-c-htmlman html @@ -20674,8 +20676,9 @@ ./usr/share/man/man2/pipe2.2 comp-c-man .man ./usr/share/man/man2/pmc_control.2 comp-obsolete obsolete ./usr/share/man/man2/pmc_get_info.2 comp-obsolete obsolete +./usr/share/man/man2/ppoll.2 comp-c-man .man ./usr/share/man/man2/poll.2 comp-c-man .man -./usr/share/man/man2/pollts.2 comp-c-man .man +./usr/share/man/man2/pollts.2 comp-obsolete obsolete ./usr/share/man/man2/posix_fadvise.2 comp-c-man .man ./usr/share/man/man2/posix_fallocate.2 comp-c-man .man ./usr/share/man/man2/posix_madvise.2 comp-c-man .man Index: external/gpl3/binutils/dist/binutils/doc/c++filt.1 =================================================================== RCS file: /cvsroot/src/external/gpl3/binutils/dist/binutils/doc/Attic/c++filt.1,v retrieving revision 1.1 diff -u -r1.1 c++filt.1 --- external/gpl3/binutils/dist/binutils/doc/c++filt.1 3 Apr 2020 23:49:38 -0000 1.1 +++ external/gpl3/binutils/dist/binutils/doc/c++filt.1 1 Jun 2020 16:00:53 -0000 @@ -139,7 +139,7 @@ .if n .ad l .nh .SH "NAME" -c++filt \- demangle C++ and Java symbols +cxxfilt \- demangle C++ and Java symbols .SH "SYNOPSIS" .IX Header "SYNOPSIS" c++filt [\fB\-_\fR|\fB\-\-strip\-underscore\fR] Index: lib/libc/compat/sys/compat_select.c =================================================================== RCS file: /cvsroot/src/lib/libc/compat/sys/compat_select.c,v retrieving revision 1.2 diff -u -r1.2 compat_select.c --- lib/libc/compat/sys/compat_select.c 11 Jan 2009 02:46:26 -0000 1.2 +++ lib/libc/compat/sys/compat_select.c 1 Jun 2020 16:00:59 -0000 @@ -45,8 +45,12 @@ #include #include +__warn_references(ppoll, + "warning: reference to compatibility ppoll(); include to generate correct reference") __warn_references(pollts, "warning: reference to compatibility pollts(); include to generate correct reference") +__warn_references(__pollts50, + "warning: this program uses pollts(), which is deprecated.") __warn_references(select, "warning: reference to compatibility select(); include to generate correct reference") __warn_references(pselect, @@ -57,11 +61,15 @@ __weak_alias(_sys_select, _select) __weak_alias(pselect, _pselect) __weak_alias(_sys_pselect, _pselect) +__weak_alias(ppoll, _ppoll) +__weak_alias(_sys_ppoll, _ppoll) __weak_alias(pollts, _pollts) __weak_alias(_sys_pollts, _pollts) +__weak_alias(__pollts50, _sys___pollts50) +__weak_alias(___pollts50, _sys___pollts50) #endif int -pollts(struct pollfd * __restrict fds, nfds_t nfds, +ppoll(struct pollfd * __restrict fds, nfds_t nfds, const struct timespec50 * __restrict tim50, const sigset_t * __restrict sigmask) { @@ -71,7 +79,25 @@ timespec50_to_timespec(tim50, timp = &tim); else timp = NULL; - return __pollts50(fds, nfds, timp, sigmask); + return __ppoll50(fds, nfds, timp, sigmask); +} + +int +pollts(struct pollfd * __restrict fds, nfds_t nfds, + const struct timespec50 * __restrict tim50, + const sigset_t * __restrict sigmask) +{ + + return ppoll(fds, nfds, tim50, sigmask); +} + +int +__pollts50(struct pollfd * __restrict fds, nfds_t nfds, + const struct timespec * __restrict tim, + const sigset_t * __restrict sigmask) +{ + + return __ppoll50(fds, nfds, tim, sigmask); } int Index: lib/libc/include/namespace.h =================================================================== RCS file: /cvsroot/src/lib/libc/include/namespace.h,v retrieving revision 1.199 diff -u -r1.199 namespace.h --- lib/libc/include/namespace.h 6 May 2020 16:17:36 -0000 1.199 +++ lib/libc/include/namespace.h 1 Jun 2020 16:00:59 -0000 @@ -555,7 +555,9 @@ #define pmap_set _pmap_set #define pmap_unset _pmap_unset #define paccept _paccept +#define ppoll _ppoll #define pollts _pollts +#define __pollts50 _sys___pollts50 #define popen _popen #define posix2time _posix2time #define posix2time_z _posix2time_z Index: lib/libc/rpc/clnt_bcast.c =================================================================== RCS file: /cvsroot/src/lib/libc/rpc/clnt_bcast.c,v retrieving revision 1.26 diff -u -r1.26 clnt_bcast.c --- lib/libc/rpc/clnt_bcast.c 11 Mar 2013 20:19:28 -0000 1.26 +++ lib/libc/rpc/clnt_bcast.c 1 Jun 2020 16:00:59 -0000 @@ -525,7 +525,7 @@ ts.tv_sec = msec / 1000; ts.tv_nsec = (msec % 1000) * 1000000; - switch (pollretval = pollts(pfd, fdlistno, &ts, NULL)) { + switch (pollretval = ppoll(pfd, fdlistno, &ts, NULL)) { case 0: /* timed out */ stat = RPC_TIMEDOUT; continue; @@ -542,7 +542,7 @@ else if (pfd[i].revents & POLLNVAL) { /* * Something bad has happened to this descri- - * ptor. We can cause pollts() to ignore + * ptor. We can cause ppoll() to ignore * it simply by using a negative fd. We do that * rather than compacting the pfd[] and fdlist[] * arrays. Index: lib/libc/rpc/clnt_dg.c =================================================================== RCS file: /cvsroot/src/lib/libc/rpc/clnt_dg.c,v retrieving revision 1.29 diff -u -r1.29 clnt_dg.c --- lib/libc/rpc/clnt_dg.c 7 May 2013 21:08:44 -0000 1.29 +++ lib/libc/rpc/clnt_dg.c 1 Jun 2020 16:00:59 -0000 @@ -410,7 +410,7 @@ tv.tv_sec = tv.tv_usec = 0; TIMEVAL_TO_TIMESPEC(&tv, &ts); - n = pollts(&cu->cu_pfdp, 1, &ts, maskp); + n = ppoll(&cu->cu_pfdp, 1, &ts, maskp); if (n == 1) { /* We have some data now */ do { Index: lib/libc/rpc/clnt_vc.c =================================================================== RCS file: /cvsroot/src/lib/libc/rpc/clnt_vc.c,v retrieving revision 1.26 diff -u -r1.26 clnt_vc.c --- lib/libc/rpc/clnt_vc.c 20 Jan 2015 18:31:25 -0000 1.26 +++ lib/libc/rpc/clnt_vc.c 1 Jun 2020 16:00:59 -0000 @@ -705,7 +705,7 @@ fd.fd = ct->ct_fd; fd.events = POLLIN; for (;;) { - switch (pollts(&fd, 1, &ts, NULL)) { + switch (ppoll(&fd, 1, &ts, NULL)) { case 0: ct->ct_error.re_status = RPC_TIMEDOUT; return (-1); Index: lib/libc/rpc/svc.c =================================================================== RCS file: /cvsroot/src/lib/libc/rpc/svc.c,v retrieving revision 1.39 diff -u -r1.39 svc.c --- lib/libc/rpc/svc.c 13 Nov 2015 15:22:12 -0000 1.39 +++ lib/libc/rpc/svc.c 1 Jun 2020 16:00:59 -0000 @@ -780,7 +780,7 @@ /* * We assume that this function is only called * via someone select()ing from svc_fdset or - * pollts()ing from svc_pollset[]. Thus it's safe + * ppoll()ing from svc_pollset[]. Thus it's safe * to handle the POLLNVAL event by simply turning * the corresponding bit off in the fdset. The * svc_pollset[] array is derived from svc_fdset Index: lib/libc/rpc/svc_fdset.h =================================================================== RCS file: /cvsroot/src/lib/libc/rpc/svc_fdset.h,v retrieving revision 1.4 diff -u -r1.4 svc_fdset.h --- lib/libc/rpc/svc_fdset.h 8 Nov 2015 02:46:53 -0000 1.4 +++ lib/libc/rpc/svc_fdset.h 1 Jun 2020 16:00:59 -0000 @@ -11,8 +11,8 @@ # define read(a, b, c) rump_sys_read(a, b, c) # undef write # define write(a, b, c) rump_sys_write(a, b, c) -# undef pollts -# define pollts(a, b, c, d) rump_sys_pollts(a, b, c, d) +# undef ppoll +# define ppoll(a, b, c, d) rump_sys_ppoll(a, b, c, d) # undef select # define select(a, b, c, d, e) rump_sys_select(a, b, c, d, e) # endif Index: lib/libc/rpc/svc_vc.c =================================================================== RCS file: /cvsroot/src/lib/libc/rpc/svc_vc.c,v retrieving revision 1.34 diff -u -r1.34 svc_vc.c --- lib/libc/rpc/svc_vc.c 10 Nov 2015 20:56:20 -0000 1.34 +++ lib/libc/rpc/svc_vc.c 1 Jun 2020 16:00:59 -0000 @@ -537,7 +537,7 @@ do { pollfd.fd = sock; pollfd.events = POLLIN; - switch (pollts(&pollfd, 1, &ts, NULL)) { + switch (ppoll(&pollfd, 1, &ts, NULL)) { case -1: if (errno == EINTR) { continue; Index: lib/libc/sys/Makefile.inc =================================================================== RCS file: /cvsroot/src/lib/libc/sys/Makefile.inc,v retrieving revision 1.243 diff -u -r1.243 Makefile.inc --- lib/libc/sys/Makefile.inc 16 May 2020 18:31:47 -0000 1.243 +++ lib/libc/sys/Makefile.inc 1 Jun 2020 16:00:59 -0000 @@ -177,7 +177,7 @@ fsync_range.S __kevent50.S \ kill.S mq_receive.S mq_send.S __mq_timedreceive50.S __mq_timedsend50.S \ msgrcv.S msgsnd.S __msync13.S __nanosleep50.S open.S paccept.S poll.S \ - __pollts50.S __pselect50.S read.S readlink.S \ + __ppoll50.S __pselect50.S read.S readlink.S \ readv.S _sched_setparam.S _sched_getparam.S _sched_setaffinity.S \ _sched_getaffinity.S sched_yield.S _sched_protect.S \ __select50.S setcontext.S __sigprocmask14.S __sigsuspend14.S sysarch.S \ @@ -359,7 +359,7 @@ MLINKS+=open.2 openat.2 MLINKS+=ntp_adjtime.2 ntp_gettime.2 MLINKS+=pathconf.2 fpathconf.2 -MLINKS+=poll.2 pollts.2 +MLINKS+=poll.2 ppoll.2 MLINKS+=read.2 readv.2 read.2 pread.2 read.2 preadv.2 MLINKS+=readlink.2 readlinkat.2 MLINKS+=recv.2 recvfrom.2 recv.2 recvmsg.2 recv.2 recvmmsg.2 Index: lib/libc/sys/poll.2 =================================================================== RCS file: /cvsroot/src/lib/libc/sys/poll.2,v retrieving revision 1.30 diff -u -r1.30 poll.2 --- lib/libc/sys/poll.2 6 May 2019 06:56:36 -0000 1.30 +++ lib/libc/sys/poll.2 1 Jun 2020 16:00:59 -0000 @@ -31,7 +31,7 @@ .Dt POLL 2 .Os .Sh NAME -.Nm poll, pollts +.Nm poll, ppoll .Nd synchronous I/O multiplexing .Sh LIBRARY .Lb libc @@ -43,11 +43,11 @@ .In signal.h .In time.h .Ft int -.Fn pollts "struct pollfd * restrict fds" "nfds_t nfds" "const struct timespec * restrict ts" "const sigset_t * restrict sigmask" +.Fn ppoll "struct pollfd * restrict fds" "nfds_t nfds" "const struct timespec * restrict ts" "const sigset_t * restrict sigmask" .Sh DESCRIPTION .Fn poll and -.Fn pollts +.Fn ppoll examine a set of file descriptors to see if some of them are ready for I/O. The @@ -160,18 +160,18 @@ If .Fa ts is a null pointer, -.Fn pollts +.Fn ppoll blocks indefinitely. If .Fa ts is a non-null pointer, referencing a zero-valued timespec structure, then -.Fn pollts +.Fn ppoll will return without blocking. .Pp If .Fa sigmask is a non-null pointer, then the -.Fn pollts +.Fn ppoll function shall replace the signal mask of the caller by the set of signals pointed to by .Fa sigmask @@ -239,6 +239,11 @@ .Fn pollts function first appeared in .Nx 3.0 . +.Fn pollts +was renamed to +.Fn ppoll +in +.Nx 10 . .Sh BUGS The distinction between some of the fields in the .Fa events Index: lib/libpthread/pthread_cancelstub.c =================================================================== RCS file: /cvsroot/src/lib/libpthread/pthread_cancelstub.c,v retrieving revision 1.38 diff -u -r1.38 pthread_cancelstub.c --- lib/libpthread/pthread_cancelstub.c 21 Mar 2013 16:49:12 -0000 1.38 +++ lib/libpthread/pthread_cancelstub.c 1 Jun 2020 16:00:59 -0000 @@ -113,6 +113,8 @@ int _sys_poll(struct pollfd *, nfds_t, int); int _sys___pollts50(struct pollfd *, nfds_t, const struct timespec *, const sigset_t *); +int _sys___ppoll50(struct pollfd *, nfds_t, const struct timespec *, + const sigset_t *); ssize_t _sys_pread(int, void *, size_t, off_t); int _sys___pselect50(int, fd_set *, fd_set *, fd_set *, const struct timespec *, const sigset_t *); @@ -430,6 +432,21 @@ return retval; } +int +__ppoll50(struct pollfd *fds, nfds_t nfds, const struct timespec *ts, + const sigset_t *sigmask) +{ + int retval; + pthread_t self; + + self = pthread__self(); + TESTCANCEL(self); + retval = _sys___ppoll50(fds, nfds, ts, sigmask); + TESTCANCEL(self); + + return retval; +} + ssize_t pread(int d, void *buf, size_t nbytes, off_t offset) { Index: lib/libpthread/pthread_testcancel.3 =================================================================== RCS file: /cvsroot/src/lib/libpthread/pthread_testcancel.3,v retrieving revision 1.9 diff -u -r1.9 pthread_testcancel.3 --- lib/libpthread/pthread_testcancel.3 18 Mar 2014 18:20:38 -0000 1.9 +++ lib/libpthread/pthread_testcancel.3 1 Jun 2020 16:00:59 -0000 @@ -147,8 +147,8 @@ .Fn nanosleep , .Fn open , .Fn pause , +.Fn ppoll , .Fn poll , -.Fn pollts , .Fn pread , .Fn pselect , .Fn pthread_cond_timedwait , Index: lib/librumphijack/hijack.c =================================================================== RCS file: /cvsroot/src/lib/librumphijack/hijack.c,v retrieving revision 1.131 diff -u -r1.131 hijack.c --- lib/librumphijack/hijack.c 27 May 2020 18:55:36 -0000 1.131 +++ lib/librumphijack/hijack.c 1 Jun 2020 16:00:59 -0000 @@ -102,7 +102,7 @@ DUALCALL_READ, DUALCALL_READV, DUALCALL_PREAD, DUALCALL_PREADV, DUALCALL_DUP2, DUALCALL_CLOSE, - DUALCALL_POLLTS, + DUALCALL_PPOLL, #ifndef __linux__ DUALCALL_STAT, DUALCALL_LSTAT, DUALCALL_FSTAT, @@ -188,7 +188,7 @@ #if !__NetBSD_Prereq__(5,99,7) #define REALSELECT select -#define REALPOLLTS pollts +#define REALPPOLL pollts #define REALKEVENT kevent #define REALSTAT __stat30 #define REALLSTAT __lstat30 @@ -200,7 +200,11 @@ #define REALFHSTAT __fhstat40 #else /* >= 5.99.7 */ #define REALSELECT _sys___select50 -#define REALPOLLTS _sys___pollts50 +#if !__NetBSD_Prereq__(9,99,65) +#define REALPPOLL _sys___pollts50 +#else +#define REALPPOLL _sys___ppoll50 +#endif #define REALKEVENT _sys___kevent50 #define REALSTAT __stat50 #define REALLSTAT __lstat50 @@ -249,7 +253,7 @@ #define REALPREAD pread #define REALPWRITE pwrite #define REALSELECT select -#define REALPOLLTS ppoll +#define REALPPOLL ppoll #define REALUTIMES utimes #define REALLUTIMES lutimes #define REALFUTIMES futimes @@ -263,7 +267,7 @@ #endif /* platform */ int REALSELECT(int, fd_set *, fd_set *, fd_set *, struct timeval *); -int REALPOLLTS(struct pollfd *, nfds_t, +int REALPPOLL(struct pollfd *, nfds_t, const struct timespec *, const sigset_t *); int REALKEVENT(int, const struct kevent *, size_t, struct kevent *, size_t, const struct timespec *); @@ -318,7 +322,7 @@ { DUALCALL_FCNTL, "fcntl", RSYS_NAME(FCNTL) }, { DUALCALL_DUP2, "dup2", RSYS_NAME(DUP2) }, { DUALCALL_CLOSE, "close", RSYS_NAME(CLOSE) }, - { DUALCALL_POLLTS, S(REALPOLLTS), RSYS_NAME(POLLTS) }, + { DUALCALL_PPOLL, S(REALPPOLL), RSYS_NAME(PPOLL) }, #ifndef __linux__ { DUALCALL_STAT, S(REALSTAT), RSYS_NAME(STAT) }, { DUALCALL_LSTAT, S(REALLSTAT), RSYS_NAME(LSTAT) }, @@ -2026,7 +2030,7 @@ TIMEVAL_TO_TIMESPEC(timeout, &ts); tsp = &ts; } - rv = REALPOLLTS(pfds, realnfds, tsp, NULL); + rv = REALPPOLL(pfds, realnfds, tsp, NULL); /* * "If select() returns with an error the descriptor sets * will be unmodified" @@ -2121,13 +2125,13 @@ static void * hostpoll(void *arg) { - int (*op_pollts)(struct pollfd *, nfds_t, const struct timespec *, + int (*op_ppoll)(struct pollfd *, nfds_t, const struct timespec *, const sigset_t *); struct pollarg *parg = arg; intptr_t rv; - op_pollts = GETSYSCALL(host, POLLTS); - rv = op_pollts(parg->pfds, parg->nfds, parg->ts, parg->sigmask); + op_ppoll = GETSYSCALL(host, PPOLL); + rv = op_ppoll(parg->pfds, parg->nfds, parg->ts, parg->sigmask); if (rv == -1) parg->errnum = errno; rump_sys_write(parg->pipefd, &rv, sizeof(rv)); @@ -2136,10 +2140,10 @@ } int -REALPOLLTS(struct pollfd *fds, nfds_t nfds, const struct timespec *ts, +REALPPOLL(struct pollfd *fds, nfds_t nfds, const struct timespec *ts, const sigset_t *sigmask) { - int (*op_pollts)(struct pollfd *, nfds_t, const struct timespec *, + int (*op_ppoll)(struct pollfd *, nfds_t, const struct timespec *, const sigset_t *); int (*host_close)(int); int hostcall = 0, rumpcall = 0; @@ -2244,8 +2248,8 @@ parg.pipefd = rpipe[1]; pthread_create(&pt, NULL, hostpoll, &parg); - op_pollts = GETSYSCALL(rump, POLLTS); - rv_rump = op_pollts(pfd_rump, nfds+1, ts, NULL); + op_ppoll = GETSYSCALL(rump, PPOLL); + rv_rump = op_ppoll(pfd_rump, nfds+1, ts, NULL); errno_rump = errno; write(hpipe[1], &rv, sizeof(rv)); pthread_join(pt, &trv_val); @@ -2315,13 +2319,13 @@ errno = sverrno; } else { if (hostcall) { - op_pollts = GETSYSCALL(host, POLLTS); + op_ppoll = GETSYSCALL(host, PPOLL); } else { - op_pollts = GETSYSCALL(rump, POLLTS); + op_ppoll = GETSYSCALL(rump, PPOLL); adjustpoll(fds, nfds, fd_host2rump); } - rv = op_pollts(fds, nfds, ts, sigmask); + rv = op_ppoll(fds, nfds, ts, sigmask); if (rumpcall) adjustpoll(fds, nfds, fd_rump2host_withdup); } @@ -2342,7 +2346,7 @@ tsp = &ts; } - return REALPOLLTS(fds, nfds, tsp, NULL); + return REALPPOLL(fds, nfds, tsp, NULL); } #ifdef HAVE_KQUEUE Index: sys/compat/common/kern_select_50.c =================================================================== RCS file: /cvsroot/src/sys/compat/common/kern_select_50.c,v retrieving revision 1.3 diff -u -r1.3 kern_select_50.c --- sys/compat/common/kern_select_50.c 20 Sep 2019 15:05:22 -0000 1.3 +++ sys/compat/common/kern_select_50.c 1 Jun 2020 16:01:00 -0000 @@ -51,7 +51,7 @@ { SYS_compat_50_kevent, 0, (sy_call_t *)compat_50_sys_kevent }, { SYS_compat_50_select, 0, (sy_call_t *)compat_50_sys_select }, { SYS_compat_50_pselect, 0, (sy_call_t *)compat_50_sys_pselect }, - { SYS_compat_50_pollts, 0, (sy_call_t *)compat_50_sys_pollts }, + { SYS_compat_50_ppoll, 0, (sy_call_t *)compat_50_sys_ppoll }, { 0, 0, NULL } }; @@ -163,7 +163,7 @@ } int -compat_50_sys_pollts(struct lwp *l, const struct compat_50_sys_pollts_args *uap, +compat_50_sys_ppoll(struct lwp *l, const struct compat_50_sys_ppoll_args *uap, register_t *retval) { /* { Index: sys/compat/netbsd32/netbsd32_compat_50.c =================================================================== RCS file: /cvsroot/src/sys/compat/netbsd32/netbsd32_compat_50.c,v retrieving revision 1.49 diff -u -r1.49 netbsd32_compat_50.c --- sys/compat/netbsd32/netbsd32_compat_50.c 30 Apr 2020 03:30:10 -0000 1.49 +++ sys/compat/netbsd32/netbsd32_compat_50.c 1 Jun 2020 16:01:00 -0000 @@ -689,8 +689,8 @@ } int -compat_50_netbsd32_pollts(struct lwp *l, - const struct compat_50_netbsd32_pollts_args *uap, register_t *retval) +compat_50_netbsd32_ppoll(struct lwp *l, + const struct compat_50_netbsd32_ppoll_args *uap, register_t *retval) { /* { syscallarg(struct netbsd32_pollfdp_t) fds; @@ -987,8 +987,8 @@ (sy_call_t *)compat_50_netbsd32_kevent }, { NETBSD32_SYS_compat_50_netbsd32_pselect, 0, (sy_call_t *)compat_50_netbsd32_pselect }, - { NETBSD32_SYS_compat_50_netbsd32_pollts, 0, - (sy_call_t *)compat_50_netbsd32_pollts }, + { NETBSD32_SYS_compat_50_netbsd32_ppoll, 0, + (sy_call_t *)compat_50_netbsd32_ppoll }, { NETBSD32_SYS_compat_50_netbsd32___stat30, 0, (sy_call_t *)compat_50_netbsd32___stat30 }, { NETBSD32_SYS_compat_50_netbsd32___fstat30, 0, Index: sys/compat/netbsd32/netbsd32_select.c =================================================================== RCS file: /cvsroot/src/sys/compat/netbsd32/netbsd32_select.c,v retrieving revision 1.20 diff -u -r1.20 netbsd32_select.c --- sys/compat/netbsd32/netbsd32_select.c 20 Sep 2019 15:16:41 -0000 1.20 +++ sys/compat/netbsd32/netbsd32_select.c 1 Jun 2020 16:01:00 -0000 @@ -117,7 +117,7 @@ } int -netbsd32___pollts50(struct lwp *l, const struct netbsd32___pollts50_args *uap, +netbsd32___ppoll50(struct lwp *l, const struct netbsd32___ppoll50_args *uap, register_t *retval) { /* { Index: sys/compat/netbsd32/netbsd32_syscall.h =================================================================== RCS file: /cvsroot/src/sys/compat/netbsd32/netbsd32_syscall.h,v retrieving revision 1.154 diff -u -r1.154 netbsd32_syscall.h --- sys/compat/netbsd32/netbsd32_syscall.h 16 May 2020 18:31:48 -0000 1.154 +++ sys/compat/netbsd32/netbsd32_syscall.h 1 Jun 2020 16:01:00 -0000 @@ -983,8 +983,8 @@ /* syscall: "compat_50_netbsd32_pselect" ret: "int" args: "int" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "netbsd32_timespec50p_t" "netbsd32_sigsetp_t" */ #define NETBSD32_SYS_compat_50_netbsd32_pselect 373 -/* syscall: "compat_50_netbsd32_pollts" ret: "int" args: "netbsd32_pollfdp_t" "u_int" "netbsd32_timespec50p_t" "netbsd32_sigsetp_t" */ -#define NETBSD32_SYS_compat_50_netbsd32_pollts 374 +/* syscall: "compat_50_netbsd32_ppoll" ret: "int" args: "netbsd32_pollfdp_t" "u_int" "netbsd32_timespec50p_t" "netbsd32_sigsetp_t" */ +#define NETBSD32_SYS_compat_50_netbsd32_ppoll 374 /* syscall: "netbsd32_setxattr" ret: "int" args: "netbsd32_charp" "netbsd32_charp" "netbsd32_voidp" "netbsd32_size_t" "int" */ #define NETBSD32_SYS_netbsd32_setxattr 375 @@ -1135,8 +1135,8 @@ /* syscall: "netbsd32___pselect50" ret: "int" args: "int" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "netbsd32_fd_setp_t" "const netbsd32_timespecp_t" "const netbsd32_sigsetp_t" */ #define NETBSD32_SYS_netbsd32___pselect50 436 -/* syscall: "netbsd32___pollts50" ret: "int" args: "netbsd32_pollfdp_t" "u_int" "const netbsd32_timespecp_t" "const netbsd32_sigsetp_t" */ -#define NETBSD32_SYS_netbsd32___pollts50 437 +/* syscall: "netbsd32___ppoll50" ret: "int" args: "netbsd32_pollfdp_t" "u_int" "const netbsd32_timespecp_t" "const netbsd32_sigsetp_t" */ +#define NETBSD32_SYS_netbsd32___ppoll50 437 /* syscall: "netbsd32___stat50" ret: "int" args: "const netbsd32_charp" "netbsd32_statp_t" */ #define NETBSD32_SYS_netbsd32___stat50 439 Index: sys/compat/netbsd32/netbsd32_syscallargs.h =================================================================== RCS file: /cvsroot/src/sys/compat/netbsd32/netbsd32_syscallargs.h,v retrieving revision 1.153 diff -u -r1.153 netbsd32_syscallargs.h --- sys/compat/netbsd32/netbsd32_syscallargs.h 16 May 2020 18:31:48 -0000 1.153 +++ sys/compat/netbsd32/netbsd32_syscallargs.h 1 Jun 2020 16:01:00 -0000 @@ -1949,13 +1949,13 @@ }; check_syscall_args(compat_50_netbsd32_pselect) -struct compat_50_netbsd32_pollts_args { +struct compat_50_netbsd32_ppoll_args { syscallarg(netbsd32_pollfdp_t) fds; syscallarg(u_int) nfds; syscallarg(netbsd32_timespec50p_t) ts; syscallarg(netbsd32_sigsetp_t) mask; }; -check_syscall_args(compat_50_netbsd32_pollts) +check_syscall_args(compat_50_netbsd32_ppoll) struct netbsd32_setxattr_args { syscallarg(netbsd32_charp) path; @@ -2307,13 +2307,13 @@ }; check_syscall_args(netbsd32___pselect50) -struct netbsd32___pollts50_args { +struct netbsd32___ppoll50_args { syscallarg(netbsd32_pollfdp_t) fds; syscallarg(u_int) nfds; syscallarg(const netbsd32_timespecp_t) ts; syscallarg(const netbsd32_sigsetp_t) mask; }; -check_syscall_args(netbsd32___pollts50) +check_syscall_args(netbsd32___ppoll50) struct netbsd32___stat50_args { syscallarg(const netbsd32_charp) path; @@ -3391,7 +3391,7 @@ int compat_50_netbsd32_pselect(struct lwp *, const struct compat_50_netbsd32_pselect_args *, register_t *); -int compat_50_netbsd32_pollts(struct lwp *, const struct compat_50_netbsd32_pollts_args *, register_t *); +int compat_50_netbsd32_ppoll(struct lwp *, const struct compat_50_netbsd32_ppoll_args *, register_t *); int netbsd32_setxattr(struct lwp *, const struct netbsd32_setxattr_args *, register_t *); @@ -3491,7 +3491,7 @@ int netbsd32___pselect50(struct lwp *, const struct netbsd32___pselect50_args *, register_t *); -int netbsd32___pollts50(struct lwp *, const struct netbsd32___pollts50_args *, register_t *); +int netbsd32___ppoll50(struct lwp *, const struct netbsd32___ppoll50_args *, register_t *); int netbsd32___stat50(struct lwp *, const struct netbsd32___stat50_args *, register_t *); Index: sys/compat/netbsd32/netbsd32_syscalls.c =================================================================== RCS file: /cvsroot/src/sys/compat/netbsd32/netbsd32_syscalls.c,v retrieving revision 1.153 diff -u -r1.153 netbsd32_syscalls.c --- sys/compat/netbsd32/netbsd32_syscalls.c 16 May 2020 18:31:48 -0000 1.153 +++ sys/compat/netbsd32/netbsd32_syscalls.c 1 Jun 2020 16:01:00 -0000 @@ -408,7 +408,7 @@ /* 371 */ "netbsd32_extattr_list_file", /* 372 */ "netbsd32_extattr_list_link", /* 373 */ "compat_50_netbsd32_pselect", - /* 374 */ "compat_50_netbsd32_pollts", + /* 374 */ "compat_50_netbsd32_ppoll", /* 375 */ "netbsd32_setxattr", /* 376 */ "netbsd32_lsetxattr", /* 377 */ "netbsd32_fsetxattr", @@ -471,7 +471,7 @@ /* 434 */ "compat_60_netbsd32__lwp_park", /* 435 */ "netbsd32___kevent50", /* 436 */ "netbsd32___pselect50", - /* 437 */ "netbsd32___pollts50", + /* 437 */ "netbsd32___ppoll50", /* 438 */ "#438 (unimplemented netbsd32___aio_suspend50)", /* 439 */ "netbsd32___stat50", /* 440 */ "netbsd32___fstat50", @@ -933,7 +933,7 @@ /* 371 */ "extattr_list_file", /* 372 */ "extattr_list_link", /* 373 */ NULL, /* compat_50_netbsd32_pselect */ - /* 374 */ NULL, /* compat_50_netbsd32_pollts */ + /* 374 */ NULL, /* compat_50_netbsd32_ppoll */ /* 375 */ "setxattr", /* 376 */ "lsetxattr", /* 377 */ "fsetxattr", @@ -996,7 +996,7 @@ /* 434 */ NULL, /* compat_60_netbsd32__lwp_park */ /* 435 */ "kevent", /* 436 */ "pselect", - /* 437 */ "pollts", + /* 437 */ "ppoll", /* 438 */ NULL, /* unimplemented netbsd32___aio_suspend50 */ /* 439 */ "stat", /* 440 */ "fstat", Index: sys/compat/netbsd32/netbsd32_syscalls_autoload.c =================================================================== RCS file: /cvsroot/src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c,v retrieving revision 1.33 diff -u -r1.33 netbsd32_syscalls_autoload.c --- sys/compat/netbsd32/netbsd32_syscalls_autoload.c 16 May 2020 18:31:48 -0000 1.33 +++ sys/compat/netbsd32/netbsd32_syscalls_autoload.c 1 Jun 2020 16:01:00 -0000 @@ -147,7 +147,7 @@ { NETBSD32_SYS_compat_90_netbsd32_fstatvfs1, "compat_netbsd32_90" }, { NETBSD32_SYS_compat_30_netbsd32_fhstatvfs1, "compat_netbsd32_30" }, { NETBSD32_SYS_compat_50_netbsd32_pselect, "compat_netbsd32_50" }, - { NETBSD32_SYS_compat_50_netbsd32_pollts, "compat_netbsd32_50" }, + { NETBSD32_SYS_compat_50_netbsd32_ppoll, "compat_netbsd32_50" }, { NETBSD32_SYS_compat_50_netbsd32___stat30, "compat_netbsd32_50" }, { NETBSD32_SYS_compat_50_netbsd32___fstat30, "compat_netbsd32_50" }, { NETBSD32_SYS_compat_50_netbsd32___lstat30, "compat_netbsd32_50" }, Index: sys/compat/netbsd32/netbsd32_sysent.c =================================================================== RCS file: /cvsroot/src/sys/compat/netbsd32/netbsd32_sysent.c,v retrieving revision 1.152 diff -u -r1.152 netbsd32_sysent.c --- sys/compat/netbsd32/netbsd32_sysent.c 16 May 2020 18:31:48 -0000 1.152 +++ sys/compat/netbsd32/netbsd32_sysent.c 1 Jun 2020 16:01:00 -0000 @@ -1561,9 +1561,9 @@ .sy_call = (sy_call_t *)sys_nomodule }, /* 373 = compat_50_netbsd32_pselect */ { - ns(struct compat_50_netbsd32_pollts_args), + ns(struct compat_50_netbsd32_ppoll_args), .sy_call = (sy_call_t *)sys_nomodule - }, /* 374 = compat_50_netbsd32_pollts */ + }, /* 374 = compat_50_netbsd32_ppoll */ { ns(struct netbsd32_setxattr_args), .sy_call = (sy_call_t *)netbsd32_setxattr @@ -1801,9 +1801,9 @@ .sy_call = (sy_call_t *)netbsd32___pselect50 }, /* 436 = netbsd32___pselect50 */ { - ns(struct netbsd32___pollts50_args), - .sy_call = (sy_call_t *)netbsd32___pollts50 - }, /* 437 = netbsd32___pollts50 */ + ns(struct netbsd32___ppoll50_args), + .sy_call = (sy_call_t *)netbsd32___ppoll50 + }, /* 437 = netbsd32___ppoll50 */ { .sy_call = sys_nosys, }, /* 438 = filler */ Index: sys/compat/netbsd32/netbsd32_systrace_args.c =================================================================== RCS file: /cvsroot/src/sys/compat/netbsd32/netbsd32_systrace_args.c,v retrieving revision 1.44 diff -u -r1.44 netbsd32_systrace_args.c --- sys/compat/netbsd32/netbsd32_systrace_args.c 16 May 2020 18:31:48 -0000 1.44 +++ sys/compat/netbsd32/netbsd32_systrace_args.c 1 Jun 2020 16:01:00 -0000 @@ -2632,9 +2632,9 @@ *n_args = 6; break; } - /* netbsd32_pollts */ + /* netbsd32_ppoll */ case 374: { - const struct compat_50_netbsd32_pollts_args *p = params; + const struct compat_50_netbsd32_ppoll_args *p = params; uarg[0] = (intptr_t) SCARG(p, fds).i32; /* netbsd32_pollfdp_t */ uarg[1] = SCARG(p, nfds); /* u_int */ uarg[2] = (intptr_t) SCARG(p, ts).i32; /* netbsd32_timespec50p_t */ @@ -3090,9 +3090,9 @@ *n_args = 6; break; } - /* netbsd32___pollts50 */ + /* netbsd32___ppoll50 */ case 437: { - const struct netbsd32___pollts50_args *p = params; + const struct netbsd32___ppoll50_args *p = params; uarg[0] = (intptr_t) SCARG(p, fds).i32; /* netbsd32_pollfdp_t */ uarg[1] = SCARG(p, nfds); /* u_int */ uarg[2] = (intptr_t) SCARG(p, ts).i32; /* const netbsd32_timespecp_t */ @@ -8046,7 +8046,7 @@ break; }; break; - /* netbsd32_pollts */ + /* netbsd32_ppoll */ case 374: switch(ndx) { case 0: @@ -8870,7 +8870,7 @@ break; }; break; - /* netbsd32___pollts50 */ + /* netbsd32___ppoll50 */ case 437: switch(ndx) { case 0: @@ -11415,7 +11415,7 @@ if (ndx == 0 || ndx == 1) p = "int"; break; - /* netbsd32_pollts */ + /* netbsd32_ppoll */ case 374: if (ndx == 0 || ndx == 1) p = "int"; @@ -11665,7 +11665,7 @@ if (ndx == 0 || ndx == 1) p = "int"; break; - /* netbsd32___pollts50 */ + /* netbsd32___ppoll50 */ case 437: if (ndx == 0 || ndx == 1) p = "int"; Index: sys/compat/netbsd32/syscalls.master =================================================================== RCS file: /cvsroot/src/sys/compat/netbsd32/syscalls.master,v retrieving revision 1.138 diff -u -r1.138 syscalls.master --- sys/compat/netbsd32/syscalls.master 16 May 2020 18:31:48 -0000 1.138 +++ sys/compat/netbsd32/syscalls.master 1 Jun 2020 16:01:00 -0000 @@ -857,7 +857,7 @@ netbsd32_timespec50p_t ts, \ netbsd32_sigsetp_t mask); } 374 COMPAT_50 MODULAR compat_netbsd32_50 \ - { int|netbsd32||pollts(netbsd32_pollfdp_t fds, \ + { int|netbsd32||ppoll(netbsd32_pollfdp_t fds, \ u_int nfds, netbsd32_timespec50p_t ts, \ netbsd32_sigsetp_t mask); } 375 STD { int|netbsd32||setxattr(netbsd32_charp path, \ @@ -1021,7 +1021,7 @@ netbsd32_fd_setp_t ex, \ const netbsd32_timespecp_t ts, \ const netbsd32_sigsetp_t mask); } -437 STD { int|netbsd32|50|pollts(netbsd32_pollfdp_t fds, \ +437 STD { int|netbsd32|50|ppoll(netbsd32_pollfdp_t fds, \ u_int nfds, const netbsd32_timespecp_t ts, \ const netbsd32_sigsetp_t mask); } 438 UNIMPL netbsd32___aio_suspend50 Index: sys/compat/sys/poll.h =================================================================== RCS file: /cvsroot/src/sys/compat/sys/poll.h,v retrieving revision 1.2 diff -u -r1.2 poll.h --- sys/compat/sys/poll.h 11 Jan 2009 02:45:50 -0000 1.2 +++ sys/compat/sys/poll.h 1 Jun 2020 16:01:00 -0000 @@ -44,8 +44,12 @@ __BEGIN_DECLS int pollts(struct pollfd * __restrict, nfds_t, const struct timespec50 * __restrict, const sigset_t * __restrict); +int ppoll(struct pollfd * __restrict, nfds_t, + const struct timespec50 * __restrict, const sigset_t * __restrict); int __pollts50(struct pollfd * __restrict, nfds_t, const struct timespec * __restrict, const sigset_t * __restrict); +int __ppoll50(struct pollfd * __restrict, nfds_t, + const struct timespec * __restrict, const sigset_t * __restrict); __END_DECLS #endif /* _NETBSD_SOURCE */ Index: sys/external/bsd/compiler_rt/dist/include/sanitizer/netbsd_syscall_hooks.h =================================================================== RCS file: /cvsroot/src/sys/external/bsd/compiler_rt/dist/include/sanitizer/netbsd_syscall_hooks.h,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 netbsd_syscall_hooks.h --- sys/external/bsd/compiler_rt/dist/include/sanitizer/netbsd_syscall_hooks.h 8 Jan 2019 05:40:56 -0000 1.1.1.1 +++ sys/external/bsd/compiler_rt/dist/include/sanitizer/netbsd_syscall_hooks.h 1 Jun 2020 16:01:00 -0000 @@ -1998,11 +1998,11 @@ __sanitizer_syscall_post_impl_compat_50_pselect( \ res, (long long)(nd), (long long)(in), (long long)(ou), (long long)(ex), \ (long long)(ts), (long long)(mask)) -#define __sanitizer_syscall_pre_compat_50_pollts(fds, nfds, ts, mask) \ - __sanitizer_syscall_pre_impl_compat_50_pollts( \ +#define __sanitizer_syscall_pre_compat_50_ppoll(fds, nfds, ts, mask) \ + __sanitizer_syscall_pre_impl_compat_50_ppoll( \ (long long)(fds), (long long)(nfds), (long long)(ts), (long long)(mask)) -#define __sanitizer_syscall_post_compat_50_pollts(res, fds, nfds, ts, mask) \ - __sanitizer_syscall_post_impl_compat_50_pollts( \ +#define __sanitizer_syscall_post_compat_50_ppoll(res, fds, nfds, ts, mask) \ + __sanitizer_syscall_post_impl_compat_50_ppoll( \ res, (long long)(fds), (long long)(nfds), (long long)(ts), \ (long long)(mask)) #define __sanitizer_syscall_pre_setxattr(path, name, value, size, flags) \ @@ -2393,11 +2393,11 @@ __sanitizer_syscall_post_impl___pselect50( \ res, (long long)(nd), (long long)(in), (long long)(ou), (long long)(ex), \ (long long)(ts), (long long)(mask)) -#define __sanitizer_syscall_pre___pollts50(fds, nfds, ts, mask) \ - __sanitizer_syscall_pre_impl___pollts50((long long)(fds), (long long)(nfds), \ +#define __sanitizer_syscall_pre___ppoll50(fds, nfds, ts, mask) \ + __sanitizer_syscall_pre_impl___ppoll50((long long)(fds), (long long)(nfds), \ (long long)(ts), (long long)(mask)) -#define __sanitizer_syscall_post___pollts50(res, fds, nfds, ts, mask) \ - __sanitizer_syscall_post_impl___pollts50(res, (long long)(fds), \ +#define __sanitizer_syscall_post___ppoll50(res, fds, nfds, ts, mask) \ + __sanitizer_syscall_post_impl___ppoll50(res, (long long)(fds), \ (long long)(nfds), (long long)(ts), \ (long long)(mask)) #define __sanitizer_syscall_pre___aio_suspend50(list, nent, timeout) \ @@ -4203,10 +4203,10 @@ long long ou, long long ex, long long ts, long long mask); -void __sanitizer_syscall_pre_impl_compat_50_pollts(long long fds, +void __sanitizer_syscall_pre_impl_compat_50_ppoll(long long fds, long long nfds, long long ts, long long mask); -void __sanitizer_syscall_post_impl_compat_50_pollts( +void __sanitizer_syscall_post_impl_compat_50_ppoll( long long res, long long fds, long long nfds, long long ts, long long mask); void __sanitizer_syscall_pre_impl_setxattr(long long path, long long name, long long value, long long size, @@ -4491,9 +4491,9 @@ long long in, long long ou, long long ex, long long ts, long long mask); -void __sanitizer_syscall_pre_impl___pollts50(long long fds, long long nfds, +void __sanitizer_syscall_pre_impl___ppoll50(long long fds, long long nfds, long long ts, long long mask); -void __sanitizer_syscall_post_impl___pollts50(long long res, long long fds, +void __sanitizer_syscall_post_impl___ppoll50(long long res, long long fds, long long nfds, long long ts, long long mask); void __sanitizer_syscall_pre_impl___aio_suspend50(long long list, Index: sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_syscalls_netbsd.inc =================================================================== RCS file: /cvsroot/src/sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_syscalls_netbsd.inc,v retrieving revision 1.2 diff -u -r1.2 sanitizer_syscalls_netbsd.inc --- sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_syscalls_netbsd.inc 24 Dec 2019 19:51:00 -0000 1.2 +++ sys/external/bsd/compiler_rt/dist/lib/sanitizer_common/sanitizer_syscalls_netbsd.inc 1 Jun 2020 16:01:00 -0000 @@ -2672,11 +2672,11 @@ void *mask_) { /* TODO */ } -PRE_SYSCALL(compat_50_pollts) +PRE_SYSCALL(compat_50_ppoll) (void *fds_, long long nfds_, void *ts_, void *mask_) { /* TODO */ } -POST_SYSCALL(compat_50_pollts) +POST_SYSCALL(compat_50_ppoll) (long long res, void *fds_, long long nfds_, void *ts_, void *mask_) { /* TODO */ } @@ -3198,7 +3198,7 @@ POST_SYSCALL(__pselect50) (long long res, long long nd_, void *in_, void *ou_, void *ex_, void *ts_, void *mask_) {} -PRE_SYSCALL(__pollts50)(void *fds_, long long nfds_, void *ts_, void *mask_) { +PRE_SYSCALL(__ppoll50)(void *fds_, long long nfds_, void *ts_, void *mask_) { if (ts_) { PRE_READ(ts_, struct_timespec_sz); } @@ -3206,7 +3206,7 @@ PRE_READ(mask_, sizeof(struct __sanitizer_sigset_t)); } } -POST_SYSCALL(__pollts50) +POST_SYSCALL(__ppoll50) (long long res, void *fds_, long long nfds_, void *ts_, void *mask_) {} PRE_SYSCALL(__aio_suspend50)(void *list_, long long nent_, void *timeout_) { int i; Index: sys/kern/init_sysent.c =================================================================== RCS file: /cvsroot/src/sys/kern/init_sysent.c,v retrieving revision 1.332 diff -u -r1.332 init_sysent.c --- sys/kern/init_sysent.c 16 May 2020 18:31:50 -0000 1.332 +++ sys/kern/init_sysent.c 1 Jun 2020 16:01:00 -0000 @@ -1809,10 +1809,10 @@ .sy_call = (sy_call_t *)sys_nomodule }, /* 373 = compat_50_pselect */ { - ns(struct compat_50_sys_pollts_args), + ns(struct compat_50_sys_ppoll_args), .sy_flags = SYCALL_ARG_PTR, .sy_call = (sy_call_t *)sys_nomodule - }, /* 374 = compat_50_pollts */ + }, /* 374 = compat_50_ppoll */ { ns(struct sys_setxattr_args), .sy_flags = SYCALL_ARG_PTR, @@ -2114,10 +2114,10 @@ .sy_call = (sy_call_t *)sys___pselect50 }, /* 436 = __pselect50 */ { - ns(struct sys___pollts50_args), + ns(struct sys___ppoll50_args), .sy_flags = SYCALL_ARG_PTR, - .sy_call = (sy_call_t *)sys___pollts50 - }, /* 437 = __pollts50 */ + .sy_call = (sy_call_t *)sys___ppoll50 + }, /* 437 = __ppoll50 */ { ns(struct sys___aio_suspend50_args), .sy_flags = SYCALL_ARG_PTR, Index: sys/kern/sys_select.c =================================================================== RCS file: /cvsroot/src/sys/kern/sys_select.c,v retrieving revision 1.54 diff -u -r1.54 sys_select.c --- sys/kern/sys_select.c 19 Apr 2020 20:35:29 -0000 1.54 +++ sys/kern/sys_select.c 1 Jun 2020 16:01:00 -0000 @@ -483,7 +483,7 @@ * Poll system call. */ int -sys___pollts50(struct lwp *l, const struct sys___pollts50_args *uap, +sys___ppoll50(struct lwp *l, const struct sys___ppoll50_args *uap, register_t *retval) { /* { Index: sys/kern/sys_sig.c =================================================================== RCS file: /cvsroot/src/sys/kern/sys_sig.c,v retrieving revision 1.51 diff -u -r1.51 sys_sig.c --- sys/kern/sys_sig.c 23 May 2020 23:42:43 -0000 1.51 +++ sys/kern/sys_sig.c 1 Jun 2020 16:01:00 -0000 @@ -621,7 +621,7 @@ struct proc *p = l->l_proc; /* - * When returning from sigsuspend/pselect/pollts, we want + * When returning from sigsuspend/pselect/ppoll, we want * the old mask to be restored after the * signal handler has finished. Thus, we * save it here and mark the sigctx structure Index: sys/kern/syscalls.c =================================================================== RCS file: /cvsroot/src/sys/kern/syscalls.c,v retrieving revision 1.320 diff -u -r1.320 syscalls.c --- sys/kern/syscalls.c 16 May 2020 18:31:50 -0000 1.320 +++ sys/kern/syscalls.c 1 Jun 2020 16:01:00 -0000 @@ -420,7 +420,7 @@ /* 371 */ "extattr_list_file", /* 372 */ "extattr_list_link", /* 373 */ "compat_50_pselect", - /* 374 */ "compat_50_pollts", + /* 374 */ "compat_50_ppoll", /* 375 */ "setxattr", /* 376 */ "lsetxattr", /* 377 */ "fsetxattr", @@ -483,7 +483,7 @@ /* 434 */ "compat_60__lwp_park", /* 435 */ "__kevent50", /* 436 */ "__pselect50", - /* 437 */ "__pollts50", + /* 437 */ "__ppoll50", /* 438 */ "__aio_suspend50", /* 439 */ "__stat50", /* 440 */ "__fstat50", @@ -957,7 +957,7 @@ /* 371 */ NULL, /* extattr_list_file */ /* 372 */ NULL, /* extattr_list_link */ /* 373 */ NULL, /* compat_50_pselect */ - /* 374 */ NULL, /* compat_50_pollts */ + /* 374 */ NULL, /* compat_50_ppoll */ /* 375 */ NULL, /* setxattr */ /* 376 */ NULL, /* lsetxattr */ /* 377 */ NULL, /* fsetxattr */ @@ -1020,7 +1020,7 @@ /* 434 */ NULL, /* compat_60__lwp_park */ /* 435 */ "kevent", /* 436 */ "pselect", - /* 437 */ "pollts", + /* 437 */ "ppoll", /* 438 */ "aio_suspend", /* 439 */ "stat", /* 440 */ "fstat", Index: sys/kern/syscalls.master =================================================================== RCS file: /cvsroot/src/sys/kern/syscalls.master,v retrieving revision 1.305 diff -u -r1.305 syscalls.master --- sys/kern/syscalls.master 16 May 2020 18:31:50 -0000 1.305 +++ sys/kern/syscalls.master 1 Jun 2020 16:01:00 -0000 @@ -770,7 +770,7 @@ fd_set *ex, const struct timespec50 *ts, \ const sigset_t *mask); } 374 COMPAT_50 MODULAR compat_50 RUMP \ - { int|sys||pollts(struct pollfd *fds, u_int nfds, \ + { int|sys||ppoll(struct pollfd *fds, u_int nfds, \ const struct timespec50 *ts, const sigset_t *mask); } 375 STD RUMP { int|sys||setxattr(const char *path, \ const char *name, const void *value, size_t size, \ @@ -915,7 +915,7 @@ 436 STD RUMP { int|sys|50|pselect(int nd, fd_set *in, fd_set *ou, \ fd_set *ex, const struct timespec *ts, \ const sigset_t *mask); } -437 STD RUMP { int|sys|50|pollts(struct pollfd *fds, u_int nfds, \ +437 STD RUMP { int|sys|50|ppoll(struct pollfd *fds, u_int nfds, \ const struct timespec *ts, const sigset_t *mask); } 438 STD MODULAR aio RUMP { int|sys|50|aio_suspend( \ const struct aiocb *const *list, \ Index: sys/kern/syscalls_autoload.c =================================================================== RCS file: /cvsroot/src/sys/kern/syscalls_autoload.c,v retrieving revision 1.37 diff -u -r1.37 syscalls_autoload.c --- sys/kern/syscalls_autoload.c 16 May 2020 18:31:50 -0000 1.37 +++ sys/kern/syscalls_autoload.c 1 Jun 2020 16:01:00 -0000 @@ -180,7 +180,7 @@ { SYS_compat_90_fstatvfs1, "compat_90" }, { SYS_compat_30_fhstatvfs1, "compat_30" }, { SYS_compat_50_pselect, "compat_50" }, - { SYS_compat_50_pollts, "compat_50" }, + { SYS_compat_50_ppoll, "compat_50" }, { SYS_compat_50___stat30, "compat_50" }, { SYS_compat_50___fstat30, "compat_50" }, { SYS_compat_50___lstat30, "compat_50" }, Index: sys/kern/systrace_args.c =================================================================== RCS file: /cvsroot/src/sys/kern/systrace_args.c,v retrieving revision 1.39 diff -u -r1.39 systrace_args.c --- sys/kern/systrace_args.c 16 May 2020 18:31:50 -0000 1.39 +++ sys/kern/systrace_args.c 1 Jun 2020 16:01:00 -0000 @@ -2735,9 +2735,9 @@ *n_args = 6; break; } - /* sys_pollts */ + /* sys_ppoll */ case 374: { - const struct compat_50_sys_pollts_args *p = params; + const struct compat_50_sys_ppoll_args *p = params; uarg[0] = (intptr_t) SCARG(p, fds); /* struct pollfd * */ uarg[1] = SCARG(p, nfds); /* u_int */ uarg[2] = (intptr_t) SCARG(p, ts); /* const struct timespec50 * */ @@ -3264,9 +3264,9 @@ *n_args = 6; break; } - /* sys___pollts50 */ + /* sys___ppoll50 */ case 437: { - const struct sys___pollts50_args *p = params; + const struct sys___ppoll50_args *p = params; uarg[0] = (intptr_t) SCARG(p, fds); /* struct pollfd * */ uarg[1] = SCARG(p, nfds); /* u_int */ uarg[2] = (intptr_t) SCARG(p, ts); /* const struct timespec * */ @@ -8385,7 +8385,7 @@ break; }; break; - /* sys_pollts */ + /* sys_ppoll */ case 374: switch(ndx) { case 0: @@ -9323,7 +9323,7 @@ break; }; break; - /* sys___pollts50 */ + /* sys___ppoll50 */ case 437: switch(ndx) { case 0: @@ -11944,7 +11944,7 @@ if (ndx == 0 || ndx == 1) p = "int"; break; - /* sys_pollts */ + /* sys_ppoll */ case 374: if (ndx == 0 || ndx == 1) p = "int"; @@ -12239,7 +12239,7 @@ if (ndx == 0 || ndx == 1) p = "int"; break; - /* sys___pollts50 */ + /* sys___ppoll50 */ case 437: if (ndx == 0 || ndx == 1) p = "int"; Index: sys/rump/rump.sysmap =================================================================== RCS file: /cvsroot/src/sys/rump/rump.sysmap,v retrieving revision 1.7 diff -u -r1.7 rump.sysmap --- sys/rump/rump.sysmap 16 May 2020 18:31:52 -0000 1.7 +++ sys/rump/rump.sysmap 1 Jun 2020 16:01:00 -0000 @@ -134,7 +134,7 @@ 371 sys_extattr_list_file extattr_list_file rump___sysimpl_extattr_list_file 372 sys_extattr_list_link extattr_list_link rump___sysimpl_extattr_list_link 373 sys_nomodule pselect rump___sysimpl_pselect -374 sys_nomodule pollts rump___sysimpl_pollts +374 sys_nomodule ppoll rump___sysimpl_ppoll 375 sys_setxattr setxattr rump___sysimpl_setxattr 376 sys_lsetxattr lsetxattr rump___sysimpl_lsetxattr 377 sys_fsetxattr fsetxattr rump___sysimpl_fsetxattr @@ -179,7 +179,7 @@ 430 sys___nanosleep50 __nanosleep50 rump___sysimpl_nanosleep50 435 sys___kevent50 __kevent50 rump___sysimpl_kevent50 436 sys___pselect50 __pselect50 rump___sysimpl_pselect50 -437 sys___pollts50 __pollts50 rump___sysimpl_pollts50 +437 sys___ppoll50 __ppoll50 rump___sysimpl_ppoll50 438 sys_nomodule __aio_suspend50 rump___sysimpl_aio_suspend50 439 sys___stat50 __stat50 rump___sysimpl_stat50 440 sys___fstat50 __fstat50 rump___sysimpl_fstat50 Index: sys/rump/include/rump/rump_syscalls.h =================================================================== RCS file: /cvsroot/src/sys/rump/include/rump/rump_syscalls.h,v retrieving revision 1.119 diff -u -r1.119 rump_syscalls.h --- sys/rump/include/rump/rump_syscalls.h 16 May 2020 18:31:52 -0000 1.119 +++ sys/rump/include/rump/rump_syscalls.h 1 Jun 2020 16:01:00 -0000 @@ -300,8 +300,8 @@ #define RUMP_SYS_RENAME_MKFIFO rump___sysimpl_mkfifo #endif -#ifndef RUMP_SYS_RENAME_POLLTS -#define RUMP_SYS_RENAME_POLLTS rump___sysimpl_pollts50 +#ifndef RUMP_SYS_RENAME_PPOLL +#define RUMP_SYS_RENAME_PPOLL rump___sysimpl_ppoll50 #endif #ifndef RUMP_SYS_RENAME_OPEN @@ -995,7 +995,7 @@ ssize_t rump_sys_extattr_list_file(const char *, int, void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_LIST_FILE); ssize_t rump_sys_extattr_list_link(const char *, int, void *, size_t) __RENAME(RUMP_SYS_RENAME_EXTATTR_LIST_LINK); int rump_sys_pselect(int, fd_set *, fd_set *, fd_set *, const struct timespec *, const sigset_t *) __RENAME(RUMP_SYS_RENAME_PSELECT); -int rump_sys_pollts(struct pollfd *, u_int, const struct timespec *, const sigset_t *) __RENAME(RUMP_SYS_RENAME_POLLTS); +int rump_sys_ppoll(struct pollfd *, u_int, const struct timespec *, const sigset_t *) __RENAME(RUMP_SYS_RENAME_PPOLL); int rump_sys_setxattr(const char *, const char *, const void *, size_t, int) __RENAME(RUMP_SYS_RENAME_SETXATTR); int rump_sys_lsetxattr(const char *, const char *, const void *, size_t, int) __RENAME(RUMP_SYS_RENAME_LSETXATTR); int rump_sys_fsetxattr(int, const char *, const void *, size_t, int) __RENAME(RUMP_SYS_RENAME_FSETXATTR); Index: sys/rump/include/rump/rump_syscalls_compat.h =================================================================== RCS file: /cvsroot/src/sys/rump/include/rump/rump_syscalls_compat.h,v retrieving revision 1.13 diff -u -r1.13 rump_syscalls_compat.h --- sys/rump/include/rump/rump_syscalls_compat.h 15 Aug 2013 21:29:04 -0000 1.13 +++ sys/rump/include/rump/rump_syscalls_compat.h 1 Jun 2020 16:01:00 -0000 @@ -51,7 +51,7 @@ #define RUMP_SYS_RENAME_FSTAT rump___sysimpl_fstat30 #define RUMP_SYS_RENAME_LSTAT rump___sysimpl_lstat30 -#define RUMP_SYS_RENAME_POLLTS rump___sysimpl_pollts +#define RUMP_SYS_RENAME_PPOLL rump___sysimpl_ppoll #define RUMP_SYS_RENAME_SELECT rump___sysimpl_select #define RUMP_SYS_RENAME_PSELECT rump___sysimpl_pselect #define RUMP_SYS_RENAME_KEVENT rump___sysimpl_kevent Index: sys/rump/kern/lib/libsys_cygwin/syscalls.master =================================================================== RCS file: /cvsroot/src/sys/rump/kern/lib/libsys_cygwin/syscalls.master,v retrieving revision 1.2 diff -u -r1.2 syscalls.master --- sys/rump/kern/lib/libsys_cygwin/syscalls.master 15 May 2013 21:39:30 -0000 1.2 +++ sys/rump/kern/lib/libsys_cygwin/syscalls.master 1 Jun 2020 16:01:00 -0000 @@ -455,7 +455,7 @@ 371 UNIMPL extattr_list_file 372 UNIMPL extattr_list_link 373 UNIMPL pselect -374 UNIMPL pollts +374 UNIMPL ppoll 375 UNIMPL setxattr 376 UNIMPL lsetxattr 377 UNIMPL fsetxattr Index: sys/rump/kern/lib/libsys_linux/syscalls.master =================================================================== RCS file: /cvsroot/src/sys/rump/kern/lib/libsys_linux/syscalls.master,v retrieving revision 1.16 diff -u -r1.16 syscalls.master --- sys/rump/kern/lib/libsys_linux/syscalls.master 29 May 2014 10:41:48 -0000 1.16 +++ sys/rump/kern/lib/libsys_linux/syscalls.master 1 Jun 2020 16:01:00 -0000 @@ -489,7 +489,7 @@ 371 UNIMPL extattr_list_file 372 UNIMPL extattr_list_link 373 UNIMPL pselect -374 UNIMPL pollts +374 UNIMPL ppoll 375 UNIMPL setxattr 376 UNIMPL lsetxattr 377 UNIMPL fsetxattr Index: sys/rump/kern/lib/libsys_sunos/syscalls.master =================================================================== RCS file: /cvsroot/src/sys/rump/kern/lib/libsys_sunos/syscalls.master,v retrieving revision 1.2 diff -u -r1.2 syscalls.master --- sys/rump/kern/lib/libsys_sunos/syscalls.master 15 May 2013 21:39:30 -0000 1.2 +++ sys/rump/kern/lib/libsys_sunos/syscalls.master 1 Jun 2020 16:01:00 -0000 @@ -458,7 +458,7 @@ 371 UNIMPL extattr_list_file 372 UNIMPL extattr_list_link 373 UNIMPL pselect -374 UNIMPL pollts +374 UNIMPL ppoll 375 UNIMPL setxattr 376 UNIMPL lsetxattr 377 UNIMPL fsetxattr Index: sys/rump/librump/rumpkern/rump_syscalls.c =================================================================== RCS file: /cvsroot/src/sys/rump/librump/rumpkern/rump_syscalls.c,v retrieving revision 1.150 diff -u -r1.150 rump_syscalls.c --- sys/rump/librump/rumpkern/rump_syscalls.c 16 May 2020 18:31:52 -0000 1.150 +++ sys/rump/librump/rumpkern/rump_syscalls.c 1 Jun 2020 16:01:00 -0000 @@ -3987,14 +3987,14 @@ #endif /* RUMP_SYS_COMPAT */ #ifdef RUMP_SYS_COMPAT -int rump___sysimpl_pollts(struct pollfd *, u_int, const struct timespec *, const sigset_t *); +int rump___sysimpl_ppoll(struct pollfd *, u_int, const struct timespec *, const sigset_t *); int -rump___sysimpl_pollts(struct pollfd * fds, u_int nfds, const struct timespec * ts, const sigset_t * mask) +rump___sysimpl_ppoll(struct pollfd * fds, u_int nfds, const struct timespec * ts, const sigset_t * mask) { register_t retval[2]; int error = 0; int rv = -1; - struct compat_50_sys_pollts_args callarg; + struct compat_50_sys_ppoll_args callarg; memset(&callarg, 0, sizeof(callarg)); SPARG(&callarg, fds) = fds; @@ -4002,7 +4002,7 @@ SPARG(&callarg, ts) = (const struct timespec50 *)ts; SPARG(&callarg, mask) = mask; - error = rsys_syscall(SYS_compat_50_pollts, &callarg, sizeof(callarg), retval); + error = rsys_syscall(SYS_compat_50_ppoll, &callarg, sizeof(callarg), retval); rsys_seterrno(error); if (error == 0) { if (sizeof(int) > sizeof(register_t)) @@ -4013,9 +4013,9 @@ return rv; } #ifdef RUMP_KERNEL_IS_LIBC -__weak_alias(pollts,rump___sysimpl_pollts); -__weak_alias(_pollts,rump___sysimpl_pollts); -__strong_alias(_sys_pollts,rump___sysimpl_pollts); +__weak_alias(ppoll,rump___sysimpl_ppoll); +__weak_alias(_ppoll,rump___sysimpl_ppoll); +__strong_alias(_sys_ppoll,rump___sysimpl_ppoll); #endif /* RUMP_KERNEL_IS_LIBC */ #endif /* RUMP_SYS_COMPAT */ @@ -5363,14 +5363,14 @@ __strong_alias(_sys___pselect50,rump___sysimpl_pselect50); #endif /* RUMP_KERNEL_IS_LIBC */ -int rump___sysimpl_pollts50(struct pollfd *, u_int, const struct timespec *, const sigset_t *); +int rump___sysimpl_ppoll50(struct pollfd *, u_int, const struct timespec *, const sigset_t *); int -rump___sysimpl_pollts50(struct pollfd * fds, u_int nfds, const struct timespec * ts, const sigset_t * mask) +rump___sysimpl_ppoll50(struct pollfd * fds, u_int nfds, const struct timespec * ts, const sigset_t * mask) { register_t retval[2]; int error = 0; int rv = -1; - struct sys___pollts50_args callarg; + struct sys___ppoll50_args callarg; memset(&callarg, 0, sizeof(callarg)); SPARG(&callarg, fds) = fds; @@ -5378,7 +5378,7 @@ SPARG(&callarg, ts) = ts; SPARG(&callarg, mask) = mask; - error = rsys_syscall(SYS___pollts50, &callarg, sizeof(callarg), retval); + error = rsys_syscall(SYS___ppoll50, &callarg, sizeof(callarg), retval); rsys_seterrno(error); if (error == 0) { if (sizeof(int) > sizeof(register_t)) @@ -5389,10 +5389,10 @@ return rv; } #ifdef RUMP_KERNEL_IS_LIBC -__weak_alias(pollts,rump___sysimpl_pollts50); -__weak_alias(__pollts50,rump___sysimpl_pollts50); -__weak_alias(___pollts50,rump___sysimpl_pollts50); -__strong_alias(_sys___pollts50,rump___sysimpl_pollts50); +__weak_alias(ppoll,rump___sysimpl_ppoll50); +__weak_alias(__ppoll50,rump___sysimpl_ppoll50); +__weak_alias(___ppoll50,rump___sysimpl_ppoll50); +__strong_alias(_sys___ppoll50,rump___sysimpl_ppoll50); #endif /* RUMP_KERNEL_IS_LIBC */ int rump___sysimpl_aio_suspend50(const struct aiocb *const *, int, const struct timespec *); @@ -8029,9 +8029,9 @@ .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule, }, /* 373 = compat_50_pselect */ { - ns(struct compat_50_sys_pollts_args), + ns(struct compat_50_sys_ppoll_args), .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule, - }, /* 374 = compat_50_pollts */ + }, /* 374 = compat_50_ppoll */ { ns(struct sys_setxattr_args), .sy_call = (sy_call_t *)(void *)rumpns_enosys, @@ -8275,9 +8275,9 @@ .sy_call = (sy_call_t *)(void *)rumpns_enosys, }, /* 436 = __pselect50 */ { - ns(struct sys___pollts50_args), + ns(struct sys___ppoll50_args), .sy_call = (sy_call_t *)(void *)rumpns_enosys, - }, /* 437 = __pollts50 */ + }, /* 437 = __ppoll50 */ { ns(struct sys___aio_suspend50_args), .sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule, Index: sys/rump/librump/rumpkern/rumpkern_syscalls.c =================================================================== RCS file: /cvsroot/src/sys/rump/librump/rumpkern/rumpkern_syscalls.c,v retrieving revision 1.6 diff -u -r1.6 rumpkern_syscalls.c --- sys/rump/librump/rumpkern/rumpkern_syscalls.c 27 May 2020 18:26:29 -0000 1.6 +++ sys/rump/librump/rumpkern/rumpkern_syscalls.c 1 Jun 2020 16:01:00 -0000 @@ -68,7 +68,7 @@ extern sy_call_t sys___nanosleep50; extern sy_call_t sys___kevent50; extern sy_call_t sys___pselect50; -extern sy_call_t sys___pollts50; +extern sy_call_t sys___ppoll50; extern sy_call_t sys___fstat50; extern sy_call_t sys___timer_settime50; extern sy_call_t sys___timer_gettime50; @@ -137,7 +137,7 @@ { 430, sys___nanosleep50 }, { 435, sys___kevent50 }, { 436, sys___pselect50 }, - { 437, sys___pollts50 }, + { 437, sys___ppoll50 }, { 440, sys___fstat50 }, { 446, sys___timer_settime50 }, { 447, sys___timer_gettime50 }, Index: sys/sys/poll.h =================================================================== RCS file: /cvsroot/src/sys/sys/poll.h,v retrieving revision 1.15 diff -u -r1.15 poll.h --- sys/sys/poll.h 11 Nov 2009 09:48:51 -0000 1.15 +++ sys/sys/poll.h 1 Jun 2020 16:01:00 -0000 @@ -89,6 +89,9 @@ __BEGIN_DECLS #ifndef __LIBC12_SOURCE__ +int ppoll(struct pollfd * __restrict, nfds_t, + const struct timespec * __restrict, const sigset_t * __restrict) + __RENAME(__ppoll50); int pollts(struct pollfd * __restrict, nfds_t, const struct timespec * __restrict, const sigset_t * __restrict) __RENAME(__pollts50); Index: sys/sys/syscall.h =================================================================== RCS file: /cvsroot/src/sys/sys/syscall.h,v retrieving revision 1.314 diff -u -r1.314 syscall.h --- sys/sys/syscall.h 16 May 2020 18:31:53 -0000 1.314 +++ sys/sys/syscall.h 1 Jun 2020 16:01:00 -0000 @@ -1020,8 +1020,8 @@ /* syscall: "compat_50_pselect" ret: "int" args: "int" "fd_set *" "fd_set *" "fd_set *" "const struct timespec50 *" "const sigset_t *" */ #define SYS_compat_50_pselect 373 -/* syscall: "compat_50_pollts" ret: "int" args: "struct pollfd *" "u_int" "const struct timespec50 *" "const sigset_t *" */ -#define SYS_compat_50_pollts 374 +/* syscall: "compat_50_ppoll" ret: "int" args: "struct pollfd *" "u_int" "const struct timespec50 *" "const sigset_t *" */ +#define SYS_compat_50_ppoll 374 /* syscall: "setxattr" ret: "int" args: "const char *" "const char *" "const void *" "size_t" "int" */ #define SYS_setxattr 375 @@ -1198,8 +1198,8 @@ /* syscall: "__pselect50" ret: "int" args: "int" "fd_set *" "fd_set *" "fd_set *" "const struct timespec *" "const sigset_t *" */ #define SYS___pselect50 436 -/* syscall: "__pollts50" ret: "int" args: "struct pollfd *" "u_int" "const struct timespec *" "const sigset_t *" */ -#define SYS___pollts50 437 +/* syscall: "__ppoll50" ret: "int" args: "struct pollfd *" "u_int" "const struct timespec *" "const sigset_t *" */ +#define SYS___ppoll50 437 /* syscall: "__aio_suspend50" ret: "int" args: "const struct aiocb *const *" "int" "const struct timespec *" */ #define SYS___aio_suspend50 438 Index: sys/sys/syscallargs.h =================================================================== RCS file: /cvsroot/src/sys/sys/syscallargs.h,v retrieving revision 1.298 diff -u -r1.298 syscallargs.h --- sys/sys/syscallargs.h 16 May 2020 18:31:53 -0000 1.298 +++ sys/sys/syscallargs.h 1 Jun 2020 16:01:00 -0000 @@ -2376,13 +2376,13 @@ }; check_syscall_args(compat_50_sys_pselect) -struct compat_50_sys_pollts_args { +struct compat_50_sys_ppoll_args { syscallarg(struct pollfd *) fds; syscallarg(u_int) nfds; syscallarg(const struct timespec50 *) ts; syscallarg(const sigset_t *) mask; }; -check_syscall_args(compat_50_sys_pollts) +check_syscall_args(compat_50_sys_ppoll) struct sys_setxattr_args { syscallarg(const char *) path; @@ -2815,13 +2815,13 @@ }; check_syscall_args(sys___pselect50) -struct sys___pollts50_args { +struct sys___ppoll50_args { syscallarg(struct pollfd *) fds; syscallarg(u_int) nfds; syscallarg(const struct timespec *) ts; syscallarg(const sigset_t *) mask; }; -check_syscall_args(sys___pollts50) +check_syscall_args(sys___ppoll50) struct sys___aio_suspend50_args { syscallarg(const struct aiocb *const *) list; @@ -3986,7 +3986,7 @@ int compat_50_sys_pselect(struct lwp *, const struct compat_50_sys_pselect_args *, register_t *); -int compat_50_sys_pollts(struct lwp *, const struct compat_50_sys_pollts_args *, register_t *); +int compat_50_sys_ppoll(struct lwp *, const struct compat_50_sys_ppoll_args *, register_t *); int sys_setxattr(struct lwp *, const struct sys_setxattr_args *, register_t *); @@ -4104,7 +4104,7 @@ int sys___pselect50(struct lwp *, const struct sys___pselect50_args *, register_t *); -int sys___pollts50(struct lwp *, const struct sys___pollts50_args *, register_t *); +int sys___ppoll50(struct lwp *, const struct sys___ppoll50_args *, register_t *); int sys___aio_suspend50(struct lwp *, const struct sys___aio_suspend50_args *, register_t *); Index: tests/lib/libc/gen/t_sleep.c =================================================================== RCS file: /cvsroot/src/tests/lib/libc/gen/t_sleep.c,v retrieving revision 1.11 diff -u -r1.11 t_sleep.c --- tests/lib/libc/gen/t_sleep.c 10 Jan 2017 15:43:59 -0000 1.11 +++ tests/lib/libc/gen/t_sleep.c 1 Jun 2020 16:01:01 -0000 @@ -125,7 +125,7 @@ struct timeval tv; TIMESPEC_TO_TIMEVAL(&tv, delay); - if (pollts(NULL, 0, delay, NULL) == -1) + if (ppoll(NULL, 0, delay, NULL) == -1) ret = (errno == EINTR ? 0 : errno); else ret = 0; Index: tests/lib/libc/sys/t_poll.c =================================================================== RCS file: /cvsroot/src/tests/lib/libc/sys/t_poll.c,v retrieving revision 1.3 diff -u -r1.3 t_poll.c --- tests/lib/libc/sys/t_poll.c 18 Mar 2012 07:00:52 -0000 1.3 +++ tests/lib/libc/sys/t_poll.c 1 Jun 2020 16:01:01 -0000 @@ -233,15 +233,15 @@ ATF_REQUIRE_ERRNO(EINVAL, poll(&pfd, 1, -2) == -1); } -ATF_TC(pollts_basic); -ATF_TC_HEAD(pollts_basic, tc) +ATF_TC(ppoll_basic); +ATF_TC_HEAD(ppoll_basic, tc) { atf_tc_set_md_var(tc, "timeout", "10"); atf_tc_set_md_var(tc, "descr", - "Basis functionality test for pollts(2)"); + "Basis functionality test for ppoll(2)"); } -ATF_TC_BODY(pollts_basic, tc) +ATF_TC_BODY(ppoll_basic, tc) { int fds[2]; struct pollfd pfds[2]; @@ -265,7 +265,7 @@ */ pfds[0].revents = -1; pfds[1].revents = -1; - ATF_REQUIRE_EQ_MSG(ret = pollts(&pfds[0], 1, &timeout, NULL), 0, + ATF_REQUIRE_EQ_MSG(ret = ppoll(&pfds[0], 1, &timeout, NULL), 0, "got: %d", ret); ATF_REQUIRE_EQ_MSG(pfds[0].revents, 0, "got: %d", pfds[0].revents); ATF_REQUIRE_EQ_MSG(pfds[1].revents, -1, "got: %d", pfds[1].revents); @@ -273,7 +273,7 @@ /* Check that the write end of the pipe as reported as ready. */ pfds[0].revents = -1; pfds[1].revents = -1; - ATF_REQUIRE_EQ_MSG(ret = pollts(&pfds[1], 1, &timeout, NULL), 1, + ATF_REQUIRE_EQ_MSG(ret = ppoll(&pfds[1], 1, &timeout, NULL), 1, "got: %d", ret); ATF_REQUIRE_EQ_MSG(pfds[0].revents, -1, "got: %d", pfds[0].revents); ATF_REQUIRE_EQ_MSG(pfds[1].revents, POLLOUT, "got: %d",\ @@ -282,7 +282,7 @@ /* Check that only the write end of the pipe as reported as ready. */ pfds[0].revents = -1; pfds[1].revents = -1; - ATF_REQUIRE_EQ_MSG(ret = pollts(pfds, 2, &timeout, NULL), 1, + ATF_REQUIRE_EQ_MSG(ret = ppoll(pfds, 2, &timeout, NULL), 1, "got: %d", ret); ATF_REQUIRE_EQ_MSG(pfds[0].revents, 0, "got: %d", pfds[0].revents); ATF_REQUIRE_EQ_MSG(pfds[1].revents, POLLOUT, "got: %d", @@ -294,7 +294,7 @@ /* Check that both ends of our pipe are reported as ready. */ pfds[0].revents = -1; pfds[1].revents = -1; - ATF_REQUIRE_EQ_MSG(ret = pollts(pfds, 2, &timeout, NULL), 2, + ATF_REQUIRE_EQ_MSG(ret = ppoll(pfds, 2, &timeout, NULL), 2, "got: %d", ret); ATF_REQUIRE_EQ_MSG(pfds[0].revents, POLLIN, "got: %d", pfds[0].revents); @@ -305,13 +305,13 @@ ATF_REQUIRE_EQ(close(fds[1]), 0); } -ATF_TC(pollts_err); -ATF_TC_HEAD(pollts_err, tc) +ATF_TC(ppoll_err); +ATF_TC_HEAD(ppoll_err, tc) { - atf_tc_set_md_var(tc, "descr", "Check errors from pollts(2)"); + atf_tc_set_md_var(tc, "descr", "Check errors from ppoll(2)"); } -ATF_TC_BODY(pollts_err, tc) +ATF_TC_BODY(ppoll_err, tc) { struct timespec timeout; struct pollfd pfd; @@ -324,24 +324,24 @@ timeout.tv_nsec = 0; errno = 0; - ATF_REQUIRE_ERRNO(EFAULT, pollts((void *)-1, 1, &timeout, NULL) == -1); + ATF_REQUIRE_ERRNO(EFAULT, ppoll((void *)-1, 1, &timeout, NULL) == -1); timeout.tv_sec = -1; timeout.tv_nsec = -1; errno = 0; - ATF_REQUIRE_ERRNO(EINVAL, pollts(&pfd, 1, &timeout, NULL) == -1); + ATF_REQUIRE_ERRNO(EINVAL, ppoll(&pfd, 1, &timeout, NULL) == -1); } -ATF_TC(pollts_sigmask); -ATF_TC_HEAD(pollts_sigmask, tc) +ATF_TC(ppoll_sigmask); +ATF_TC_HEAD(ppoll_sigmask, tc) { atf_tc_set_md_var(tc, "timeout", "10"); atf_tc_set_md_var(tc, "descr", - "Check that pollts(2) restores the signal mask (PR kern/44986)"); + "Check that ppoll(2) restores the signal mask (PR kern/44986)"); } -ATF_TC_BODY(pollts_sigmask, tc) +ATF_TC_BODY(ppoll_sigmask, tc) { int fd; struct pollfd pfd; @@ -364,10 +364,10 @@ ATF_REQUIRE_EQ(sigprocmask(SIG_UNBLOCK, &mask, NULL), 0); /* - * Check that pollts(2) immediately returns. We block *all* - * signals during pollts(2). + * Check that ppoll(2) immediately returns. We block *all* + * signals during ppoll(2). */ - ATF_REQUIRE_EQ_MSG(ret = pollts(&pfd, 1, &timeout, &mask), 1, + ATF_REQUIRE_EQ_MSG(ret = ppoll(&pfd, 1, &timeout, &mask), 1, "got: %d", ret); /* Check that signals are now longer blocked. */ @@ -384,9 +384,9 @@ ATF_TP_ADD_TC(tp, poll_3way); ATF_TP_ADD_TC(tp, poll_basic); ATF_TP_ADD_TC(tp, poll_err); - ATF_TP_ADD_TC(tp, pollts_basic); - ATF_TP_ADD_TC(tp, pollts_err); - ATF_TP_ADD_TC(tp, pollts_sigmask); + ATF_TP_ADD_TC(tp, ppoll_basic); + ATF_TP_ADD_TC(tp, ppoll_err); + ATF_TP_ADD_TC(tp, ppoll_sigmask); return atf_no_error(); } Index: usr.sbin/makemandb/nostem.txt =================================================================== RCS file: /cvsroot/src/usr.sbin/makemandb/nostem.txt,v retrieving revision 1.5 diff -u -r1.5 nostem.txt --- usr.sbin/makemandb/nostem.txt 17 Jan 2020 15:00:21 -0000 1.5 +++ usr.sbin/makemandb/nostem.txt 1 Jun 2020 16:01:01 -0000 @@ -3036,6 +3036,7 @@ ppb ppbus ppi +ppoll ppp pppd pppdump