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

evport: don't scan more events in ed_pending than needed

Browse Source
This commit is contained in:
Nick Mathewson 2011-05-27 14:28:39 -04:00
parent 276ec0ef42
commit 849a5cffa8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
evport.c
View File

@ -102,6 +102,8 @@ struct fd_info {
struct evport_data { struct evport_data {
int ed_port; /* event port for system events */ int ed_port; /* event port for system events */
/* How many elements of ed_pending should we look at? */
int ed_npending;
/* fdi's that we need to reassoc */ /* fdi's that we need to reassoc */
int ed_pending[EVENTS_PER_GETN]; /* fd's with pending events */ int ed_pending[EVENTS_PER_GETN]; /* fd's with pending events */
}; };
@ -132,7 +134,7 @@ static void*
evport_init(struct event_base *base) evport_init(struct event_base *base)
{ {
struct evport_data *evpd; struct evport_data *evpd;
int i; // int i;
if (!(evpd = mm_calloc(1, sizeof(struct evport_data)))) if (!(evpd = mm_calloc(1, sizeof(struct evport_data))))
return (NULL); return (NULL);
@ -142,8 +144,7 @@ evport_init(struct event_base *base)
return (NULL); return (NULL);
} }
for (i = 0; i < EVENTS_PER_GETN; i++) evpd->ed_npending = 0;
evpd->ed_pending[i] = -1;
evsig_init(base); evsig_init(base);
@ -244,16 +245,18 @@ evport_dispatch(struct event_base *base, struct timeval *tv)
* last time which need reassociation. See comment at the end of the * last time which need reassociation. See comment at the end of the
* loop below. * loop below.
*/ */
for (i = 0; i < EVENTS_PER_GETN; ++i) { for (i = 0; i < epdp->ed_npending; ++i) {
struct fd_info *fdi = NULL; struct fd_info *fdi = NULL;
const int fd = epdp->ed_pending[i]; const int fd = epdp->ed_pending[i];
if (fd != -1) { if (fd != -1) {
/* We might have cleared out this event; we need
* to be sure that it's still set. */
fdi = evmap_io_get_fdinfo(&base->io, fd); fdi = evmap_io_get_fdinfo(&base->io, fd);
} }
if (fdi != NULL && FDI_HAS_EVENTS(fdi)) { if (fdi != NULL && FDI_HAS_EVENTS(fdi)) {
reassociate(epdp, fdi, fd); reassociate(epdp, fdi, fd);
epdp->ed_pending[i] = -1; // epdp->ed_pending[i] = -1;
fdi->pending_idx_plus_1 = 0; fdi->pending_idx_plus_1 = 0;
} }
} }
@ -312,6 +315,7 @@ evport_dispatch(struct event_base *base, struct timeval *tv)
evmap_io_active(base, fd, res); evmap_io_active(base, fd, res);
} /* end of all events gotten */ } /* end of all events gotten */
epdp->ed_npending = nevents;
check_evportop(epdp); check_evportop(epdp);