Changeset dcd92d in git for Singular

Timestamp:

Nov 7, 2013, 11:56:18 AM (10 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b38f8137dbcaf7b468232f449c1346a88a9cc6fd

Parents:

823679a657c538153cba3a477bf92e2c9102c451

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-11-07 11:56:18+01:00

git-committer:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-11-07 12:08:11+01:00

Message:

chg: defer shutdown in slCleanUp() and slKill()
(cherry picked from commit 147e86a78bc224078ef082c481a0eed0a8600d7f)

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

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