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

Fix a locking bug in event_base_loop()

Browse Source 
We previously were releasing the lock when we exited the main loop
in some ways, but not in others.
This commit is contained in:
Nick Mathewson 2009-11-27 16:00:59 -05:00
parent d84d8385cd
commit da1718b289
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
event.c
View File

@ -1097,7 +1097,7 @@ event_base_loop(struct event_base *base, int flags)
const struct eventop *evsel = base->evsel; const struct eventop *evsel = base->evsel;
struct timeval tv; struct timeval tv;
struct timeval *tv_p; struct timeval *tv_p;
int res, done; int res, done, retval = 0;
/* Grab the lock. We will release it inside evsel.dispatch, and again /* Grab the lock. We will release it inside evsel.dispatch, and again
* as we invoke user callbacks. */ * as we invoke user callbacks. */
@ -1141,7 +1141,8 @@ event_base_loop(struct event_base *base, int flags)
/* If we have no events, we just exit */ /* If we have no events, we just exit */
if (!event_haveevents(base) && !N_ACTIVE_CALLBACKS(base)) { if (!event_haveevents(base) && !N_ACTIVE_CALLBACKS(base)) {
event_debug(("%s: no events registered.", __func__)); event_debug(("%s: no events registered.", __func__));
return (1); retval = 1;
goto done;
} }
/* update last old time */ /* update last old time */
@ -1151,8 +1152,12 @@ event_base_loop(struct event_base *base, int flags)
res = evsel->dispatch(base, tv_p); res = evsel->dispatch(base, tv_p);
if (res == -1) if (res == -1) {
return (-1); event_debug(("%s: dispatch returned unsuccessfully.",
__func__));
retval = -1;
goto done;
}
update_time_cache(base); update_time_cache(base);
@ -1165,13 +1170,14 @@ event_base_loop(struct event_base *base, int flags)
} else if (flags & EVLOOP_NONBLOCK) } else if (flags & EVLOOP_NONBLOCK)
done = 1; done = 1;
} }
event_debug(("%s: asked to terminate loop.", __func__));
done:
clear_time_cache(base); clear_time_cache(base);
EVBASE_RELEASE_LOCK(base, th_base_lock); EVBASE_RELEASE_LOCK(base, th_base_lock);
event_debug(("%s: asked to terminate loop.", __func__)); return (retval);
return (0);
} }
/* Sets up an event for processing once */ /* Sets up an event for processing once */