From c616c62c1a03356159f02e791dccf72de6987654 Mon Sep 17 00:00:00 2001 From: Peter S. Mazinger Date: Fri, 13 May 2011 01:56:08 +0200 Subject: [PATCH 396/396] epoll.c: add cancellation to epoll_[p]wait() While there, fix epoll_pwait syscall, it takes 6 arguments Signed-off-by: Peter S. Mazinger --- libc/sysdeps/linux/common/epoll.c | 57 ++++++++--------------------- libpthread/linuxthreads.old/wrapsyscall.c | 2 +- 2 files changed, 17 insertions(+), 42 deletions(-) diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c index 2f894ba..8235011 100644 --- a/libc/sysdeps/linux/common/epoll.c +++ b/libc/sysdeps/linux/common/epoll.c @@ -9,11 +9,8 @@ #include #include -#ifdef __UCLIBC_HAS_THREADS_NATIVE__ -# include -#else -# define SINGLE_THREAD_P 1 -#endif +#include + /* * epoll_create() @@ -40,49 +37,27 @@ _syscall4(int,epoll_ctl, int, epfd, int, op, int, fd, struct epoll_event *, even * epoll_wait() */ #ifdef __NR_epoll_wait -extern __typeof(epoll_wait) __libc_epoll_wait; -int __libc_epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout) +static int __NC(epoll_wait)(int epfd, struct epoll_event *events, int maxevents, int timeout) { - if (SINGLE_THREAD_P) - return INLINE_SYSCALL(epoll_wait, 4, epfd, events, maxevents, timeout); -# ifdef __UCLIBC_HAS_THREADS_NATIVE__ - else { - int oldtype = LIBC_CANCEL_ASYNC (); - int result = INLINE_SYSCALL(epoll_wait, 4, epfd, events, maxevents, timeout); - LIBC_CANCEL_RESET (oldtype); - return result; - } -# endif + return INLINE_SYSCALL(epoll_wait, 4, epfd, events, maxevents, timeout); } -weak_alias(__libc_epoll_wait, epoll_wait) +CANCELLABLE_SYSCALL(int, epoll_wait, (int epfd, struct epoll_event *events, int maxevents, int timeout), + (epfd, events, maxevents, timeout)) #endif -/* - * epoll_pwait() - */ #ifdef __NR_epoll_pwait # include -extern __typeof(epoll_pwait) __libc_epoll_pwait; -int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents, - int timeout, const sigset_t *set) +# define __NR___syscall_epoll_pwait __NR_epoll_pwait +static __always_inline _syscall6(int, __syscall_epoll_pwait, int, epfd, struct epoll_event *, events, + int, maxevents, int, timeout, const sigset_t *, sigmask, size_t, sigsetsize) + +static int __NC(epoll_pwait)(int epfd, struct epoll_event *events, int maxevents, int timeout, + const sigset_t *set) { - int nsig = _NSIG / 8; - if (SINGLE_THREAD_P) - return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig); -# ifdef __UCLIBC_HAS_THREADS_NATIVE__ - else { - int oldtype = LIBC_CANCEL_ASYNC (); - int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig); - LIBC_CANCEL_RESET (oldtype); - return result; - } -# endif + return __syscall_epoll_pwait(epfd, events, maxevents, timeout, set, __SYSCALL_SIGSET_T_SIZE); } -weak_alias(__libc_epoll_pwait, epoll_pwait) -#endif - -#ifdef __NR_epoll_pwait -_syscall5(int, epoll_pwait, int, epfd, struct epoll_event *, events, int, maxevents, int, timeout, __const sigset_t *, ss) -/* TODO: add cancellation for epoll_pwait */ +CANCELLABLE_SYSCALL(int, epoll_pwait, (int epfd, struct epoll_event *events, int maxevents, int timeout, + const sigset_t *set), + (epfd, events, maxevents, timeout, set)) #endif diff --git a/libpthread/linuxthreads.old/wrapsyscall.c b/libpthread/linuxthreads.old/wrapsyscall.c index 3f39e2b..1ea5994 100644 --- a/libpthread/linuxthreads.old/wrapsyscall.c +++ b/libpthread/linuxthreads.old/wrapsyscall.c @@ -233,12 +233,12 @@ CANCELABLE_SYSCALL (ssize_t, sendto, (int fd, const __ptr_t buf, size_t n, #endif /* __UCLIBC_HAS_SOCKET__ */ #ifdef __UCLIBC_HAS_EPOLL__ -# include # ifdef __NR_epoll_wait CANCELABLE_SYSCALL (int, epoll_wait, (int epfd, struct epoll_event *events, int maxevents, int timeout), (epfd, events, maxevents, timeout)) # endif # ifdef __NR_epoll_pwait +# include CANCELABLE_SYSCALL (int, epoll_pwait, (int epfd, struct epoll_event *events, int maxevents, int timeout, const sigset_t *set), (epfd, events, maxevents, timeout, set)) -- 1.7.0.4