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

faster insertion of timeouts; ensure uniqueness in RB-tree compare function

Browse Source 
svn:r97
This commit is contained in:
Niels Provos 2004-03-27 17:42:49 +00:00
parent 246d8583c0
commit 85fbdbb243
1 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
event.c
View File

@ -115,7 +115,6 @@ int event_gotterm; /* Set to terminate loop */
void event_queue_insert(struct event *, int); void event_queue_insert(struct event *, int);
void event_queue_remove(struct event *, int); void event_queue_remove(struct event *, int);
int event_haveevents(void); int event_haveevents(void);
void timeout_insert(struct event *);
static void event_process_active(void); static void event_process_active(void);
@ -132,6 +131,10 @@ compare(struct event *a, struct event *b)
return (-1); return (-1);
else if (timercmp(&a->ev_timeout, &b->ev_timeout, >)) else if (timercmp(&a->ev_timeout, &b->ev_timeout, >))
return (1); return (1);
if (a < b)
return (-1);
if (a > b)
return (1);
return (0); return (0);
} }
@ -566,31 +569,6 @@ timeout_process(void)
} }
} }
void
timeout_insert(struct event *ev)
{
struct event *tmp;
tmp = RB_FIND(event_tree, &timetree, ev);
if (tmp != NULL) {
struct timeval tv;
struct timeval add = {0,1};
/* Find unique time */
tv = ev->ev_timeout;
do {
timeradd(&tv, &add, &tv);
tmp = RB_NEXT(event_tree, &timetree, tmp);
} while (tmp != NULL && timercmp(&tmp->ev_timeout, &tv, ==));
ev->ev_timeout = tv;
}
tmp = RB_INSERT(event_tree, &timetree, ev);
assert(tmp == NULL);
}
void void
event_queue_remove(struct event *ev, int queue) event_queue_remove(struct event *ev, int queue)
{ {
@ -632,9 +610,11 @@ event_queue_insert(struct event *ev, int queue)
case EVLIST_SIGNAL: case EVLIST_SIGNAL:
TAILQ_INSERT_TAIL(&signalqueue, ev, ev_signal_next); TAILQ_INSERT_TAIL(&signalqueue, ev, ev_signal_next);
break; break;
case EVLIST_TIMEOUT: case EVLIST_TIMEOUT: {
timeout_insert(ev); struct event *tmp = RB_INSERT(event_tree, &timetree, ev);
assert(tmp == NULL);
break; break;
}
case EVLIST_INSERTED: case EVLIST_INSERTED:
TAILQ_INSERT_TAIL(&eventqueue, ev, ev_next); TAILQ_INSERT_TAIL(&eventqueue, ev, ev_next);
break; break;