diff options
author | Josh Gao <jmgao@google.com> | 2017-08-10 12:30:25 -0700 |
---|---|---|
committer | Josh Gao <jmgao@google.com> | 2017-08-10 12:30:47 -0700 |
commit | 83a0c9c65a60a92d3ea5542596b3ba56db492c37 (patch) | |
tree | 64bb0c050c4db9ad9d721e05e3e199bfd02e60b0 /signal.c | |
parent | af241a5c8c2cde0fab7d7d563276c1095b00e3b4 (diff) | |
download | libevent-83a0c9c65a60a92d3ea5542596b3ba56db492c37.tar.gz |
Revert "Upgrade to 2.1.8-stable (2017-01-22)." and "Probably Mac build fix?"android-o-iot-preview-5o-iot-preview-5
This reverts commits 2a572d125a91a4aafd3ad8ce87259fc640fa0763 and
af241a5c8c2cde0fab7d7d563276c1095b00e3b4, which break tombstoned.
Bug: http://b/64543673
Test: manual + treehugger
Diffstat (limited to 'signal.c')
-rw-r--r-- | signal.c | 108 |
1 files changed, 37 insertions, 71 deletions
@@ -27,31 +27,30 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "event2/event-config.h" -#include "evconfig-private.h" -#ifdef _WIN32 +#ifdef WIN32 #define WIN32_LEAN_AND_MEAN #include <winsock2.h> #include <windows.h> #undef WIN32_LEAN_AND_MEAN #endif #include <sys/types.h> -#ifdef EVENT__HAVE_SYS_TIME_H +#ifdef _EVENT_HAVE_SYS_TIME_H #include <sys/time.h> #endif #include <sys/queue.h> -#ifdef EVENT__HAVE_SYS_SOCKET_H +#ifdef _EVENT_HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif #include <signal.h> #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifdef EVENT__HAVE_UNISTD_H +#ifdef _EVENT_HAVE_UNISTD_H #include <unistd.h> #endif #include <errno.h> -#ifdef EVENT__HAVE_FCNTL_H +#ifdef _EVENT_HAVE_FCNTL_H #include <fcntl.h> #endif @@ -82,7 +81,7 @@ on Linux do a reasonable thing using signalfd. */ -#ifndef _WIN32 +#ifndef WIN32 /* Windows wants us to call our signal handlers as __cdecl. Nobody else * expects you to do anything crazy like this. */ #define __cdecl @@ -101,7 +100,7 @@ static const struct eventop evsigops = { 0, 0, 0 }; -#ifndef EVENT__DISABLE_THREAD_SUPPORT +#ifndef _EVENT_DISABLE_THREAD_SUPPORT /* Lock for evsig_base and evsig_base_n_signals_added fields. */ static void *evsig_base_lock = NULL; #endif @@ -117,12 +116,12 @@ static void __cdecl evsig_handler(int sig); #define EVSIGBASE_UNLOCK() EVLOCK_UNLOCK(evsig_base_lock, 0) void -evsig_set_base_(struct event_base *base) +evsig_set_base(struct event_base *base) { EVSIGBASE_LOCK(); evsig_base = base; evsig_base_n_signals_added = base->sig.ev_n_signals_added; - evsig_base_fd = base->sig.ev_signal_pair[1]; + evsig_base_fd = base->sig.ev_signal_pair[0]; EVSIGBASE_UNLOCK(); } @@ -141,11 +140,7 @@ evsig_cb(evutil_socket_t fd, short what, void *arg) memset(&ncaught, 0, sizeof(ncaught)); while (1) { -#ifdef _WIN32 n = recv(fd, signals, sizeof(signals), 0); -#else - n = read(fd, signals, sizeof(signals)); -#endif if (n == -1) { int err = evutil_socket_geterror(fd); if (! EVUTIL_ERR_RW_RETRIABLE(err)) @@ -165,21 +160,22 @@ evsig_cb(evutil_socket_t fd, short what, void *arg) EVBASE_ACQUIRE_LOCK(base, th_base_lock); for (i = 0; i < NSIG; ++i) { if (ncaught[i]) - evmap_signal_active_(base, i, ncaught[i]); + evmap_signal_active(base, i, ncaught[i]); } EVBASE_RELEASE_LOCK(base, th_base_lock); } int -evsig_init_(struct event_base *base) +evsig_init(struct event_base *base) { /* * Our signal handler is going to write to one end of the socket * pair to wake up our event loop. The event loop then scans for * signals that got delivered. */ - if (evutil_make_internal_pipe_(base->sig.ev_signal_pair) == -1) { -#ifdef _WIN32 + if (evutil_socketpair( + AF_UNIX, SOCK_STREAM, 0, base->sig.ev_signal_pair) == -1) { +#ifdef WIN32 /* Make this nonfatal on win32, where sometimes people have localhost firewalled. */ event_sock_warn(-1, "%s: socketpair", __func__); @@ -189,13 +185,15 @@ evsig_init_(struct event_base *base) return -1; } - if (base->sig.sh_old) { - mm_free(base->sig.sh_old); - } + evutil_make_socket_closeonexec(base->sig.ev_signal_pair[0]); + evutil_make_socket_closeonexec(base->sig.ev_signal_pair[1]); base->sig.sh_old = NULL; base->sig.sh_old_max = 0; - event_assign(&base->sig.ev_signal, base, 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_assign(&base->sig.ev_signal, base, base->sig.ev_signal_pair[1], EV_READ | EV_PERSIST, evsig_cb, base); base->sig.ev_signal.ev_flags |= EVLIST_INTERNAL; @@ -209,10 +207,10 @@ evsig_init_(struct event_base *base) /* Helper: set the signal handler for evsignal to handler in base, so that * we can restore the original handler when we clear the current one. */ int -evsig_set_handler_(struct event_base *base, +_evsig_set_handler(struct event_base *base, int evsignal, void (__cdecl *handler)(int)) { -#ifdef EVENT__HAVE_SIGACTION +#ifdef _EVENT_HAVE_SIGACTION struct sigaction sa; #else ev_sighandler_t sh; @@ -249,7 +247,7 @@ evsig_set_handler_(struct event_base *base, } /* save previous handler and setup new handler */ -#ifdef EVENT__HAVE_SIGACTION +#ifdef _EVENT_HAVE_SIGACTION memset(&sa, 0, sizeof(sa)); sa.sa_handler = handler; sa.sa_flags |= SA_RESTART; @@ -295,17 +293,17 @@ evsig_add(struct event_base *base, evutil_socket_t evsignal, short old, short ev } evsig_base = base; evsig_base_n_signals_added = ++sig->ev_n_signals_added; - evsig_base_fd = base->sig.ev_signal_pair[1]; + evsig_base_fd = base->sig.ev_signal_pair[0]; EVSIGBASE_UNLOCK(); event_debug(("%s: %d: changing signal handler", __func__, (int)evsignal)); - if (evsig_set_handler_(base, (int)evsignal, evsig_handler) == -1) { + if (_evsig_set_handler(base, (int)evsignal, evsig_handler) == -1) { goto err; } if (!sig->ev_signal_added) { - if (event_add_nolock_(&sig->ev_signal, NULL, 0)) + if (event_add(&sig->ev_signal, NULL)) goto err; sig->ev_signal_added = 1; } @@ -321,26 +319,20 @@ err: } int -evsig_restore_handler_(struct event_base *base, int evsignal) +_evsig_restore_handler(struct event_base *base, int evsignal) { int ret = 0; struct evsig_info *sig = &base->sig; -#ifdef EVENT__HAVE_SIGACTION +#ifdef _EVENT_HAVE_SIGACTION struct sigaction *sh; #else ev_sighandler_t *sh; #endif - if (evsignal >= sig->sh_old_max) { - /* Can't actually restore. */ - /* XXXX.*/ - return 0; - } - /* restore previous handler */ sh = sig->sh_old[evsignal]; sig->sh_old[evsignal] = NULL; -#ifdef EVENT__HAVE_SIGACTION +#ifdef _EVENT_HAVE_SIGACTION if (sigaction(evsignal, sh, NULL) == -1) { event_warn("sigaction"); ret = -1; @@ -370,14 +362,14 @@ evsig_del(struct event_base *base, evutil_socket_t evsignal, short old, short ev --base->sig.ev_n_signals_added; EVSIGBASE_UNLOCK(); - return (evsig_restore_handler_(base, (int)evsignal)); + return (_evsig_restore_handler(base, (int)evsignal)); } static void __cdecl evsig_handler(int sig) { int save_errno = errno; -#ifdef _WIN32 +#ifdef WIN32 int socket_errno = EVUTIL_SOCKET_ERROR(); #endif ev_uint8_t msg; @@ -389,41 +381,34 @@ evsig_handler(int sig) return; } -#ifndef EVENT__HAVE_SIGACTION +#ifndef _EVENT_HAVE_SIGACTION signal(sig, evsig_handler); #endif /* Wake up our notification mechanism */ msg = sig; -#ifdef _WIN32 send(evsig_base_fd, (char*)&msg, 1, 0); -#else - { - int r = write(evsig_base_fd, (char*)&msg, 1); - (void)r; /* Suppress 'unused return value' and 'unused var' */ - } -#endif errno = save_errno; -#ifdef _WIN32 +#ifdef WIN32 EVUTIL_SET_SOCKET_ERROR(socket_errno); #endif } void -evsig_dealloc_(struct event_base *base) +evsig_dealloc(struct event_base *base) { int i = 0; if (base->sig.ev_signal_added) { event_del(&base->sig.ev_signal); base->sig.ev_signal_added = 0; } - /* debug event is created in evsig_init_/event_assign even when + /* debug event is created in evsig_init/event_assign even when * ev_signal_added == 0, so unassign is required */ event_debug_unassign(&base->sig.ev_signal); for (i = 0; i < NSIG; ++i) { if (i < base->sig.sh_old_max && base->sig.sh_old[i] != NULL) - evsig_restore_handler_(base, i); + _evsig_restore_handler(base, i); } EVSIGBASE_LOCK(); if (base == evsig_base) { @@ -450,30 +435,11 @@ evsig_dealloc_(struct event_base *base) } } -static void -evsig_free_globals_locks(void) -{ -#ifndef EVENT__DISABLE_THREAD_SUPPORT - if (evsig_base_lock != NULL) { - EVTHREAD_FREE_LOCK(evsig_base_lock, 0); - evsig_base_lock = NULL; - } -#endif - return; -} - -void -evsig_free_globals_(void) -{ - evsig_free_globals_locks(); -} - -#ifndef EVENT__DISABLE_THREAD_SUPPORT +#ifndef _EVENT_DISABLE_THREAD_SUPPORT int evsig_global_setup_locks_(const int enable_locks) { EVTHREAD_SETUP_GLOBAL_LOCK(evsig_base_lock, 0); return 0; } - #endif |