Changeset e1419f in git

Timestamp:

Nov 28, 2014, 1:57:27 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

f9b1126a5463b1a44a811debc3c623b3813acf01

Parents:

ba19a8a94da4931a7c4fb8ea6bc91256251c15ec

Message:

doc: example watchdog, ring-indep.

File:

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

Singular/LIB/general.lib

@@ -924 +924 @@
 "
 {
-  string rname=nameof(basering);
-  def rsave=basering;
+  if (defined(basering))
+  {
+    string rname=nameof(basering);
+    def rsave=basering;
+  }
   if (defined(watchdog_rneu))
   {
@@ -942 +945 @@
     {
       def result = read(l_fork);
-      if (nameof(basering)!=rname)
-      {
-        def watchdog_rneu=basering;
-        setring rsave;
-        if (!defined(result))
+      if (defined(rsave))
+      {
+        if (nameof(basering)!=rname)
         {
-          def result=fetch(watchdog_rneu,result);
+          def watchdog_rneu=basering;
+          setring rsave;
+          if (!defined(result))
+          {
+            def result=fetch(watchdog_rneu,result);
+          }
         }
       }
@@ -975 +981 @@
 example
 { "EXAMPLE:"; echo=2;
-  watchdog(1,"system(\"sh\",\"sleep 5\")");
-  watchdog(10,"system(\"sh\",\"sleep 5\")");
+  proc sleep(int s) {return(system("sh","sleep "+string(s)));}
+  watchdog(1,"sleep(5)");
+  watchdog(10,"sleep(5)");
 }
 ///////////////////////////////////////////////////////////////////////////////