From: simonmar Date: Wed, 24 Jan 2001 15:38:14 +0000 (+0000) Subject: [project @ 2001-01-24 15:37:34 by simonmar] X-Git-Tag: Approximately_9120_patches~2837 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=b56810ffa729643734b620f17d1bc627ea18f4dd;p=ghc-hetmet.git [project @ 2001-01-24 15:37:34 by simonmar] rename sig_install to stg_sig_install --- diff --git a/ghc/includes/PrimOps.h b/ghc/includes/PrimOps.h index ff19662..cb1aa8c 100644 --- a/ghc/includes/PrimOps.h +++ b/ghc/includes/PrimOps.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: PrimOps.h,v 1.72 2001/01/15 09:55:41 sewardj Exp $ + * $Id: PrimOps.h,v 1.73 2001/01/24 15:37:34 simonmar Exp $ * * (c) The GHC Team, 1998-2000 * @@ -950,9 +950,9 @@ EXTFUN_RTS(mkApUpd0zh_fast); #define STG_SIG_ERR (-3) #define STG_SIG_HAN (-4) -extern StgInt sig_install (StgInt, StgInt, StgStablePtr, sigset_t *); -#define stg_sig_default(sig,mask) sig_install(sig,STG_SIG_DFL,0,(sigset_t *)mask) -#define stg_sig_ignore(sig,mask) sig_install(sig,STG_SIG_IGN,0,(sigset_t *)mask) -#define stg_sig_catch(sig,ptr,mask) sig_install(sig,STG_SIG_HAN,ptr,(sigset_t *)mask) +extern StgInt stg_sig_install (StgInt, StgInt, StgStablePtr, sigset_t *); +#define stg_sig_default(sig,mask) stg_sig_install(sig,STG_SIG_DFL,0,(sigset_t *)mask) +#define stg_sig_ignore(sig,mask) stg_sig_install(sig,STG_SIG_IGN,0,(sigset_t *)mask) +#define stg_sig_catch(sig,ptr,mask) stg_sig_install(sig,STG_SIG_HAN,ptr,(sigset_t *)mask) #endif /* PRIMOPS_H */ diff --git a/ghc/rts/Signals.c b/ghc/rts/Signals.c index 3312b15..037e427 100644 --- a/ghc/rts/Signals.c +++ b/ghc/rts/Signals.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------------- - * $Id: Signals.c,v 1.18 2000/08/25 13:12:07 simonmar Exp $ + * $Id: Signals.c,v 1.19 2001/01/24 15:38:14 simonmar Exp $ * * (c) The GHC Team, 1998-1999 * @@ -146,7 +146,7 @@ unblockUserSignals(void) -------------------------------------------------------------------------- */ StgInt -sig_install(StgInt sig, StgInt spi, StgStablePtr handler, sigset_t *mask) +stg_sig_install(StgInt sig, StgInt spi, StgStablePtr handler, sigset_t *mask) { sigset_t signals; struct sigaction action; @@ -182,7 +182,7 @@ sig_install(StgInt sig, StgInt spi, StgStablePtr handler, sigset_t *mask) break; default: - barf("sig_install: bad spi"); + barf("stg_sig_install: bad spi"); } if (mask != 0) @@ -230,7 +230,7 @@ start_signal_handlers(void) #else /* PAR */ StgInt -sig_install(StgInt sig, StgInt spi, StgStablePtr handler, sigset_t *mask) +stg_sig_install(StgInt sig, StgInt spi, StgStablePtr handler, sigset_t *mask) { /* don't fflush(stdout); WORKAROUND bug in Linux glibc */ barf("no signal handling support in a parallel implementation");