Changeset b38f81 in git for Singular/links/silink.cc

Timestamp:

Nov 7, 2013, 2:06:59 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

4a4593a9cc860e3c2819808ef08faab1b9a48009

Parents:

a97ac01c3b64767f26ac2bbccd84652d536f371ddcd92ddcba49d3aa5461148604e8d6f4e99d4625

Message:

Merge pull request #416 from steenpass/defer_shutdown_sw

chg: defer shutdown in slCleanUp() and slKill()

File:

• Singular/links/silink.cc (modified) (3 diffs)

Singular/links/silink.cc

@@ -31 +31 @@
 #include <coeffs/numbers.h>
 #include <misc/intvec.h>
+#include <Singular/cntrlc.h>
 #include <Singular/links/ssiLink.h>
 #include <Singular/links/pipeLink.h>
@@ -131 +132 @@
 void slCleanUp(si_link l)
 {
+  defer_shutdown++;
   (l->ref)--;
   if (l->ref == 0)
@@ -143 +145 @@
     memset((void *) l, 0, sizeof(ip_link));
   }
+  defer_shutdown--;
+  if (!defer_shutdown && do_shutdown) m2_end(1);
 }
 
 void slKill(si_link l)
 {
+  defer_shutdown++;
   slCleanUp(l);
   if ((l!=NULL) &&(l->ref == 0))
     omFreeBin((ADDRESS)l,  ip_link_bin);
+  defer_shutdown--;
+  if (!defer_shutdown && do_shutdown) m2_end(1);
 }