summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2012-04-23 17:51:25 +0200
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2012-06-15 14:00:44 +0200
commit1c17b766a973a013c6967f792c60debb83721e9b (patch)
treee9df401574482000f506a5a7ed770833252fe042
parent93002a29bca1eb9d5f83da7569e30a50b8696238 (diff)
epoll.c: add cancellation to epoll_[p]wait()
While there, fix epoll_pwait syscall, it takes 6 arguments Signed-off-by: Peter S. Mazinger <ps.m@gmx.net> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-rw-r--r--libc/sysdeps/linux/common/epoll.c54
1 files changed, 15 insertions, 39 deletions
diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c
index b8a0c1514..a7781a12b 100644
--- a/libc/sysdeps/linux/common/epoll.c
+++ b/libc/sysdeps/linux/common/epoll.c
@@ -9,11 +9,7 @@
#include <sys/syscall.h>
#include <sys/epoll.h>
-#ifdef __UCLIBC_HAS_THREADS_NATIVE__
-# include <sysdep-cancel.h>
-#else
-# define SINGLE_THREAD_P 1
-#endif
+#include <cancel.h>
#ifdef __NR_epoll_create
_syscall1(int, epoll_create, int, size)
@@ -28,47 +24,27 @@ _syscall4(int, epoll_ctl, int, epfd, int, op, int, fd, struct epoll_event *, eve
#endif
#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
#ifdef __NR_epoll_pwait
# include <signal.h>
-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