Changeset 659a7a in git for Singular

Timestamp:

Nov 5, 2013, 12:50:56 PM (10 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d600e1863951bfc5135d0138b61badb20b1ec70a

Parents:

8c982c34545a8ef6ec86afcbb224757c7dffcd0f

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-11-05 12:50:56+01:00

git-committer:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-11-06 13:20:27+01:00

Message:

chg: defer shutdown caused by SIGTERM if necessary
(cherry picked from commit a76a64e703bae29ffee8057ab2b16abb20f9158a)

Signed-off-by: Andreas Steenpass <steenpass@mathematik.uni-kl.de>

Conflicts:
	Singular/cntrlc.cc
	Singular/cntrlc.h
	Singular/misc_ip.cc

Location:

Singular

Files:

• cntrlc.cc (modified) (2 diffs)
• cntrlc.h (modified) (1 diff)
• misc_ip.cc (modified) (1 diff)

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);
+  }
 }
 

Singular/cntrlc.h

@@ -19 +19 @@
 /* TRUE for child of a fork or started with --batch*/
 
+/* for deferring the call of m2_end() in SIGTERM handler if necessary */
+extern volatile BOOLEAN do_shutdown;
+extern volatile int defer_shutdown;
+
 #endif

Singular/misc_ip.cc

@@ -1044 +1044 @@
 */
 extern "C" {
+/* Note: We cannot use a mutex here because mutexes are not async-safe, but
+ * m2_end is called by sig_term_hdl(). Anyway, the race condition in the first
+ * few lines of m2_end() should not matter.
+ */
+volatile BOOLEAN m2_end_called = FALSE;
 
 void m2_end(int i)
 {
-  fe_reset_input_mode();
-  #ifdef PAGE_TEST
-  mmEndStat();
-  #endif
-  fe_reset_input_mode();
-  if (ssiToBeClosed_inactive)
-  {
-    link_list hh=ssiToBeClosed;
-    while(hh!=NULL)
-    {
-      //Print("close %s\n",hh->l->name);
-      slPrepClose(hh->l);
-      hh=(link_list)hh->next;
-    }
-    ssiToBeClosed_inactive=FALSE;
-
-    idhdl h = currPack->idroot;
-    while(h != NULL)
-    {
-      if(IDTYP(h) == LINK_CMD)
-      {
-        idhdl hh=h->next;
-        //Print("kill %s\n",IDID(h));
-        killhdl(h, currPack);
-        h = hh;
+  if (!m2_end_called)
+  {
+    m2_end_called = TRUE;
+    fe_reset_input_mode();
+#ifdef PAGE_TEST
+    mmEndStat();
+#endif
+    fe_reset_input_mode();
+    if (ssiToBeClosed_inactive)
+    {
+      link_list hh=ssiToBeClosed;
+      while(hh!=NULL)
+      {
+        //Print("close %s\n",hh->l->name);
+        slPrepClose(hh->l);
+        hh=(link_list)hh->next;
+      }
+      ssiToBeClosed_inactive=FALSE;
+
+      idhdl h = currPack->idroot;
+      while(h != NULL)
+      {
+        if(IDTYP(h) == LINK_CMD)
+        {
+          idhdl hh=h->next;
+          //Print("kill %s\n",IDID(h));
+          killhdl(h, currPack);
+          h = hh;
+        }
+        else
+        {
+          h = h->next;
+        }
+      }
+      hh=ssiToBeClosed;
+      while(hh!=NULL)
+      {
+        //Print("close %s\n",hh->l->name);
+        slClose(hh->l);
+        hh=ssiToBeClosed;
+      }
+    }
+    if (!singular_in_batchmode)
+    {
+      if (i<=0)
+      {
+        if (TEST_V_QUIET)
+        {
+          if (i==0)
+            printf("Auf Wiedersehen.\n");
+          else
+            printf("\n$Bye.\n");
+        }
+        //#ifdef sun
+        //  #ifndef __svr4__
+        //    _cleanup();
+        //    _exit(0);
+        //  #endif
+        //#endif
+        i=0;
       }
       else
       {
-        h = h->next;
-      }
-    }
-    hh=ssiToBeClosed;
-    while(hh!=NULL)
-    {
-      //Print("close %s\n",hh->l->name);
-      slClose(hh->l);
-      hh=ssiToBeClosed;
-    }
-  }
-  if (!singular_in_batchmode)
-  {
-    if (i<=0)
-    {
-      if (TEST_V_QUIET)
-      {
-        if (i==0)
-          printf("Auf Wiedersehen.\n");
-        else
-          printf("\n$Bye.\n");
-      }
-      //#ifdef sun
-      //  #ifndef __svr4__
-      //    _cleanup();
-      //    _exit(0);
-      //  #endif
-      //#endif
-      i=0;
-    }
-    else
-    {
         printf("\nhalt %d\n",i);
-    }
-  }
-  exit(i);
+      }
+    }
+    exit(i);
+  }
 }
 }