d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add EPOLLERR flag handling to epoll.

Browse Source 
Tested by:	abi at abinet dot ru
This commit is contained in:
Dmitry Chagin 2015-05-24 17:42:45 +00:00
parent e2ff4b9864
commit 76672e1113
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/compat/linux/linux_event.c
View File

@ -258,6 +258,8 @@ epoll_to_kevent(struct thread *td, struct file *epfp,
*kev_flags |= EV_ONESHOT; *kev_flags |= EV_ONESHOT;
if ((levents & LINUX_EPOLLET) != 0) if ((levents & LINUX_EPOLLET) != 0)
*kev_flags |= EV_CLEAR; *kev_flags |= EV_CLEAR;
if ((levents & LINUX_EPOLLERR) != 0)
*kev_flags |= EV_ERROR;
/* flags related to what event is registered */ /* flags related to what event is registered */
if ((levents & LINUX_EPOLL_EVRD) != 0) { if ((levents & LINUX_EPOLL_EVRD) != 0) {
@ -299,8 +301,10 @@ static void
kevent_to_epoll(struct kevent *kevent, struct epoll_event *l_event) 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; return;
}
switch (kevent->filter) { switch (kevent->filter) {
case EVFILT_READ: case EVFILT_READ:

2
sys/compat/linux/linux_event.h
View File

@ -46,7 +46,7 @@
#define LINUX_EPOLLET 1u<<31 #define LINUX_EPOLLET 1u<<31
#define LINUX_EPOLL_EVRD (LINUX_EPOLLIN|LINUX_EPOLLRDNORM \ #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_EVWR (LINUX_EPOLLOUT|LINUX_EPOLLWRNORM)
#define LINUX_EPOLL_EVSUP (LINUX_EPOLLET|LINUX_EPOLLONESHOT \ #define LINUX_EPOLL_EVSUP (LINUX_EPOLLET|LINUX_EPOLLONESHOT \
|LINUX_EPOLL_EVRD|LINUX_EPOLL_EVWR) |LINUX_EPOLL_EVRD|LINUX_EPOLL_EVWR)