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

Avoid deadlock when activating signals.

Browse Source 
Fixes bug 3048812.

Based on patch by Nicholas Marriott.
This commit is contained in:
Nick Mathewson 2010-08-19 14:00:06 -04:00
parent 1c25b07ea7
commit e0e6958aa0
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
signal.c
View File

@ -67,6 +67,13 @@ struct event_base *evsignal_base = NULL;
static void evsignal_handler(int sig); static void evsignal_handler(int sig);
#ifdef WIN32
#define error_is_eagain(err) \
((err) == EAGAIN || (err) == WSAEWOULDBLOCK)
#else
#define error_is_eagain(err) ((err) == EAGAIN)
#endif
/* Callback for when the signal handler write a byte to our signaling socket */ /* Callback for when the signal handler write a byte to our signaling socket */
static void static void
evsignal_cb(int fd, short what, void *arg) evsignal_cb(int fd, short what, void *arg)
@ -79,8 +86,11 @@ evsignal_cb(int fd, short what, void *arg)
#endif #endif
n = recv(fd, signals, sizeof(signals), 0); n = recv(fd, signals, sizeof(signals), 0);
if (n == -1) if (n == -1) {
event_err(1, "%s: read", __func__); int err = EVUTIL_SOCKET_ERROR();
if (! error_is_eagain(err))
event_err(1, "%s: read", __func__);
}
} }
#ifdef HAVE_SETFD #ifdef HAVE_SETFD
@ -125,6 +135,7 @@ evsignal_init(struct event_base *base)
TAILQ_INIT(&base->sig.evsigevents[i]); TAILQ_INIT(&base->sig.evsigevents[i]);
evutil_make_socket_nonblocking(base->sig.ev_signal_pair[0]); evutil_make_socket_nonblocking(base->sig.ev_signal_pair[0]);
evutil_make_socket_nonblocking(base->sig.ev_signal_pair[1]);
event_set(&base->sig.ev_signal, base->sig.ev_signal_pair[1], event_set(&base->sig.ev_signal, base->sig.ev_signal_pair[1],
EV_READ | EV_PERSIST, evsignal_cb, &base->sig.ev_signal); EV_READ | EV_PERSIST, evsignal_cb, &base->sig.ev_signal);