Changeset 17ee4f in git

Timestamp:

Dec 11, 2006, 2:11:05 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

1ddaae5ab6230a5ca1740626e4a3908a7220bd03

Parents:

492402e6e9d1f13b7d91c1ebb61b1251f1a62707

Message:

*hannes: fixed watchdog


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

File:

• Singular/LIB/general.lib (modified) (4 diffs)

Singular/LIB/general.lib

@@ -3 +3 @@
 //eric, added absValue 11.04.2002
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: general.lib,v 1.52 2006-11-16 14:57:17 Singular Exp $";
+version="$Id: general.lib,v 1.53 2006-12-11 13:11:05 Singular Exp $";
 category="General purpose";
 info="
@@ -1158 +1158 @@
 {
   string rname=nameof(basering);
+  def rsave=basering;
   if (defined(watchdog_rneu))
   {
@@ -1201 +1202 @@
         {
           def watchdog_rneu=basering;
+          setring rsave;
+          if (!defined(result))
+          {
+            def result=fetch(watchdog_rneu,result);
+          }
         }
         if(defined(watchdog_interrupt))
@@ -1218 +1224 @@
         close(l_fork);
         j = system("sh","kill " + string(pid));
-      }
-      if (defined(watchdog_rneu))
-      {
-        keepring watchdog_rneu;
       }
       return(result);