Changeset 2fa80a in git for Singular/cntrlc.cc

Timestamp:

Nov 6, 2013, 6:07:39 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

823679a657c538153cba3a477bf92e2c9102c451

Parents:

2ea781ea236dc6d65399e46b262e9954538749a1d600e1863951bfc5135d0138b61badb20b1ec70a

Message:

Merge pull request #414 from steenpass/resources_sw

release acquired semaphores before shutdown

File:

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

Singular/cntrlc.cc

@@ -30 +30 @@
 #include <Singular/cntrlc.h>
 #include <Singular/feOpt.h>
+#include <Singular/misc_ip.h>
 #include <Singular/si_signals.h>
 #include <Singular/links/silink.h>
@@ -88 +89 @@
 }
 
+volatile BOOLEAN do_shutdown = FALSE;
+volatile int defer_shutdown = 0;
+
 void sig_term_hdl(int /*sig*/)
 {
-  if (ssiToBeClosed_inactive)
-  {
-    ssiToBeClosed_inactive=FALSE;
-    while (ssiToBeClosed!=NULL)
-    {
-      slClose(ssiToBeClosed->l);
-      if (ssiToBeClosed==NULL) break;
-      ssiToBeClosed=(link_list)ssiToBeClosed->next;
-    }
-    exit(1);
-  }
-  //else: we already shutting down: let's do m2_end ist work
+  do_shutdown = TRUE;
+  if (!defer_shutdown)
+  {
+    m2_end(1);
+  }
 }