lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

linux: Include <sysdep-cancel.h> for epoll_wait

Browse Source 
The epoll_wait wrapper uses the raw syscall if __NR_epoll_wait is defined,
and falls back to calling epoll_pwait(..., NULL) if it isn't defined.
However, it didn't include the appropriate headers for __NR_epoll_wait to
be defined, so it was *always* falling back to calling epoll_pwait!

This mistake was introduced in b62c381591,
when epoll_wait changed from being in syscalls.list to always having a C
wrapper.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
This commit is contained in:
Luke Shumaker
2017-11-15 14:36:25 -02:00
committed by Adhemerval Zanella
parent 58c9f659ee
commit cad7ca3908
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2017-11-15 Luke Shumaker <lukeshu@parabola.nu>
* sysdeps/unix/sysv/linux/epoll_wait.c: Include <sysdep-cancel.h>.
2017-11-15 Mike FABIAN <mfabian@redhat.com> 2017-11-15 Mike FABIAN <mfabian@redhat.com>
* localedata/locales/ka_GE (LC_MESSAGES): Add “X” back to yesexpr, * localedata/locales/ka_GE (LC_MESSAGES): Add “X” back to yesexpr,

2
sysdeps/unix/sysv/linux/epoll_wait.c
View File

@ -21,6 +21,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#include <sysdep-cancel.h>
int int
epoll_wait (int epfd, struct epoll_event *events, int maxevents, int timeout) epoll_wait (int epfd, struct epoll_event *events, int maxevents, int timeout)
{ {