X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fposix%2FSignals.c;h=e723b8ff0a469d199148bdc9b743dca6c53ae16a;hb=05fd4e9ddd2fb1d76dc9b8733353105eeea3a3d4;hp=c016b9bf75136fae28e6047bf05b72554dbf955e;hpb=7ed3f7556f46b957f7efb97ed7ebdc92db2f8ab7;p=ghc-hetmet.git diff --git a/rts/posix/Signals.c b/rts/posix/Signals.c index c016b9b..e723b8f 100644 --- a/rts/posix/Signals.c +++ b/rts/posix/Signals.c @@ -6,18 +6,15 @@ * * ---------------------------------------------------------------------------*/ -/* This is non-Posix-compliant. - #include "PosixSource.h" -*/ +#include "PosixSource.h" #include "Rts.h" -#include "SchedAPI.h" + #include "Schedule.h" #include "RtsSignals.h" -#include "posix/Signals.h" +#include "Signals.h" #include "RtsUtils.h" -#include "RtsFlags.h" #include "Prelude.h" -#include "ThrIOManager.h" +#include "Stable.h" #ifdef alpha_HOST_ARCH # if defined(linux_HOST_OS) @@ -39,6 +36,10 @@ # include #endif +#ifdef HAVE_EVENTFD_H +# include +#endif + #include #include @@ -85,50 +86,76 @@ more_handlers(int sig) } // Here's the pipe into which we will send our signals -static int io_manager_pipe = -1; +static int io_manager_wakeup_fd = -1; +static int io_manager_control_fd = -1; #define IO_MANAGER_WAKEUP 0xff #define IO_MANAGER_DIE 0xfe +#define IO_MANAGER_SYNC 0xfd void -setIOManagerPipe (int fd) +setIOManagerWakeupFd (int fd) { // only called when THREADED_RTS, but unconditionally - // compiled here because GHC.Conc depends on it. - io_manager_pipe = fd; + // compiled here because System.Event.Control depends on it. + io_manager_wakeup_fd = fd; +} + +void +setIOManagerControlFd (int fd) +{ + // only called when THREADED_RTS, but unconditionally + // compiled here because System.Event.Control depends on it. + io_manager_control_fd = fd; } -#if defined(THREADED_RTS) void ioManagerWakeup (void) { + int r; // Wake up the IO Manager thread by sending a byte down its pipe - if (io_manager_pipe >= 0) { + if (io_manager_wakeup_fd >= 0) { +#if defined(HAVE_EVENTFD) + StgWord64 n = (StgWord64)IO_MANAGER_WAKEUP; + r = write(io_manager_wakeup_fd, (char *) &n, 8); +#else StgWord8 byte = (StgWord8)IO_MANAGER_WAKEUP; - write(io_manager_pipe, &byte, 1); + r = write(io_manager_wakeup_fd, &byte, 1); +#endif + if (r == -1) { sysErrorBelch("ioManagerWakeup: write"); } } } +#if defined(THREADED_RTS) void ioManagerDie (void) { + int r; // Ask the IO Manager thread to exit - if (io_manager_pipe >= 0) { + if (io_manager_control_fd >= 0) { StgWord8 byte = (StgWord8)IO_MANAGER_DIE; - write(io_manager_pipe, &byte, 1); - close(io_manager_pipe); - io_manager_pipe = -1; + r = write(io_manager_control_fd, &byte, 1); + if (r == -1) { sysErrorBelch("ioManagerDie: write"); } + io_manager_control_fd = -1; + io_manager_wakeup_fd = -1; } } +Capability * +ioManagerStartCap (Capability *cap) +{ + return rts_evalIO( + cap,&base_GHCziConcziIO_ensureIOManagerIsRunning_closure,NULL); +} + void ioManagerStart (void) { // Make sure the IO manager thread is running Capability *cap; - if (io_manager_pipe < 0) { + if (io_manager_control_fd < 0 || io_manager_wakeup_fd < 0) { cap = rts_lock(); - cap = rts_evalIO(cap,&base_GHCziConc_ensureIOManagerIsRunning_closure,NULL); + cap = ioManagerStartCap(cap); rts_unlock(cap); } } @@ -155,18 +182,23 @@ generic_handler(int sig USED_IF_THREADS, siginfo_t *info, void *p STG_UNUSED) { - sigset_t signals; - #if defined(THREADED_RTS) - if (io_manager_pipe != -1) + if (io_manager_control_fd != -1) { StgWord8 buf[sizeof(siginfo_t) + 1]; int r; buf[0] = sig; - memcpy(buf+1, info, sizeof(siginfo_t)); - r = write(io_manager_pipe, buf, sizeof(siginfo_t)+1); + + if (info == NULL) { + // info may be NULL on Solaris (see #3790) + memset(buf+1, 0, sizeof(siginfo_t)); + } else { + memcpy(buf+1, info, sizeof(siginfo_t)); + } + + r = write(io_manager_control_fd, buf, sizeof(siginfo_t)+1); if (r == -1 && errno == EAGAIN) { errorBelch("lost signal due to full pipe: %d\n", sig); @@ -216,14 +248,9 @@ generic_handler(int sig USED_IF_THREADS, stg_exit(EXIT_FAILURE); } - MainCapability.context_switch = 1; + contextSwitchCapability(&MainCapability); #endif /* THREADED_RTS */ - - // re-establish the signal handler, and carry on - sigemptyset(&signals); - sigaddset(&signals, sig); - sigprocmask(SIG_UNBLOCK, &signals, NULL); } /* ----------------------------------------------------------------------------- @@ -238,7 +265,7 @@ initUserSignals(void) { sigemptyset(&userSignals); #ifndef THREADED_RTS - getStablePtr((StgPtr)&base_GHCziConc_runHandlers_closure); + getStablePtr((StgPtr)&base_GHCziConcziSignal_runHandlers_closure); // needed to keep runHandler alive #endif } @@ -392,7 +419,7 @@ startSignalHandlers(Capability *cap) RtsFlags.GcFlags.initialStkSize, rts_apply(cap, rts_apply(cap, - &base_GHCziConc_runHandlers_closure, + &base_GHCziConcziSignal_runHandlers_closure, rts_mkPtr(cap, info)), rts_mkInt(cap, info->si_signo)))); } @@ -444,6 +471,15 @@ shutdown_handler(int sig STG_UNUSED) } /* ----------------------------------------------------------------------------- + * An empty signal handler, currently used for SIGPIPE + * -------------------------------------------------------------------------- */ +static void +empty_handler (int sig STG_UNUSED) +{ + // nothing +} + +/* ----------------------------------------------------------------------------- * Install default signal handlers. * * The RTS installs a default signal handler for catching @@ -499,7 +535,9 @@ initDefaultHandlers(void) #endif // ignore SIGPIPE; see #1619 - action.sa_handler = SIG_IGN; + // actually, we use an empty signal handler rather than SIG_IGN, + // so that SIGPIPE gets reset to its default behaviour on exec. + action.sa_handler = empty_handler; sigemptyset(&action.sa_mask); action.sa_flags = 0; if (sigaction(SIGPIPE, &action, &oact) != 0) {