cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-12 05:48:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

r16584@catbus: nickm | 2007-11-10 00:00:59 -0500

Browse Source 
Patch from Christopher Lane: reduce branch count in epoll_dispatch.c and generally improve clarity.


svn:r505
This commit is contained in:
Nick Mathewson 2007-11-10 05:18:11 +00:00
parent cabcd62f38
commit 9f0f3d6da2
2 changed files with 13 additions and 26 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 Small code cleanups in epoll_dispatch().
o Clean up code in epoll_dispatch() to reduce branch count and generally run better. Patch from Christopher Layne.
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,36 +209,23 @@ 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 = NULL, *evwrite = NULL;
struct event *evread, *evwrite;
evep = (struct evepoll *)events[i].data.ptr;
evread = evep->evread;
evwrite = evep->evwrite;
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)
if (evread && what & (EPOLLIN|EPOLLHUP|EPOLLERR)) {
if (~evread->ev_events & EV_PERSIST)
event_del(evread);
event_active(evread, EV_READ, 1);
if (evwrite != NULL)
}
if (evwrite && what & (EPOLLOUT|EPOLLHUP|EPOLLERR)) {
if (~evwrite->ev_events & EV_PERSIST
&& evwrite != evread)
event_del(evwrite);
event_active(evwrite, EV_WRITE, 1);
}
}
return (0);