busybox/uClibc
1
0
Fork 0
mirror of https://git.busybox.net/uClibc synced 2025-05-10 15:42:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

epoll: redo cancellation to match master

Browse Source 
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
This commit is contained in:
Bernhard Reutner-Fischer 2011-05-13 12:16:29 +02:00
parent c6057584e0
commit 1bfe83b42b
1 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libc/sysdeps/linux/common/epoll.c
View File

@ -9,7 +9,11 @@
#include <sys/syscall.h> #include <sys/syscall.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#include <cancel.h> #ifdef __UCLIBC_HAS_THREADS_NATIVE__
# include <sysdep-cancel.h>
#else
# define SINGLE_THREAD_P 1
#endif
/* /*
* epoll_create() * epoll_create()
@ -36,12 +40,21 @@ _syscall4(int,epoll_ctl, int, epfd, int, op, int, fd, struct epoll_event *, even
* epoll_wait() * epoll_wait()
*/ */
#ifdef __NR_epoll_wait #ifdef __NR_epoll_wait
static int __NC(epoll_wait)(int epfd, struct epoll_event *events, int maxevents, int timeout) extern __typeof(epoll_wait) __libc_epoll_wait;
int __libc_epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout)
{ {
return INLINE_SYSCALL(epoll_wait, 4, epfd, events, maxevents, 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
} }
CANCELLABLE_SYSCALL(int, epoll_wait, (int epfd, struct epoll_event *events, int maxevents, int timeout), weak_alias(__libc_epoll_wait, epoll_wait)
(epfd, events, maxevents, timeout))
#endif #endif
/* /*
@ -50,16 +63,20 @@ CANCELLABLE_SYSCALL(int, epoll_wait, (int epfd, struct epoll_event *events, int
#ifdef __NR_epoll_pwait #ifdef __NR_epoll_pwait
# include <signal.h> # include <signal.h>
# define __NR___syscall_epoll_pwait __NR_epoll_pwait extern __typeof(epoll_pwait) __libc_epoll_pwait;
static __always_inline _syscall6(int, __syscall_epoll_pwait, int, epfd, struct epoll_event *, events, int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents,
int, maxevents, int, timeout, const sigset_t *, sigmask, size_t, sigsetsize) int timeout, const sigset_t *set)
static int __NC(epoll_pwait)(int epfd, struct epoll_event *events, int maxevents, int timeout,
const sigset_t *set)
{ {
return __syscall_epoll_pwait(epfd, events, maxevents, timeout, set, __SYSCALL_SIGSET_T_SIZE); if (SINGLE_THREAD_P)
return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
# ifdef __UCLIBC_HAS_THREADS_NATIVE__
else {
int oldtype = LIBC_CANCEL_ASYNC ();
int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
LIBC_CANCEL_RESET (oldtype);
return result;
}
# endif
} }
CANCELLABLE_SYSCALL(int, epoll_pwait, (int epfd, struct epoll_event *events, int maxevents, int timeout, weak_alias(__libc_epoll_pwait, epoll_pwait)
const sigset_t *set),
(epfd, events, maxevents, timeout, set))
#endif #endif