[Monetdb-pf-checkins] pathfinder/runtime ll_staircasejoin.mx, PF_ROX, 1.61.4.1, 1.61.4.2 ws_step_down.mx, PF_ROX, 1.1.2.3, 1.1.2.4

[Stefan Manegold]

Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6917/runtime

Modified Files:
      Tag: PF_ROX
        ll_staircasejoin.mx ws_step_down.mx 
Log Message:

perform stack sanity check
only in case we did not stop result generations
prematurely due to reaching a result size limit (cutoff)


Index: ws_step_down.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/Attic/ws_step_down.mx,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- ws_step_down.mx     20 Feb 2008 00:41:47 -0000      1.1.2.3
+++ ws_step_down.mx     20 Feb 2008 13:25:30 -0000      1.1.2.4
@@ -890,9 +890,11 @@
 @c
 
     GDKfree(stack);
-    for ( i=0; i<num_iters; i++ ) {
-        if (onstack_get(i)) {
-            GDKwarning("ws_descendant: iter %d still on stack !??\n", i + 
min_iter);
+    if (free > 0) {
+        for ( i=0; i<num_iters; i++ ) {
+            if (onstack_get(i)) {
+                GDKwarning("ws_descendant: iter %d still on stack !??\n", i + 
min_iter);
+            }
         }
     }
     GDKfree(onstack);

Index: ll_staircasejoin.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/ll_staircasejoin.mx,v
retrieving revision 1.61.4.1
retrieving revision 1.61.4.2
diff -u -d -r1.61.4.1 -r1.61.4.2
--- ll_staircasejoin.mx 20 Feb 2008 08:57:37 -0000      1.61.4.1
+++ ll_staircasejoin.mx 20 Feb 2008 13:25:30 -0000      1.61.4.2
@@ -956,9 +956,11 @@
 @c
 
     GDKfree(stack);
-    for ( i=0; i<num_iters; i++ ) {
-        if (onstack_get(i)) {
-            GDKwarning("ll_descendant: iter %d still on stack !??\n", i + 
min_iter);
+    if (free > 0) {
+        for ( i=0; i<num_iters; i++ ) {
+            if (onstack_get(i)) {
+                GDKwarning("ll_descendant: iter %d still on stack !??\n", i + 
min_iter);
+            }
         }
     }
     GDKfree(onstack);


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
Monetdb-pf-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins