Date: Wed, 4 Feb 2015 18:56:22 +0000 (UTC) From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r278217 - user/dchagin/lemul/sys/compat/linux Message-ID: <201502041856.t14IuMUI095476@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dchagin Date: Wed Feb 4 18:56:22 2015 New Revision: 278217 URL: https://svnweb.freebsd.org/changeset/base/278217 Log: Add EPOLLERR flag handling to epoll. Tested by: abi at abinet dot ru Modified: user/dchagin/lemul/sys/compat/linux/linux_event.c user/dchagin/lemul/sys/compat/linux/linux_event.h Modified: user/dchagin/lemul/sys/compat/linux/linux_event.c ============================================================================== --- user/dchagin/lemul/sys/compat/linux/linux_event.c Wed Feb 4 18:35:49 2015 (r278216) +++ user/dchagin/lemul/sys/compat/linux/linux_event.c Wed Feb 4 18:56:22 2015 (r278217) @@ -255,6 +255,8 @@ epoll_to_kevent(struct thread *td, struc *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) { @@ -296,8 +298,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: Modified: user/dchagin/lemul/sys/compat/linux/linux_event.h ============================================================================== --- user/dchagin/lemul/sys/compat/linux/linux_event.h Wed Feb 4 18:35:49 2015 (r278216) +++ user/dchagin/lemul/sys/compat/linux/linux_event.h Wed Feb 4 18:56:22 2015 (r278217) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502041856.t14IuMUI095476>