d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement ppoll() system call.

Browse Source 
Differential Revision:	https://reviews.freebsd.org/D1105
Reviewed by:	trasz
This commit is contained in:
Dmitry Chagin 2015-05-24 16:59:25 +00:00
parent 3d7b4b3720
commit a6b40812ec
7 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/amd64/linux/linux_dummy.c
View File

@ -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);

3
sys/amd64/linux/syscalls.master
View File

@ -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); }

1
sys/amd64/linux32/linux32_dummy.c
View File

@ -92,7 +92,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);

3
sys/amd64/linux32/syscalls.master
View File

@ -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, \

53
sys/compat/linux/linux_misc.c
View File

@ -2209,6 +2209,59 @@ linux_pselect6(struct thread *td, struct linux_pselect6_args *args)
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, &lts, 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(&lts, args->tsp, sizeof(lts));
}
return (error);
}
#if defined(DEBUG) || defined(KTR)
/* XXX: can be removed when every ldebug(...) and KTR stuff are removed. */

1
sys/i386/linux/linux_dummy.c
View File

@ -88,7 +88,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);

3
sys/i386/linux/syscalls.master
View File

@ -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, \