Changeset ccae2f in git

Timestamp:

Apr 10, 2013, 4:12:24 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

58d429b7d8518126ff491afde71414bc067197ab

Parents:

55cb6bd95ed2dc1ee1fe4d8f374124dfd3836e86

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-04-10 16:12:24+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-04-10 16:14:50+02:00

Message:

fix: simplified crash handling for Singularg

from master

File:

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

Singular/cntrlc.cc

@@ -415 +415 @@
 #ifdef unix
 #  ifndef __OPTIMIZE__
-int si_stop_stack_trace_x;
+volatile int si_stop_stack_trace_x;
 #    ifdef CALL_GDB
 static void debug (int method)
@@ -442 +442 @@
     {
       case INTERACTIVE:
-        fprintf (stderr, "debug_stop\n");
+        fprintf (stderr, "\n\nquit with \"p si_stop_stack_trace_x=0\"\n\n\n");
         debug_stop (args);
         break;
-      #ifndef __OPTIMIZE__
       case STACK_TRACE:
         fprintf (stderr, "stack_trace\n");
         stack_trace (args);
         break;
-      #endif
       default:
         // should not be reached:
@@ -473 +471 @@
 }
 #    endif /* CALL_GDB */
-
-static int stack_trace_done;
 
 static void stack_trace (char *const*args)
@@ -487 +483 @@
   char buffer[256];
   char c;
-
-  stack_trace_done = 0;
-
-  signal (SIGCHLD, stack_trace_sigchld);
 
   if ((pipe (in_fd) == -1) || (pipe (out_fd) == -1))
@@ -564 +556 @@
       }
     }
-    else if (stack_trace_done)
+    else if (si_stop_stack_trace_x==0)
       break;
   }
@@ -573 +565 @@
   si_close (out_fd[1]);
   m2_end(0);
-}
-
-static void stack_trace_sigchld (int /*signum*/)
-{
-  stack_trace_done = 1;
 }