X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/985a35a39b2f99852e49bcb25d971f1a04d87670..877173ab42e5c3ecf88a180262b937dfc219c57f:/src/syssignal.h diff --git a/src/syssignal.h b/src/syssignal.h index dddaee8092..43e8847cea 100644 --- a/src/syssignal.h +++ b/src/syssignal.h @@ -1,11 +1,12 @@ /* syssignal.h - System-dependent definitions for signals. - Copyright (C) 1992 Free Software Foundation, Inc. + Copyright (C) 1993, 1999, 2002, 2003, 2004, + 2005 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 1, or (at your option) +the Free Software Foundation; either version 2, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, @@ -15,17 +16,35 @@ 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, 675 Mass Ave, Cambridge, MA 02139, 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 + +/* Don't #include . That header should always be #included + before "config.h", because some configuration files (like s/hpux.h) + indicate that SIGIO doesn't work by #undef-ing SIGIO. If this file + #includes , then that will re-#define SIGIO and confuse + things. */ + #define SIGMASKTYPE sigset_t #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. */ + 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) \ ({ \ @@ -35,38 +54,64 @@ extern sigset_t empty_mask, full_mask, temp_mask; _mask; \ }) #else /* ! defined (__GNUC__) */ +extern sigset_t sys_sigmask (); #define sigmask(SIG) (sys_sigmask (SIG)) #endif /* ! defined (__GNUC__) */ -#define sigpause(SIG) sys_sigpause(SIG) -#define sigblock(SIG) sys_sigblock(SIG) -#define sigunblock(SIG) sys_sigunblock(SIG) -#define sigsetmask(SIG) sys_sigsetmask(SIG) +#undef sigpause +#define sigpause(MASK) sigsuspend (&(MASK)) + +#define sigblock(SIG) sys_sigblock (SIG) +#define sigunblock(SIG) sys_sigunblock (SIG) +#ifndef sigsetmask +#define sigsetmask(SIG) sys_sigsetmask (SIG) +#endif #define sighold(SIG) ONLY_USED_IN_BSD_4_1 #define sigrelse(SIG) ONLY_USED_IN_BSD_4_1 +#undef signal +#define signal(SIG,ACT) sys_signal(SIG,ACT) -int (*sys_signal (int signal_number, int (*action)())) (); -int sys_sigpause (int signal_number); -sigset_t sys_sigblock (sigset_t new_mask); -sigset_t sys_sigunblock (sigset_t new_mask); -sigset_t sys_sigsetmask (sigset_t new_mask); +/* Whether this is what all systems want or not, this is what + appears to be assumed in the source, for example data.c:arith_error. */ +typedef RETSIGTYPE (*signal_handler_t) (/*int*/); -#define sys_sigdel(MASK,SIG) sigdelset(&MASK,SIG) +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 -#define sigunblock(sig) (sigprocmask(SIG_SETMASK, SIGFULLMASK & ~(sig), NULL)) +extern SIGMASKTYPE sigprocmask_set; + +#ifndef sigblock +#define sigblock(sig) \ + (sigprocmask_set = SIGEMPTYMASK | (sig), \ + sigprocmask (SIG_BLOCK, &sigprocmask_set, NULL)) +#endif + +#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) */ @@ -93,31 +138,59 @@ 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) sigblock (SIGEMPTYMASK) -#define sigpausex(sig) sigpause (0) -#endif /* BSD4_1 */ +#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) -#endif /* ! defined (BSD4_1) */ +/* 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 +#define EMACS_KILLPG(gid, signo) (kill (gid, signo)) +#else #define EMACS_KILLPG(gid, signo) (kill (-(gid), (signo))) #endif +#endif /* Define SIGCHLD as an alias for SIGCLD. There are many conditionals testing SIGCHLD. */ @@ -128,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) */