Changeset 2fa80a in git for Singular/links/semaphore.c

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

823679a657c538153cba3a477bf92e2c9102c451

Parents:

2ea781ea236dc6d65399e46b262e9954538749a1d600e1863951bfc5135d0138b61badb20b1ec70a

Message:

Merge pull request #414 from steenpass/resources_sw

release acquired semaphores before shutdown

File:

• Singular/links/semaphore.c (modified) (5 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;
 }