Changeset 2fa80a in git for Singular/misc_ip.cc

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

823679a657c538153cba3a477bf92e2c9102c451

Parents:

2ea781ea236dc6d65399e46b262e9954538749a1d600e1863951bfc5135d0138b61badb20b1ec70a

Message:

Merge pull request #414 from steenpass/resources_sw

release acquired semaphores before shutdown

File:

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

Singular/misc_ip.cc

@@ -23 +23 @@
 #define SI_DONT_HAVE_GLOBAL_VARS
 #include <factory/factory.h>
+#endif
+
+#ifdef HAVE_SIMPLEIPC
+#include <Singular/links/simpleipc.h>
 #endif
 
@@ -1048 +1052 @@
 */
 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;
+#ifdef HAVE_SIMPLEIPC
+    for (int i = SIPC_MAX_SEMAPHORES; i >= 0; i--)
+    {
+      if (semaphore[i] != NULL)
+      {
+        while (sem_acquired[i] > 0)
+        {
+          sem_post(semaphore[i]);
+          sem_acquired[i]--;
+        }
+      }
+    }
+#endif   // HAVE_SIMPLEIPC
+    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);
+  }
 }
 }