X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/ea973b1075ed49b2d45e2a7601a936370a5e4d23..9c2d888b35db9a941e83e859a548b928ccead5f0:/src/syssignal.h diff --git a/src/syssignal.h b/src/syssignal.h index 8d800145e2..cc2212d5e1 100644 --- a/src/syssignal.h +++ b/src/syssignal.h @@ -1,5 +1,6 @@ /* syssignal.h - System-dependent definitions for signals. - Copyright (C) 1993 Free Software Foundation, Inc. + Copyright (C) 1993, 1999, 2002, 2003, 2004, + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -15,8 +16,15 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ + +extern void init_signals P_ ((void)); + +#ifdef HAVE_GTK_AND_PTHREAD +#include +extern pthread_t main_thread; +#endif #ifdef POSIX_SIGNALS @@ -30,11 +38,13 @@ Boston, MA 02111-1307, USA. */ #define SIGEMPTYMASK (empty_mask) #define SIGFULLMASK (full_mask) -extern sigset_t empty_mask, full_mask, temp_mask; +extern sigset_t empty_mask, full_mask; /* POSIX pretty much destroys any possibility of writing sigmask as a - macro in standard C. */ -#ifndef sigmask + macro in standard C. We always define our own version because the + predefined macro in Glibc 2.1 is only provided for compatility for old + programs that use int as signal mask type. */ +#undef sigmask #ifdef __GNUC__ #define sigmask(SIG) \ ({ \ @@ -47,9 +57,10 @@ extern sigset_t empty_mask, full_mask, temp_mask; extern sigset_t sys_sigmask (); #define sigmask(SIG) (sys_sigmask (SIG)) #endif /* ! defined (__GNUC__) */ -#endif -#define sigpause(SIG) sys_sigpause (SIG) +#undef sigpause +#define sigpause(MASK) sigsuspend (&(MASK)) + #define sigblock(SIG) sys_sigblock (SIG) #define sigunblock(SIG) sys_sigunblock (SIG) #ifndef sigsetmask @@ -64,32 +75,43 @@ extern sigset_t sys_sigmask (); appears to be assumed in the source, for example data.c:arith_error. */ typedef RETSIGTYPE (*signal_handler_t) (/*int*/); -signal_handler_t sys_signal (/*int signal_number, signal_handler_t action*/); -int sys_sigpause (/*sigset_t new_mask*/); -sigset_t sys_sigblock (/*sigset_t new_mask*/); -sigset_t sys_sigunblock (/*sigset_t new_mask*/); -sigset_t sys_sigsetmask (/*sigset_t new_mask*/); +signal_handler_t sys_signal P_ ((int signal_number, signal_handler_t action)); +sigset_t sys_sigblock P_ ((sigset_t new_mask)); +sigset_t sys_sigunblock P_ ((sigset_t new_mask)); +sigset_t sys_sigsetmask P_ ((sigset_t new_mask)); #define sys_sigdel(MASK,SIG) sigdelset (&MASK,SIG) #else /* ! defined (POSIX_SIGNALS) */ #ifdef USG5_4 +extern SIGMASKTYPE sigprocmask_set; + #ifndef sigblock -#define sigblock(sig) (sigprocmask (SIG_BLOCK, SIGEMPTYMASK | sig, NULL)) +#define sigblock(sig) \ + (sigprocmask_set = SIGEMPTYMASK | (sig), \ + sigprocmask (SIG_BLOCK, &sigprocmask_set, NULL)) #endif -#define sigunblock(sig) (sigprocmask (SIG_SETMASK, SIGFULLMASK & ~(sig), NULL)) +#ifndef sigunblock +#define sigunblock(sig) \ + (sigprocmask_set = SIGFULLMASK & ~(sig), \ + sigprocmask (SIG_SETMASK, &sigprocmask_set, NULL)) +#endif #else #ifdef USG -#define sigunblock(sig) +#ifndef sigunblock +#define sigunblock(sig) +#endif #else +#ifndef sigunblock #define sigunblock(SIG) \ { SIGMASKTYPE omask = sigblock (SIGEMPTYMASK); sigsetmask (omask & ~SIG); } +#endif #endif /* ! defined (USG) */ #endif /* ! defined (USG5_4) */ @@ -116,27 +138,51 @@ sigset_t sys_sigsetmask (/*sigset_t new_mask*/); { SIGMASKTYPE omask = sigblock (SIGFULLMASK); sigsetmask (omask & ~SIG); } #endif -/* It would be very nice if we could somehow clean up all this trash. */ - #ifndef BSD4_1 #define sigfree() sigsetmask (SIGEMPTYMASK) -#define sigholdx(sig) sigsetmask (sigmask (sig)) -#define sigblockx(sig) sigblock (sigmask (sig)) -#define sigunblockx(sig) sigunblock (sigmask (sig)) -#define sigpausex(sig) sigpause (0) #endif /* not BSD4_1 */ +#if defined (SIGINFO) && defined (BROKEN_SIGINFO) +#undef SIGINFO +#endif +#if defined (SIGIO) && defined (BROKEN_SIGIO) +# undef SIGIO +# if defined (__Lynx__) +# undef SIGPOLL /* Defined as SIGIO on LynxOS */ +# endif +#endif +#if defined (SIGPOLL) && defined (BROKEN_SIGPOLL) +#undef SIGPOLL +#endif +#if defined (SIGTSTP) && defined (BROKEN_SIGTSTP) +#undef SIGTSTP +#endif +#if defined (SIGURG) && defined (BROKEN_SIGURG) +#undef SIGURG +#endif +#if defined (SIGAIO) && defined (BROKEN_SIGAIO) +#undef SIGAIO +#endif +#if defined (SIGPTY) && defined (BROKEN_SIGPTY) +#undef SIGPTY +#endif + + +#if NSIG < NSIG_MINIMUM +# ifdef NSIG +# undef NSIG +# endif +# define NSIG NSIG_MINIMUM +#endif + #ifdef BSD4_1 #define SIGIO SIGTINT -/* sigfree and sigholdx are in sysdep.c */ -#define sigblockx(sig) sighold (sig) -#define sigunblockx(sig) sigrelse (sig) -#define sigpausex(sig) sigpause (sig) +/* sigfree is in sysdep.c */ #endif /* BSD4_1 */ /* On bsd, [man says] kill does not accept a negative number to kill a pgrp. Must do that using the killpg call. */ -#ifdef BSD +#ifdef BSD_SYSTEM #define EMACS_KILLPG(gid, signo) (killpg ( (gid), (signo))) #else #ifdef WINDOWSNT @@ -155,3 +201,33 @@ sigset_t sys_sigsetmask (/*sigset_t new_mask*/); #endif /* SIGCHLD */ #endif /* ! defined (SIGCLD) */ #endif /* VMS */ + +#ifndef HAVE_STRSIGNAL +/* strsignal is in sysdep.c */ +char *strsignal (); +#endif + +#ifdef HAVE_GTK_AND_PTHREAD +#define SIGNAL_THREAD_CHECK(signo) \ + do { \ + if (pthread_self () != main_thread) \ + { \ + /* POSIX says any thread can receive the signal. On GNU/Linux \ + that is not true, but for other systems (FreeBSD at least) \ + it is. So direct the signal to the correct thread and block \ + it from this thread. */ \ + sigset_t new_mask; \ + \ + sigemptyset (&new_mask); \ + sigaddset (&new_mask, signo); \ + pthread_sigmask (SIG_BLOCK, &new_mask, 0); \ + pthread_kill (main_thread, signo); \ + return; \ + } \ + } while (0) + +#else /* not HAVE_GTK_AND_PTHREAD */ +#define SIGNAL_THREAD_CHECK(signo) +#endif /* not HAVE_GTK_AND_PTHREAD */ +/* arch-tag: 4580e86a-340d-4574-9e11-a742b6e1a152 + (do not change this comment) */