cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-08 11:53:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix EV_CLOSED detection/reporting (epoll only)

Browse Source 
- EV_CLOSED is EPOLLRDHUP in epoll
- EPOLLRDHUP reported w/o EPOLLHUP if the socket closed with shutdown(SHUT_WR)
- EPOLLRDHUP reported w/  EPOLLHUP if the socket closed with close()
  so in this case epoll backend will detect this event as error
  (EV_READ|EV_WRITE), since the epoll_ctl() will return EPOLLRDHUP with
  EPOLLHUP set, but this is not correct, let's fix this.

Fixes: #984
(cherry picked from commit 972b456bf60e9a2f550ec45a14921c06e252c793)
This commit is contained in:
Azat Khuzhin 2020-05-05 00:21:18 +03:00
parent db2efdf55e
commit 1df324d4c4
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epoll.c
View File

@ -486,7 +486,9 @@ epoll_dispatch(struct event_base *base, struct timeval *tv)
continue; continue;
#endif #endif
if (what & (EPOLLHUP|EPOLLERR)) { if (what & EPOLLERR) {
ev = EV_READ | EV_WRITE;
} else if ((what & EPOLLHUP) && !(what & EPOLLRDHUP)) {
ev = EV_READ | EV_WRITE; ev = EV_READ | EV_WRITE;
} else { } else {
if (what & EPOLLIN) if (what & EPOLLIN)

5
test/regress.c
View File

@ -512,13 +512,8 @@ test_simpleclose(void *ptr)
tt_assert(!event_base_loopexit(base, &tv)); tt_assert(!event_base_loopexit(base, &tv));
} }
/* via close() */
if (pair[1] == -1) {
tt_int_op(event_base_loop(base, EVLOOP_NONBLOCK), ==, 0);
} else {
tt_int_op(event_base_loop(base, EVLOOP_NONBLOCK), ==, !persist); tt_int_op(event_base_loop(base, EVLOOP_NONBLOCK), ==, !persist);
tt_int_op(got_event, ==, (events & ~EV_PERSIST)); tt_int_op(got_event, ==, (events & ~EV_PERSIST));
}
end: end:
if (ev) if (ev)