svn commit: r293555 - in stable/10/sys: amd64/linux amd64/linux32 compat/linux i386/linux
Dmitry Chagin
dchagin at FreeBSD.org
Sat Jan 9 16:58:59 UTC 2016
Author: dchagin
Date: Sat Jan 9 16:58:57 2016
New Revision: 293555
URL: https://svnweb.freebsd.org/changeset/base/293555
Log:
MFC r283451:
Implement ppoll() system call.
Modified:
stable/10/sys/amd64/linux/linux_dummy.c
stable/10/sys/amd64/linux/syscalls.master
stable/10/sys/amd64/linux32/linux32_dummy.c
stable/10/sys/amd64/linux32/syscalls.master
stable/10/sys/compat/linux/linux_misc.c
stable/10/sys/i386/linux/linux_dummy.c
stable/10/sys/i386/linux/syscalls.master
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/amd64/linux/linux_dummy.c
==============================================================================
--- stable/10/sys/amd64/linux/linux_dummy.c Sat Jan 9 16:58:03 2016 (r293554)
+++ stable/10/sys/amd64/linux/linux_dummy.c Sat Jan 9 16:58:57 2016 (r293555)
@@ -92,7 +92,6 @@ DUMMY(inotify_init);
DUMMY(inotify_add_watch);
DUMMY(inotify_rm_watch);
DUMMY(migrate_pages);
-DUMMY(ppoll);
DUMMY(unshare);
DUMMY(splice);
DUMMY(tee);
Modified: stable/10/sys/amd64/linux/syscalls.master
==============================================================================
--- stable/10/sys/amd64/linux/syscalls.master Sat Jan 9 16:58:03 2016 (r293554)
+++ stable/10/sys/amd64/linux/syscalls.master Sat Jan 9 16:58:57 2016 (r293555)
@@ -456,7 +456,8 @@
270 AUE_SELECT STD { int linux_pselect6(l_int nfds, \
l_fd_set *readfds, l_fd_set *writefds, l_fd_set *exceptfds, \
struct l_timespec *tsp, l_uintptr_t *sig); }
-271 AUE_NULL STD { int linux_ppoll(void); }
+271 AUE_POLL STD { int linux_ppoll(struct pollfd *fds, uint32_t nfds, \
+ struct l_timespec *tsp, l_sigset_t *sset, l_size_t ssize); }
272 AUE_NULL STD { int linux_unshare(void); }
273 AUE_NULL STD { int linux_set_robust_list(struct linux_robust_list_head *head, \
l_size_t len); }
Modified: stable/10/sys/amd64/linux32/linux32_dummy.c
==============================================================================
--- stable/10/sys/amd64/linux32/linux32_dummy.c Sat Jan 9 16:58:03 2016 (r293554)
+++ stable/10/sys/amd64/linux32/linux32_dummy.c Sat Jan 9 16:58:57 2016 (r293555)
@@ -93,7 +93,6 @@ DUMMY(inotify_add_watch);
DUMMY(inotify_rm_watch);
/* linux 2.6.16: */
DUMMY(migrate_pages);
-DUMMY(ppoll);
DUMMY(unshare);
/* linux 2.6.17: */
DUMMY(splice);
Modified: stable/10/sys/amd64/linux32/syscalls.master
==============================================================================
--- stable/10/sys/amd64/linux32/syscalls.master Sat Jan 9 16:58:03 2016 (r293554)
+++ stable/10/sys/amd64/linux32/syscalls.master Sat Jan 9 16:58:57 2016 (r293555)
@@ -514,7 +514,8 @@
308 AUE_SELECT STD { int linux_pselect6(l_int nfds, l_fd_set *readfds, \
l_fd_set *writefds, l_fd_set *exceptfds, \
struct l_timespec *tsp, l_uintptr_t *sig); }
-309 AUE_NULL STD { int linux_ppoll(void); }
+309 AUE_POLL STD { int linux_ppoll(struct pollfd *fds, uint32_t nfds, \
+ struct l_timespec *tsp, l_sigset_t *sset, l_size_t ssize); }
310 AUE_NULL STD { int linux_unshare(void); }
; linux 2.6.17:
311 AUE_NULL STD { int linux_set_robust_list(struct linux_robust_list_head *head, \
Modified: stable/10/sys/compat/linux/linux_misc.c
==============================================================================
--- stable/10/sys/compat/linux/linux_misc.c Sat Jan 9 16:58:03 2016 (r293554)
+++ stable/10/sys/compat/linux/linux_misc.c Sat Jan 9 16:58:57 2016 (r293555)
@@ -2207,6 +2207,59 @@ linux_pselect6(struct thread *td, struct
return (error);
}
+int
+linux_ppoll(struct thread *td, struct linux_ppoll_args *args)
+{
+ struct timespec ts0, ts1;
+ struct l_timespec lts;
+ struct timespec uts, *tsp;
+ l_sigset_t l_ss;
+ sigset_t *ssp;
+ sigset_t ss;
+ int error;
+
+ if (args->sset != NULL) {
+ if (args->ssize != sizeof(l_ss))
+ return (EINVAL);
+ error = copyin(args->sset, &l_ss, sizeof(l_ss));
+ if (error)
+ return (error);
+ linux_to_bsd_sigset(&l_ss, &ss);
+ ssp = &ss;
+ } else
+ ssp = NULL;
+ if (args->tsp != NULL) {
+ error = copyin(args->tsp, <s, sizeof(lts));
+ if (error)
+ return (error);
+ uts.tv_sec = lts.tv_sec;
+ uts.tv_nsec = lts.tv_nsec;
+
+ nanotime(&ts0);
+ tsp = &uts;
+ } else
+ tsp = NULL;
+
+ error = kern_poll(td, args->fds, args->nfds, tsp, ssp);
+
+ if (error == 0 && args->tsp != NULL) {
+ if (td->td_retval[0]) {
+ nanotime(&ts1);
+ timespecsub(&ts1, &ts0);
+ timespecsub(&uts, &ts1);
+ if (uts.tv_sec < 0)
+ timespecclear(&uts);
+ } else
+ timespecclear(&uts);
+
+ lts.tv_sec = uts.tv_sec;
+ lts.tv_nsec = uts.tv_nsec;
+ error = copyout(<s, args->tsp, sizeof(lts));
+ }
+
+ return (error);
+}
+
#if defined(DEBUG) || defined(KTR)
/* XXX: can be removed when every ldebug(...) and KTR stuff are removed. */
Modified: stable/10/sys/i386/linux/linux_dummy.c
==============================================================================
--- stable/10/sys/i386/linux/linux_dummy.c Sat Jan 9 16:58:03 2016 (r293554)
+++ stable/10/sys/i386/linux/linux_dummy.c Sat Jan 9 16:58:57 2016 (r293555)
@@ -89,7 +89,6 @@ DUMMY(inotify_add_watch);
DUMMY(inotify_rm_watch);
/* linux 2.6.16: */
DUMMY(migrate_pages);
-DUMMY(ppoll);
DUMMY(unshare);
/* linux 2.6.17: */
DUMMY(splice);
Modified: stable/10/sys/i386/linux/syscalls.master
==============================================================================
--- stable/10/sys/i386/linux/syscalls.master Sat Jan 9 16:58:03 2016 (r293554)
+++ stable/10/sys/i386/linux/syscalls.master Sat Jan 9 16:58:57 2016 (r293555)
@@ -522,7 +522,8 @@
308 AUE_SELECT STD { int linux_pselect6(l_int nfds, l_fd_set *readfds, \
l_fd_set *writefds, l_fd_set *exceptfds, \
struct l_timespec *tsp, l_uintptr_t *sig); }
-309 AUE_NULL STD { int linux_ppoll(void); }
+309 AUE_POLL STD { int linux_ppoll(struct pollfd *fds, uint32_t nfds, \
+ struct l_timespec *tsp, l_sigset_t *sset, l_size_t ssize); }
310 AUE_NULL STD { int linux_unshare(void); }
; linux 2.6.17:
311 AUE_NULL STD { int linux_set_robust_list(struct linux_robust_list_head *head, \
More information about the svn-src-all
mailing list