From ada616dcd84d18ee90ce7a33e180b9a6c41f0707 Mon Sep 17 00:00:00 2001 From: dchagin Date: Sat, 9 Jan 2016 18:23:34 +0000 Subject: [PATCH] MFC r284626: Add EPOLLRDHUP support. git-svn-id: svn://svn.freebsd.org/base/stable/10@293606 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/compat/linux/linux_event.c | 4 ++++ sys/compat/linux/linux_event.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index 878037324..1fe34457e 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -257,6 +257,8 @@ epoll_to_kevent(struct thread *td, struct file *epfp, *kev_flags |= EV_CLEAR; if ((levents & LINUX_EPOLLERR) != 0) *kev_flags |= EV_ERROR; + if ((levents & LINUX_EPOLLRDHUP) != 0) + *kev_flags |= EV_EOF; /* flags related to what event is registered */ if ((levents & LINUX_EPOLL_EVRD) != 0) { @@ -306,6 +308,8 @@ kevent_to_epoll(struct kevent *kevent, struct epoll_event *l_event) switch (kevent->filter) { case EVFILT_READ: l_event->events = LINUX_EPOLLIN|LINUX_EPOLLRDNORM|LINUX_EPOLLPRI; + if ((kevent->flags & EV_EOF) != 0) + l_event->events |= LINUX_EPOLLRDHUP; break; case EVFILT_WRITE: l_event->events = LINUX_EPOLLOUT|LINUX_EPOLLWRNORM; diff --git a/sys/compat/linux/linux_event.h b/sys/compat/linux/linux_event.h index 0c030adcf..9b7d37b00 100644 --- a/sys/compat/linux/linux_event.h +++ b/sys/compat/linux/linux_event.h @@ -49,7 +49,7 @@ |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) + |LINUX_EPOLL_EVRD|LINUX_EPOLL_EVWR|LINUX_EPOLLRDHUP) #define LINUX_EPOLL_CTL_ADD 1 #define LINUX_EPOLL_CTL_DEL 2 -- 2.45.0