diff options
| author | dchagin <dchagin@FreeBSD.org> | 2015-05-24 17:42:45 +0000 |
|---|---|---|
| committer | dchagin <dchagin@FreeBSD.org> | 2015-05-24 17:42:45 +0000 |
| commit | 73fcf6f585554f1aeddfcb85080a459d68167fc8 (patch) | |
| tree | 82bea3303181edc91eb42ff941cd78f527d374aa | |
| parent | 65a010b8d9f879fa2f7d886a46dd6dfcb51b3c0b (diff) | |
| download | FreeBSD-src-73fcf6f585554f1aeddfcb85080a459d68167fc8.zip FreeBSD-src-73fcf6f585554f1aeddfcb85080a459d68167fc8.tar.gz | |
Add EPOLLERR flag handling to epoll.
Tested by: abi at abinet dot ru
| -rw-r--r-- | sys/compat/linux/linux_event.c | 6 | ||||
| -rw-r--r-- | sys/compat/linux/linux_event.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index fb3ce43..fad4354 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -258,6 +258,8 @@ epoll_to_kevent(struct thread *td, struct file *epfp, *kev_flags |= EV_ONESHOT; if ((levents & LINUX_EPOLLET) != 0) *kev_flags |= EV_CLEAR; + if ((levents & LINUX_EPOLLERR) != 0) + *kev_flags |= EV_ERROR; /* flags related to what event is registered */ if ((levents & LINUX_EPOLL_EVRD) != 0) { @@ -299,8 +301,10 @@ static void kevent_to_epoll(struct kevent *kevent, struct epoll_event *l_event) { - if ((kevent->flags & EV_ERROR) != 0) + if ((kevent->flags & EV_ERROR) != 0) { + l_event->events = LINUX_EPOLLERR; return; + } switch (kevent->filter) { case EVFILT_READ: diff --git a/sys/compat/linux/linux_event.h b/sys/compat/linux/linux_event.h index 37167ff..0c030ad 100644 --- a/sys/compat/linux/linux_event.h +++ b/sys/compat/linux/linux_event.h @@ -46,7 +46,7 @@ #define LINUX_EPOLLET 1u<<31 #define LINUX_EPOLL_EVRD (LINUX_EPOLLIN|LINUX_EPOLLRDNORM \ - |LINUX_EPOLLHUP|LINUX_EPOLLPRI) + |LINUX_EPOLLHUP|LINUX_EPOLLERR|LINUX_EPOLLPRI) #define LINUX_EPOLL_EVWR (LINUX_EPOLLOUT|LINUX_EPOLLWRNORM) #define LINUX_EPOLL_EVSUP (LINUX_EPOLLET|LINUX_EPOLLONESHOT \ |LINUX_EPOLL_EVRD|LINUX_EPOLL_EVWR) |
