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

from trunk: move EV_PERSIST handling out of the event backends

Browse Source 
svn:r592
This commit is contained in:
Niels Provos 2007-12-14 07:18:02 +00:00
parent d5153cef3d
commit b23f1dbe96
7 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -14,6 +14,7 @@ Changes in current version:
o Removed obsoleted recalc code
o pull setters/getters out of RPC structures into a base class to which we just need to store a pointer; this reduces the memory footprint of these structures.
o fix a bug with event_rpcgen for integers
o move EV_PERSIST handling out of the event backends
Changes in 1.4.0-beta:

6
epoll.c
View File

@ -228,12 +228,6 @@ epoll_dispatch(struct event_base *base, void *arg, struct timeval *tv)
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 != NULL)

9
event.c
View File

@ -336,9 +336,6 @@ event_process_active(struct event_base *base)
int i;
short ncalls;
if (!base->event_count_active)
return;
for (i = 0; i < base->nactivequeues; ++i) {
if (TAILQ_FIRST(base->activequeues[i]) != NULL) {
activeq = base->activequeues[i];
@ -349,7 +346,10 @@ event_process_active(struct event_base *base)
assert(activeq != NULL);
for (ev = TAILQ_FIRST(activeq); ev; ev = TAILQ_FIRST(activeq)) {
event_queue_remove(base, ev, EVLIST_ACTIVE);
if (ev->ev_events & EV_PERSIST)
event_queue_remove(base, ev, EVLIST_ACTIVE);
else
event_del(ev);
/* Allows deletes to work */
ncalls = ev->ev_ncalls;
@ -486,7 +486,6 @@ event_base_loop(struct event_base *base, int flags)
res = evsel->dispatch(base, evbase, tv_p);
if (res == -1)
return (-1);

11
evport.c
View File

@ -372,21 +372,16 @@ evport_dispatch(struct event_base *base, void *arg, struct timeval *tv)
fdi = &(epdp->ed_fds[fd]);
/*
* We now check for each of the possible events (READ or WRITE).
* If the event is not persistent, then we delete it. Then, we
* activate the event (which will cause its callback to be
* executed).
* We now check for each of the possible events (READ
* or WRITE). Then, we activate the event (which will
* cause its callback to be executed).
*/
if ((res & EV_READ) && ((ev = fdi->fdi_revt) != NULL)) {
if (!(ev->ev_events & EV_PERSIST))
event_del(ev);
event_active(ev, res, 1);
}
if ((res & EV_WRITE) && ((ev = fdi->fdi_wevt) != NULL)) {
if (!(ev->ev_events & EV_PERSIST))
event_del(ev);
event_active(ev, res, 1);
}
} /* end of all events gotten */

2
kqueue.c
View File

@ -270,7 +270,7 @@ kq_dispatch(struct event_base *base, void *arg, struct timeval *tv)
continue;
if (!(ev->ev_events & EV_PERSIST))
event_del(ev);
ev->ev_flags &= ~EVLIST_X_KQINKERNEL;
event_active(ev, which,
ev->ev_events & EV_SIGNAL ? events[i].data : 1);

4
poll.c
View File

@ -185,13 +185,9 @@ poll_dispatch(struct event_base *base, void *arg, struct timeval *tv)
continue;
if (r_ev && (res & r_ev->ev_events)) {
if (!(r_ev->ev_events & EV_PERSIST))
event_del(r_ev);
event_active(r_ev, res & r_ev->ev_events, 1);
}
if (w_ev && w_ev != r_ev && (res & w_ev->ev_events)) {
if (!(w_ev->ev_events & EV_PERSIST))
event_del(w_ev);
event_active(w_ev, res & w_ev->ev_events, 1);
}
}

4
select.c
View File

@ -178,13 +178,9 @@ select_dispatch(struct event_base *base, void *arg, struct timeval *tv)
res |= EV_WRITE;
}
if (r_ev && (res & r_ev->ev_events)) {
if (!(r_ev->ev_events & EV_PERSIST))
event_del(r_ev);
event_active(r_ev, res & r_ev->ev_events, 1);
}
if (w_ev && w_ev != r_ev && (res & w_ev->ev_events)) {
if (!(w_ev->ev_events & EV_PERSIST))
event_del(w_ev);
event_active(w_ev, res & w_ev->ev_events, 1);
}
}