tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use <linux/eventpoll.h> to implement <sys/epoll.h>."

Browse source
This commit is contained in:
Elliott Hughes 2017-02-24 16:55:25 +00:00 committed by Gerrit Code Review
commit 77463d81e6
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libc/include/sys/epoll.h
View file

@ -31,11 +31,17 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> /* For O_CLOEXEC. */
#include <signal.h> /* For sigset_t. */ #include <signal.h> /* For sigset_t. */
#include <linux/eventpoll.h>
/* TODO: https://lkml.org/lkml/2017/2/23/416 has a better fix. */
#undef EPOLLWAKEUP
#undef EPOLLONESHOT
#undef EPOLLET
__BEGIN_DECLS __BEGIN_DECLS
/* TODO: remove once https://lkml.org/lkml/2017/2/23/417 is upstream. */
#define EPOLLIN 0x00000001 #define EPOLLIN 0x00000001
#define EPOLLPRI 0x00000002 #define EPOLLPRI 0x00000002
#define EPOLLOUT 0x00000004 #define EPOLLOUT 0x00000004
@ -51,12 +57,6 @@ __BEGIN_DECLS
#define EPOLLONESHOT 0x40000000 #define EPOLLONESHOT 0x40000000
#define EPOLLET 0x80000000 #define EPOLLET 0x80000000
#define EPOLL_CTL_ADD 1
#define EPOLL_CTL_DEL 2
#define EPOLL_CTL_MOD 3
#define EPOLL_CLOEXEC O_CLOEXEC
typedef union epoll_data { typedef union epoll_data {
void* ptr; void* ptr;
int fd; int fd;

2
libc/kernel/tools/defaults.py
View file

@ -75,6 +75,8 @@ kernel_token_replacements = {
"SIGRTMAX": "__SIGRTMAX", "SIGRTMAX": "__SIGRTMAX",
# We want to support both BSD and Linux member names in struct udphdr. # We want to support both BSD and Linux member names in struct udphdr.
"udphdr": "__kernel_udphdr", "udphdr": "__kernel_udphdr",
# The kernel's struct epoll_event just has __u64 for the data.
"epoll_event": "__kernel_uapi_epoll_event",
} }
# this is the set of known static inline functions that we want to keep # this is the set of known static inline functions that we want to keep

2
libc/kernel/uapi/linux/eventpoll.h
View file

@ -37,7 +37,7 @@
#define EPOLL_PACKED #define EPOLL_PACKED
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
#endif #endif
struct epoll_event { struct __kernel_uapi_epoll_event {
__u32 events; __u32 events;
__u64 data; __u64 data;
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */