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

revert r505; it introduced errors in epoll

Browse Source 
svn:r508
This commit is contained in:
Niels Provos 2007-11-11 03:05:03 +00:00
parent 97917e68e7
commit bbed0954b1
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -35,7 +35,7 @@ Changes in current version:
o added two additional libraries: libevent_core and libevent_extra in addition to the regular libevent. libevent_core contains only the event core whereas libevent_extra contains dns, http and rpc support
o Begin using libtool's library versioning support correctly. If we don't mess up, this will more or less guarantee binaries linked against old versions of libevent continue working when we make changes to libevent that do not break backward compatibility.
o Fix evhttp.h compilation when TAILQ_ENTRY is not defined.
o Clean up code in epoll_dispatch() to reduce branch count and generally run better. Patch from Christopher Layne.
o Small code cleanups in epoll_dispatch().
o Increase the maximum number of addresses read from a packet in evdns to 32.
o Remove support for the rtsig method: it hasn't compiled for a while, and nobody seems to miss it very much. Let us know if there's a good reason to put it back in.
o Rename the "class" field in evdns_server_request to dns_question_class, so that it won't break compilation under C++. Use a macro so that old code won't break. Mark the macro as deprecated.

37
epoll.c
View File

@ -209,23 +209,36 @@ epoll_dispatch(struct event_base *base, void *arg, struct timeval *tv)
for (i = 0; i < res; i++) {
int what = events[i].events;
struct event *evread, *evwrite;
struct event *evread = NULL, *evwrite = NULL;
evep = (struct evepoll *)events[i].data.ptr;
evread = evep->evread;
evwrite = evep->evwrite;
if (evread && what & (EPOLLIN|EPOLLHUP|EPOLLERR)) {
if (~evread->ev_events & EV_PERSIST)
event_del(evread);
if (what & (EPOLLHUP|EPOLLERR)) {
evread = evep->evread;
evwrite = evep->evwrite;
} else {
if (what & EPOLLIN) {
evread = evep->evread;
}
if (what & EPOLLOUT) {
evwrite = evep->evwrite;
}
}
if (!(evread||evwrite))
continue;
if (evread != NULL && !(evread->ev_events & EV_PERSIST))
event_del(evread);
if (evwrite != NULL && evwrite != evread &&
!(evwrite->ev_events & EV_PERSIST))
event_del(evwrite);
if (evread != NULL)
event_active(evread, EV_READ, 1);
}
if (evwrite && what & (EPOLLOUT|EPOLLHUP|EPOLLERR)) {
if (~evwrite->ev_events & EV_PERSIST
&& evwrite != evread)
event_del(evwrite);
if (evwrite != NULL)
event_active(evwrite, EV_WRITE, 1);
}
}
return (0);