Changeset d600e18 in git

Timestamp:

Nov 5, 2013, 12:51:24 PM (10 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')

Children:

2fa80a36c041e00aa30582d92c55f22cc3fe47d8

Parents:

659a7af613781bb070ab2564b6aff1c52a070df4

git-author:

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

git-committer:

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

Message:

chg: release acquired semaphores before shutdown
(cherry picked from commit 0f27f90c69fc9952c3df5edb6dff0b57fd8ff826)

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

Conflicts:
	Singular/links/semaphore.c
	Singular/misc_ip.cc

Location:

Singular

Files:

• links/semaphore.c (modified) (5 diffs)
• links/simpleipc.h (modified) (2 diffs)
• links/ssiLink.cc (modified) (1 diff)
• misc_ip.cc (modified) (2 diffs)

Singular/links/semaphore.c

@@ -9 +9 @@
 # include "simpleipc.h"
 
+#include <Singular/cntrlc.h>
 #include <Singular/si_signals.h>
 
@@ -23 +24 @@
 // but are supported more widely.
 
-static sem_t *semaphore[SIPC_MAX_SEMAPHORES];
+sem_t *semaphore[SIPC_MAX_SEMAPHORES];
+int sem_acquired[SIPC_MAX_SEMAPHORES];
 
 /* return 1 on success,
@@ -74 +76 @@
 {
   if ((id<0) || (id >= SIPC_MAX_SEMAPHORES) || (semaphore[id]==NULL))  return -1;
+  defer_shutdown++;
   si_sem_wait(semaphore[id]);
+  sem_acquired[id]++;
+  defer_shutdown--;
+  if (!defer_shutdown && do_shutdown) m2_end(1);
   return 1;
 }
@@ -81 +87 @@
 {
   if ((id<0) || (id >= SIPC_MAX_SEMAPHORES) || (semaphore[id]==NULL))  return -1;
-  return !si_sem_trywait(semaphore[id]);
+  defer_shutdown++;
+  int trywait = si_sem_trywait(semaphore[id]);
+  if (!trywait)
+  {
+    sem_acquired[id]++;
+  }
+  defer_shutdown--;
+  if (!defer_shutdown && do_shutdown) m2_end(1);
+  return !trywait;
 }
 
@@ -87 +101 @@
 {
   if ((id<0) || (id >= SIPC_MAX_SEMAPHORES) || (semaphore[id]==NULL))  return -1;
+  defer_shutdown++;
   sem_post(semaphore[id]);
+  sem_acquired[id]--;
+  defer_shutdown--;
+  if (!defer_shutdown && do_shutdown) m2_end(1);
   return 1;
 }

Singular/links/simpleipc.h

@@ +1 @@
+#include <semaphore.h>
+
 #ifndef _SIMPLEIPC_H
 #define _SIMPLEIPC_H
@@ -9 +11 @@
 
 #define USE_SEM_INIT 0
+
+extern sem_t *semaphore[SIPC_MAX_SEMAPHORES];
+extern int sem_acquired[SIPC_MAX_SEMAPHORES];
 
 int sipc_semaphore_init(int id, int count);

Singular/links/ssiLink.cc

@@ -805 +805 @@
           }
           ssiToBeClosed->next=NULL;
+#ifdef HAVE_SIMPLEIPC
+          memset(sem_acquired, 0, SIPC_MAX_SEMAPHORES*sizeof(sem_acquired[0]));
+#endif   // HAVE_SIMPLEIPC
           si_close(pc[1]); si_close(cp[0]);
           d->f_write=fdopen(cp[1],"w");

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
 
@@ -1055 +1059 @@
   {
     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