X-Git-Url: https://gapil.gnulinux.it/gitweb/?p=gapil.git;a=blobdiff_plain;f=sources%2FSigHand.c;h=605493d1f2f6779c7200f589e125658c2f98cc64;hp=6112700af7a7525eba3c574aecd01d95dc7373ca;hb=c2e762abed93fe970c6c4d019a8bfe95fadb4efa;hpb=3e8003adb1396080659ef5d34896eb2f573be6cd diff --git a/sources/SigHand.c b/sources/SigHand.c index 6112700..605493d 100644 --- a/sources/SigHand.c +++ b/sources/SigHand.c @@ -22,14 +22,12 @@ * * Author: S. Piccardi Dec. 2002 * - * $Id: SigHand.c,v 1.7 2003/05/06 14:05:12 piccardi Exp $ - * *****************************************************************************/ -#include /* error simbol definitions */ -#include /* standard I/O functions */ -#include /* signal handling declarations */ -#include -#include +#include /* error definitions and routines */ +#include /* standard I/O library */ +#include /* signal constants, types and functions */ +#include /* primitive system data types */ +#include /* process termination constants and functions */ #include "Gapil.h" #include "macros.h" @@ -39,22 +37,22 @@ * Initialize a signal handler. * To enable the signal handling a process we need to tell it to * kernel; this is done writing all needed info to a sigaction structure - * named sigact, and then callind sigaction() system call passing the + * named sigact, and then calling sigaction() system call passing the * information stored in the sigact structure variable. * * Input: the signal to handle * the signal handler function - * Return: the previous sigaction structure + * Return: the previous signal handler */ -inline SigFunc * Signal(int signo, SigFunc *func) +inline SigHandler * Signal(int signo, SigHandler *func) { struct sigaction new_handl, old_handl; + new_handl.sa_flags=0; /* init to 0 all flags */ new_handl.sa_handler = func; /* set signal handler */ /* clear signal mask: no signal blocked during execution of func */ if (sigemptyset(&new_handl.sa_mask)!=0){ /* initialize signal set */ return SIG_ERR; } - new_handl.sa_flags=0; /* init to 0 all flags */ /* change action for signo signal */ if (sigaction(signo, &new_handl, &old_handl)){ return SIG_ERR; @@ -67,19 +65,19 @@ inline SigFunc * Signal(int signo, SigFunc *func) * Initialize a signal handler. * To enable the signal handling a process we need to tell it to * kernel; this is done writing all needed info to a sigaction structure - * named sigact, and then callind sigaction() system call passing the + * named sigact, and then calling sigaction() system call passing the * information stored in the sigact structure variable. * This version enable BSD semantics with SA_RESTART * * Input: the signal to handle * the signal handler function - * Return: the previous sigaction structure + * Return: the previous signal handler */ -inline SigFunc * SignalRestart(int signo, SigFunc *func) +inline SigHandler * SignalRestart(int signo, SigHandler *func) { struct sigaction new_handl, old_handl; - new_handl.sa_handler = func; /* set signal handler */ new_handl.sa_flags = SA_RESTART; /* restart system call */ + new_handl.sa_handler = func; /* set signal handler */ /* clear signal mask: no signal blocked during execution of func */ if (sigemptyset(&new_handl.sa_mask)!=0){ /* initialize signal set */ return SIG_ERR; @@ -91,13 +89,66 @@ inline SigFunc * SignalRestart(int signo, SigFunc *func) return (old_handl.sa_handler); } +/* + * Function Action + * Initialize a sa_sigaction signal handler. + * To enable the signal handling a process we need to tell it to + * kernel; this is done writing all needed info to a sigaction structure + * named sigact, and then calling sigaction() system call passing the + * information stored in the sigact structure variable. + * + * Input: the signal to handle + * the signal handler function (sa_sigaction type) + * Return: the previous signal handler + */ +inline SigAction * Action(int signo, SigAction *func) +{ + struct sigaction new_handl, old_handl; + new_handl.sa_flags=SA_SIGINFO; /* we use sa_sigaction handler */ + new_handl.sa_sigaction = func; /* set signal handler */ + /* clear signal mask: no signal blocked during execution of func */ + if (sigemptyset(&new_handl.sa_mask)!=0){ /* initialize signal set */ + return NULL; + } + /* change action for signo signal */ + if (sigaction(signo, &new_handl, &old_handl)){ + return NULL; + } + return (old_handl.sa_sigaction); +} +/* + * Function Action + * Initialize a sa_sigaction signal handler. + * To enable the signal handling a process we need to tell it to + * kernel; this is done writing all needed info to a sigaction structure + * named sigact, and then calling sigaction() system call passing the + * information stored in the sigact structure variable. + * + * Input: the signal to handle + * the signal handler function (sa_sigaction type) + * Return: the previous signal handler + */ +inline SigAction * ActionRestart(int signo, SigAction *func) +{ + struct sigaction new_handl, old_handl; + new_handl.sa_flags=SA_SIGINFO|SA_RESTART;/* flag setup */ + new_handl.sa_sigaction = func; /* set signal handler */ + /* clear signal mask: no signal blocked during execution of func */ + if (sigemptyset(&new_handl.sa_mask)!=0){ /* initialize signal set */ + return NULL; + } + /* change action for signo signal */ + if (sigaction(signo, &new_handl, &old_handl)){ + return NULL; + } + return (old_handl.sa_sigaction); +} /* * Functions: HandSigCHLD - * Generic handler for SIGCHLD signal + * Generic simple handler for SIGCHLD signal * * Simone Piccardi Dec. 2002 - * $Id: SigHand.c,v 1.7 2003/05/06 14:05:12 piccardi Exp $ */ void HandSigCHLD(int sig) { @@ -113,7 +164,7 @@ void HandSigCHLD(int sig) // if (pid > 0) { // debug("child %d terminated with status %x\n", pid, status); // } - } while ((pid > 0) && (errno == EINTR)); + } while (pid > 0); /* restore errno value*/ errno = errno_save; /* return */