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


Ignore:
Timestamp:
Nov 7, 2013, 11:56:18 AM (9 years ago)
Author:
Andreas Steenpass <steenpass@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '2234726c50d679d6664181a5c72f75a6fd64a787')
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:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/links/silink.cc

    r823679 rdcd92d  
    3131#include <coeffs/numbers.h>
    3232#include <misc/intvec.h>
     33#include <Singular/cntrlc.h>
    3334#include <Singular/links/ssiLink.h>
    3435#include <Singular/links/pipeLink.h>
     
    131132void slCleanUp(si_link l)
    132133{
     134  defer_shutdown++;
    133135  (l->ref)--;
    134136  if (l->ref == 0)
     
    143145    memset((void *) l, 0, sizeof(ip_link));
    144146  }
     147  defer_shutdown--;
     148  if (!defer_shutdown && do_shutdown) m2_end(1);
    145149}
    146150
    147151void slKill(si_link l)
    148152{
     153  defer_shutdown++;
    149154  slCleanUp(l);
    150155  if ((l!=NULL) &&(l->ref == 0))
    151156    omFreeBin((ADDRESS)l,  ip_link_bin);
     157  defer_shutdown--;
     158  if (!defer_shutdown && do_shutdown) m2_end(1);
    152159}
    153160
Note: See TracChangeset for help on using the changeset viewer.