Changeset 751785e in git

Timestamp:

Jan 14, 2013, 8:16:56 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'cdfcdb8287f66bc6070028082cbbc6eff10e609b')

Children:

d9947d272d574a169450505d43dc8ad3a5b4d0f0

Parents:

c251308665e937dc7f552d6681c2010dcdf1debb

Message:

chg: signal handlers, p1

File:

• Singular/cntrlc.cc (modified) (9 diffs)

Singular/cntrlc.cc

@@ -25 +25 @@
 #include <kernel/polys.h>
 #include <kernel/febase.h>
+void sig_chld_hdl(int sig); /*#include <Singular/links/ssiLink.h>*/
 
 #include "tok.h"
@@ -35 +36 @@
 /* undef, if you don't want GDB to come up on error */
 
-#if !defined(__alpha)
-#define CALL_GDB
-#endif
-
 #if defined(__OPTIMIZE__) && defined(CALL_GDB)
 #undef CALL_GDB
 #endif
 
-#if defined(unix) && !defined(hpux)
+#if defined(unix)
  #include <unistd.h>
  #include <sys/types.h>
@@ -231 +228 @@
 }
 
-/*2
-* init signal handlers, linux/i386 version
-*/
-void init_signals()
-{
-/*4 signal handler: linux*/
-  if (SIG_ERR==si_set_signal(SIGSEGV,(si_hdl_typ)sigsegv_handler))
-  {
-    PrintS("cannot set signal handler for SEGV\n");
-  }
-  if (SIG_ERR==si_set_signal(SIGFPE, (si_hdl_typ)sigsegv_handler))
-  {
-    PrintS("cannot set signal handler for FPE\n");
-  }
-  if (SIG_ERR==si_set_signal(SIGILL, (si_hdl_typ)sigsegv_handler))
-  {
-    PrintS("cannot set signal handler for ILL\n");
-  }
-  if (SIG_ERR==si_set_signal(SIGIOT, (si_hdl_typ)sigsegv_handler))
-  {
-    PrintS("cannot set signal handler for IOT\n");
-  }
-  if (SIG_ERR==si_set_signal(SIGINT ,(si_hdl_typ)sigint_handler))
-  {
-    PrintS("cannot set signal handler for INT\n");
-  }
-  si_set_signal(SIGCHLD, (si_hdl_typ)sig_chld_hdl);
-  si_set_signal(SIGPIPE, (si_hdl_typ)sig_pipe_hdl);
-  si_set_signal(SIGTERM, (si_hdl_typ)sig_term_hdl);
-}
-
 /*---------------------------------------------------------------------*/
 #elif defined(SunOS) /*SPARC_SUNOS*/
@@ -292 +258 @@
   exit(0);
 }
-
-/*2
-* init signal handlers, sparc sunos 4 version
-*/
-void init_signals()
-{
-/*4 signal handler:*/
-  si_set_signal(SIGSEGV,sigsegv_handler);
-  si_set_signal(SIGBUS, sigsegv_handler);
-  si_set_signal(SIGFPE, sigsegv_handler);
-  si_set_signal(SIGILL, sigsegv_handler);
-  si_set_signal(SIGIOT, sigsegv_handler);
-  si_set_signal(SIGINT ,sigint_handler);
-  si_set_signal(SIGCHLD, (void (*)(int))SIG_IGN);
-  si_set_signal(SIGPIPE, (si_hdl_typ)sig_pipe_hdl);
-}
 #else
 
@@ -334 +284 @@
   }
   #endif /* __OPTIMIZE__ */
-  #if defined(unix) && !defined(hpux)
+  #if defined(unix)
   /* debug(..) does not work under HPUX (because ptrace does not work..) */
   #ifdef CALL_GDB
@@ -341 +291 @@
   #endif /* unix */
   exit(0);
-}
-
-/*2
-* init signal handlers, general version
-*/
-void init_signals()
-{
-/*4 signal handler:*/
-  si_set_signal(SIGSEGV,(void (*) (int))sigsegv_handler);
-  #ifdef SIGBUS
-  si_set_signal(SIGBUS, sigsegv_handler);
-  #endif /* SIGBUS */
-  #ifdef SIGFPE
-  si_set_signal(SIGFPE, sigsegv_handler);
-  #endif /* SIGFPE */
-  #ifdef SIGILL
-  si_set_signal(SIGILL, sigsegv_handler);
-  #endif /* SIGILL */
-  #ifdef SIGIOT
-  si_set_signal(SIGIOT, sigsegv_handler);
-  #endif /* SIGIOT */
-  #ifdef SIGXCPU
-  si_set_signal(SIGXCPU, (void (*)(int))SIG_IGN);
-  #endif /* SIGIOT */
-  si_set_signal(SIGINT ,sigint_handler);
-  #if defined(HPUX_9) || defined(HPUX_10)
-  si_set_signal(SIGCHLD, (void (*)(int))SIG_IGN);
-  #endif
-  si_set_signal(SIGPIPE, (si_hdl_typ)sig_pipe_hdl);
 }
 #endif
@@ -468 +389 @@
 
 #ifdef unix
-# ifndef hpux
 #  ifndef __OPTIMIZE__
 int si_stop_stack_trace_x;
@@ -586 +506 @@
     tv.tv_usec = 0;
 
-#    ifdef hpux
-    sel = select (FD_SETSIZE, (int *)readset.fds_bits, NULL, NULL, &tv);
-#    else /* hpux */
     sel = select (FD_SETSIZE, &readset, NULL, NULL, &tv);
-#    endif /* hpux */
     if (sel == -1)
       break;
@@ -640 +556 @@
 
 #  endif /* !__OPTIMIZE__ */
-# endif /* !hpux */
 #endif /* unix */
 
-/* Under HPUX 9, system(...) returns -1 if SIGCHLD does not equal
-   SIG_DFL. However, if it stays at SIG_DFL we get zombie processes
-   for terminated childs generated by fork. Therefors some special treatment
-   is necessary */
-#ifdef HPUX_9
-# undef system
-extern "C" {
-  int  hpux9_system(const char* call)
-  {
-    int ret;
-    si_set_signal(SIGCHLD, (void (*)(int))SIG_DFL);
-    ret = system(call);
-    si_set_signal(SIGCHLD, (void (*)(int))SIG_IGN);
-    return ret;
-  }
-}
-#endif /* HPUX_9 */
+/*2
+* init signal handlers
+*/
+void init_signals()
+{
+  si_set_signal(SIGSEGV,(si_hdl_typ)sigsegv_handler);
+  si_set_signal(SIGFPE, (si_hdl_typ)sigsegv_handler);
+  si_set_signal(SIGILL, (si_hdl_typ)sigsegv_handler);
+  si_set_signal(SIGIOT, (si_hdl_typ)sigsegv_handler);
+  si_set_signal(SIGINT ,(si_hdl_typ)sigint_handler);
+  si_set_signal(SIGCHLD, (si_hdl_typ)sig_chld_hdl);
+  si_set_signal(SIGPIPE, (si_hdl_typ)sig_pipe_hdl);
+  si_set_signal(SIGTERM, (si_hdl_typ)sig_term_hdl);
+}
+