Changeset b51d2c in git for kernel

Timestamp:

Oct 12, 2012, 4:54:01 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

32cb7abb6be173de1a4100da7c33149f547b752f

Parents:

e2c21a2830ff139bc7175101732d2b833c240e49

Message:

fix: interred (tr. #456, master) qring+redSB

File:

• kernel/kstd1.cc (modified) (2 diffs)

kernel/kstd1.cc

@@ -2743 +2743 @@
     idDelete(&FF);
     null=idInit(1,1);
-    res1=kNF(null,Q,res);
+    if (need_retry) 
+      res1=kNF(null,Q,res,0,KSTD_NF_LAZY); 
+    else 
+      res1=kNF(null,Q,res); 
     idDelete(&res);
     res=res1;
-  }
+    need_retry=1;
+  }
+  if (idElem(res)<=1) need_retry=0;
   while (need_retry && (counter>0))
   {
@@ -2757 +2762 @@
     elems = new_elems;
     idDelete(&res);
+    if (idElem(res1)<=1) need_retry=0;
     if ((Q!=NULL) && (TEST_OPT_REDSB))
     {
-      res=kNF(null,Q,res1);
+      if (need_retry)
+        res=kNF(null,Q,res1,0,KSTD_NF_LAZY);
+      else
+        res=kNF(null,Q,res1);
       idDelete(&res1);
     }
     else
       res = res1;
+    if (idElem(res)<=1) need_retry=0;
   }
   if (null!=NULL) idDelete(&null);