mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-user: Use safe_syscall wrapper for epoll_wait syscalls

Browse Source 
Use the safe_syscall wrapper for epoll_wait and epoll_pwait syscalls.

Since we now directly use the host epoll_pwait syscall for both
epoll_wait and epoll_pwait, we don't need the configure machinery
to check whether glibc supports epoll_pwait(). (The kernel has
supported the syscall since 2.6.19 so we can assume it's always there.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Peter Maydell 2016-06-06 19:58:11 +01:00 committed by Riku Voipio
parent a6130237b8
commit 227f02143f
2 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure vendored
View File

@ -3798,8 +3798,8 @@ if compile_prog "" "" ; then
epoll=yes epoll=yes
fi fi
# epoll_create1 and epoll_pwait are later additions # epoll_create1 is a later addition
# so we must check separately for their presence # so we must check separately for its presence
epoll_create1=no epoll_create1=no
cat > $TMPC << EOF cat > $TMPC << EOF
#include <sys/epoll.h> #include <sys/epoll.h>
@ -3821,20 +3821,6 @@ if compile_prog "" "" ; then
epoll_create1=yes epoll_create1=yes
fi fi
epoll_pwait=no
cat > $TMPC << EOF
#include <sys/epoll.h>
int main(void)
{
epoll_pwait(0, 0, 0, 0, 0);
return 0;
}
EOF
if compile_prog "" "" ; then
epoll_pwait=yes
fi
# check for sendfile support # check for sendfile support
sendfile=no sendfile=no
cat > $TMPC << EOF cat > $TMPC << EOF
@ -5125,9 +5111,6 @@ fi
if test "$epoll_create1" = "yes" ; then if test "$epoll_create1" = "yes" ; then
echo "CONFIG_EPOLL_CREATE1=y" >> $config_host_mak echo "CONFIG_EPOLL_CREATE1=y" >> $config_host_mak
fi fi
if test "$epoll_pwait" = "yes" ; then
echo "CONFIG_EPOLL_PWAIT=y" >> $config_host_mak
fi
if test "$sendfile" = "yes" ; then if test "$sendfile" = "yes" ; then
echo "CONFIG_SENDFILE=y" >> $config_host_mak echo "CONFIG_SENDFILE=y" >> $config_host_mak
fi fi

18
linux-user/syscall.c
View File

@ -699,6 +699,9 @@ safe_syscall6(int, pselect6, int, nfds, fd_set *, readfds, fd_set *, writefds, \
safe_syscall5(int, ppoll, struct pollfd *, ufds, unsigned int, nfds, safe_syscall5(int, ppoll, struct pollfd *, ufds, unsigned int, nfds,
struct timespec *, tsp, const sigset_t *, sigmask, struct timespec *, tsp, const sigset_t *, sigmask,
size_t, sigsetsize) size_t, sigsetsize)
safe_syscall6(int, epoll_pwait, int, epfd, struct epoll_event *, events,
int, maxevents, int, timeout, const sigset_t *, sigmask,
size_t, sigsetsize)
safe_syscall6(int,futex,int *,uaddr,int,op,int,val, \ safe_syscall6(int,futex,int *,uaddr,int,op,int,val, \
const struct timespec *,timeout,int *,uaddr2,int,val3) const struct timespec *,timeout,int *,uaddr2,int,val3)
safe_syscall2(int, rt_sigsuspend, sigset_t *, newset, size_t, sigsetsize) safe_syscall2(int, rt_sigsuspend, sigset_t *, newset, size_t, sigsetsize)
@ -10835,14 +10838,11 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
} }
#endif #endif
#if defined(TARGET_NR_epoll_pwait) && defined(CONFIG_EPOLL_PWAIT) #if defined(TARGET_NR_epoll_wait) || defined(TARGET_NR_epoll_pwait)
#define IMPLEMENT_EPOLL_PWAIT
#endif
#if defined(TARGET_NR_epoll_wait) || defined(IMPLEMENT_EPOLL_PWAIT)
#if defined(TARGET_NR_epoll_wait) #if defined(TARGET_NR_epoll_wait)
case TARGET_NR_epoll_wait: case TARGET_NR_epoll_wait:
#endif #endif
#if defined(IMPLEMENT_EPOLL_PWAIT) #if defined(TARGET_NR_epoll_pwait)
case TARGET_NR_epoll_pwait: case TARGET_NR_epoll_pwait:
#endif #endif
{ {
@ -10861,7 +10861,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
ep = alloca(maxevents * sizeof(struct epoll_event)); ep = alloca(maxevents * sizeof(struct epoll_event));
switch (num) { switch (num) {
#if defined(IMPLEMENT_EPOLL_PWAIT) #if defined(TARGET_NR_epoll_pwait)
case TARGET_NR_epoll_pwait: case TARGET_NR_epoll_pwait:
{ {
target_sigset_t *target_set; target_sigset_t *target_set;
@ -10880,13 +10880,15 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
set = NULL; set = NULL;
} }
ret = get_errno(epoll_pwait(epfd, ep, maxevents, timeout, set)); ret = get_errno(safe_epoll_pwait(epfd, ep, maxevents, timeout,
set, SIGSET_T_SIZE));
break; break;
} }
#endif #endif
#if defined(TARGET_NR_epoll_wait) #if defined(TARGET_NR_epoll_wait)
case TARGET_NR_epoll_wait: case TARGET_NR_epoll_wait:
ret = get_errno(epoll_wait(epfd, ep, maxevents, timeout)); ret = get_errno(safe_epoll_pwait(epfd, ep, maxevents, timeout,
NULL, 0));
break; break;
#endif #endif
default: default: