Changeset b2a49b in git

Timestamp:

Sep 27, 1999, 7:54:57 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a6312edfb1f70ae85db1956e81afaabf54b79df1

Parents:

793a4da836b9a776100b320e7295d47093670104

Message:

*hannes: cannot kill proc which are in use


git-svn-id: file:///usr/local/Singular/svn/trunk@3686 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• LIB/general.lib (modified) (2 diffs)
• ipid.cc (modified) (4 diffs)
• subexpr.h (modified) (2 diffs)

Singular/LIB/general.lib

@@ -1 @@
-// $Id: general.lib,v 1.20 1999-09-23 12:13:38 Singular Exp $
+// $Id: general.lib,v 1.21 1999-09-27 17:54:57 Singular Exp $
 //GMG, last modified 18.6.99
 ///////////////////////////////////////////////////////////////////////////////
 
-version="$Id: general.lib,v 1.20 1999-09-23 12:13:38 Singular Exp $";
+version="$Id: general.lib,v 1.21 1999-09-27 17:54:57 Singular Exp $";
 info="
 LIBRARY:  general.lib   PROCEDURES OF GENERAL TYPE
@@ -434 +434 @@
           for ( joni=size(L); joni>0; joni-- )
           {
-             if( L[joni]=="LIB" or typeof(`L[joni]`)=="proc" )
+             if((L[joni]!="killall") and (L[joni]=="LIB" or typeof(`L[joni]`)=="proc"))
                { kill `L[joni]`; }
           }

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.33 1999-07-06 13:35:32 Singular Exp $ */
+/* $Id: ipid.cc,v 1.34 1999-09-27 17:54:55 Singular Exp $ */
 
 /*
@@ -210 +210 @@
   tmp.name=IDID(this);
   return tmp.String();
-}  
-
+}
 
 //#define KAI
@@ -479 +478 @@
   else if (IDTYP(h) == PROC_CMD)
   {
-    piKill(IDPROC(h));
+    if (piKill(IDPROC(h))) return;
   }
   // number -------------------------------------------------------------
@@ -722 +721 @@
 }
 
-void piKill(procinfov pi)
-{
+BOOLEAN piKill(procinfov pi)
+{
+  Voice *p=currentVoice;
+  while (p!=NULL)
+  {
+    if (p->pi==pi)
+    {
+      Warn("`%s` in use, can not be killed",pi->procname);
+      return TRUE;
+    }
+    p=p->next;
+  }
   piCleanUp(pi);
   if (pi->ref <= 0)
     Free((ADDRESS)pi, sizeof(procinfo));
+  return FALSE;
 }
 

Singular/subexpr.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: subexpr.h,v 1.21 1999-09-17 11:42:26 Singular Exp $ */
+/* $Id: subexpr.h,v 1.22 1999-09-27 17:54:56 Singular Exp $ */
 /*
 * ABSTRACT: handling of leftv
@@ -155 +155 @@
   return pi;
 }
-void piKill(procinfov l);
+BOOLEAN piKill(procinfov l);
 char *piProcinfo(procinfov pi, char *request);
 void piShowProcinfo(procinfov pi, char *txt);