(url-current-object, url-package-name, url-package-version): Add defvars.

[gnu-emacs] / src / syssignal.h

diff --git a/src/syssignal.h b/src/syssignal.h
index cf5914458f2cce48ec22bd9a572706fc10573f57..6a5cd39bde939727d639045dcaec93e4007daeb5 100644 (file)
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -1,11 +1,12 @@
 /* syssignal.h - System-dependent definitions for signals.
 /* 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
 
 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,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -15,48 +16,105 @@ 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
 
 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 <pthread.h>
+extern pthread_t main_thread;
+#endif

 
 #ifdef POSIX_SIGNALS
 
 #ifdef POSIX_SIGNALS

+
+/* Don't #include <signal.h>.  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 <signal.h>, then that will re-#define SIGIO and confuse
+   things.  */
+

 #define SIGMASKTYPE sigset_t
 
 #define SIGEMPTYMASK (empty_mask)
 #define SIGFULLMASK (full_mask)
 #define SIGMASKTYPE sigset_t
 
 #define SIGEMPTYMASK (empty_mask)
 #define SIGFULLMASK (full_mask)

-extern sigset_t empty_mask, full_mask, temp_mask;
-
-#define sigmask(SIG) \
-(sigemptyset (&temp_mask), sigaddset (&temp_mask, SIG), temp_mask)
-
-/* The below routines may need a local mask.  There could be problems
-   if code using any of the 3 macros below could be reentered due to a
-   signal occurring.  This can't happen in Emacs 18.57, so we don't
-   worry. - DJB */
-
-#define EMACS_SIGPAUSE(sigset) \
-  do { sigset_t _mask; sys_sigpause (sigset); } while (0)
-#define EMACS_SIGBLOCK(new_sig, old_sig) \
-  do { sigset_t _mask; (old_sig) = sys_sigblock (new_sig); } while (0)
-#define EMACS_SIGUNBLOCK(new_sig, old_sig) \
-  do { sigset_t _mask; (old_sig) = sys_sigunblock (new_sig); } while (0)
-#define EMACS_SIGSETMASK(new_sig, old_sig) \
-  do { sigset_t _mask; (old_sig) = sys_sigsetmask (new_sig); } while (0)
+extern sigset_t empty_mask, full_mask;
+
+/* POSIX pretty much destroys any possibility of writing sigmask as a
+   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)                           \
+  ({                                           \
+    sigset_t _mask;                            \
+    sigemptyset (&_mask);                      \
+    sigaddset (&_mask, SIG);                   \
+    _mask;                                     \
+  })
+#else /* ! defined (__GNUC__) */
+extern sigset_t sys_sigmask ();
+#define sigmask(SIG) (sys_sigmask (SIG))
+#endif /* ! defined (__GNUC__) */
+
+#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
 #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)
+
+/* 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*/);

 
 

-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);
+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)
+#define sys_sigdel(MASK,SIG) sigdelset (&MASK,SIG)

 
 #else /* ! defined (POSIX_SIGNALS) */
 
 #else /* ! defined (POSIX_SIGNALS) */

+#ifdef USG5_4
+
+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
+
+#ifndef sigunblock
+#define sigunblock(sig)
+#endif
+
+#else
+
+#ifndef sigunblock

 #define sigunblock(SIG) \
 { SIGMASKTYPE omask = sigblock (SIGEMPTYMASK); sigsetmask (omask & ~SIG); }
 #define sigunblock(SIG) \
 { SIGMASKTYPE omask = sigblock (SIGEMPTYMASK); sigsetmask (omask & ~SIG); }

+#endif

 
 

+#endif /* ! defined (USG) */
+#endif /* ! defined (USG5_4) */

 #endif /* ! defined (POSIX_SIGNALS) */
 
 #ifndef SIGMASKTYPE
 #endif /* ! defined (POSIX_SIGNALS) */
 
 #ifndef SIGMASKTYPE


@@ -64,57 +122,75 @@ sigset_t sys_sigsetmask (sigset_t new_mask);
 #endif
 
 #ifndef SIGEMPTYMASK
 #endif
 
 #ifndef SIGEMPTYMASK

-#define SIGEMPTYMASK 0
+#define SIGEMPTYMASK (0)
+#endif
+
+#ifndef SIGFULLMASK
+#define SIGFULLMASK (0xffffffff)

 #endif
 
 #ifndef sigmask
 #define sigmask(no) (1L << ((no) - 1))
 #endif
 
 #endif
 
 #ifndef sigmask
 #define sigmask(no) (1L << ((no) - 1))
 #endif
 

+#ifndef sigunblock
+#define sigunblock(SIG) \
+{ SIGMASKTYPE omask = sigblock (SIGFULLMASK); sigsetmask (omask & ~SIG); }
+#endif
+
+#ifndef BSD4_1
+#define sigfree() sigsetmask (SIGEMPTYMASK)
+#endif /* not BSD4_1 */
+
+#if defined (SIGINFO) && defined (BROKEN_SIGINFO)
+#undef SIGINFO
+#endif
+#if defined (SIGIO) && defined (BROKEN_SIGIO)
+#undef SIGIO
+#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
 #ifdef BSD4_1
 #define SIGIO SIGTINT

-/* sigfree and sigholdx are in sysdep.c */
-#define EMACS_SIGFREE () sigfree ()
-
-/* We define the following macros to expand into statements rather
-   than expressions, because the POSIX macros above do the same, and
-   we don't want people on BSD4_1 systems accidentally using the
-   macros in a way that will break the other systems.  */
-#define EMACS_SIGHOLDX(new_sig, old_sig) \
-  do { (old_sig) = sigholdx (new_sig); } while (0)
-#define EMACS_SIGBLOCKX(new_sig, old_sig) \
-  do { (old_sig) = sighold (new_sig); } while (0)
-#define EMACS_SIGUNBLOCKX(new_sig, old_sig) \
-  do { (old_sig) = sigrelse (new_sig); } while (0)
-#define EMACS_SIGPAUSEX(sig) \
-  EMACS_SIGPAUSE (new_sig);
-
-#else /* ! defined (BSD4_1) */
-
-#define EMACS_SIGFREE() \
-  do { SIGMASKTYPE _dummy; EMACS_SIGSETMASK (SIGEMPTYMASK, _dummy); } while (0)
-#define EMACS_SIGHOLDX(new_sig, old_sig) \
-  EMACS_SIGSETMASK (sigmask (new_sig), old_sig)
-#define EMACS_SIGBLOCKX(new_sig, old_sig) \
-  EMACS_SIGBLOCK (sigmask (new_sig), old_sig)
-#define EMACS_SIGUNBLOCKX(new_sig, old_sig) \
-  EMACS_SIGUNBLOCK (sigmask (new_sig), old_sig)
-#define EMACS_SIGPAUSEX(sig) \
-  EMACS_SIGPAUSE (0)
-
-#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.  */
 
 /* 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
 #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
 #define EMACS_KILLPG(gid, signo) (kill   (-(gid), (signo)))
 #endif

+#endif

 
 /* Define SIGCHLD as an alias for SIGCLD.  There are many conditionals
    testing SIGCHLD.  */
 
 /* Define SIGCHLD as an alias for SIGCLD.  There are many conditionals
    testing SIGCHLD.  */

-

 #ifndef VMS
 #ifdef SIGCLD
 #ifndef SIGCHLD
 #ifndef VMS
 #ifdef SIGCLD
 #ifndef SIGCHLD


@@ -122,3 +198,33 @@ sigset_t sys_sigsetmask (sigset_t new_mask);
 #endif /* SIGCHLD */
 #endif /* ! defined (SIGCLD) */
 #endif /* VMS */
 #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) */