mirror of
https://github.com/cuberite/libevent.git
synced 2025-09-09 12:28:19 -04:00
Merge branch '20_loopbreak_in_signal' into patches-2.0
This commit is contained in:
commit
296d29a12c
11
event.c
11
event.c
@ -1024,6 +1024,7 @@ static inline void
|
||||
event_signal_closure(struct event_base *base, struct event *ev)
|
||||
{
|
||||
short ncalls;
|
||||
int should_break;
|
||||
|
||||
/* Allows deletes to work */
|
||||
ncalls = ev->ev_ncalls;
|
||||
@ -1035,11 +1036,13 @@ event_signal_closure(struct event_base *base, struct event *ev)
|
||||
if (ncalls == 0)
|
||||
ev->ev_pncalls = NULL;
|
||||
(*ev->ev_callback)((int)ev->ev_fd, ev->ev_res, ev->ev_arg);
|
||||
#if 0
|
||||
/* XXXX we can't do this without a lock on the base. */
|
||||
if (base->event_break)
|
||||
|
||||
EVBASE_ACQUIRE_LOCK(base, th_base_lock);
|
||||
should_break = base->event_break;
|
||||
EVBASE_RELEASE_LOCK(base, th_base_lock);
|
||||
|
||||
if (should_break)
|
||||
return;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user