MonetDB: Jun2010 - merge with Feb2010: more reference counting f...

[Stefan Manegold]

Changeset: ac002b82f1da for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ac002b82f1da
Modified Files:
        MonetDB5/src/modules/kernel/batcalc.mx
Branch: Jun2010
Log Message:

merge with Feb2010: more reference counting fixes


diffs (69 lines):

diff -r 213d33113b88 -r ac002b82f1da MonetDB5/src/modules/kernel/batcalc.mx
--- a/MonetDB5/src/modules/kernel/batcalc.mx    Sat Jun 19 21:09:04 2010 +0200
+++ b/MonetDB5/src/modules/kernel/batcalc.mx    Sun Jun 20 11:47:59 2010 +0200
@@ -734,8 +734,10 @@
     }
 
        BBPkeepref(*ret = bn->batCacheid);
-       BBPreleaseref(b->batCacheid);
-       BBPreleaseref(right->batCacheid);
+       if (b != bn)
+               BBPreleaseref(b->batCacheid);
+       if (right != bn)
+               BBPreleaseref(right->batCacheid);
        return res;
 }
 
@@ -788,7 +790,8 @@
         bn = r;
     }
        BBPkeepref(*ret = bn->batCacheid);
-       BBPreleaseref(b->batCacheid);
+       if (b != bn)
+               BBPreleaseref(b->batCacheid);
        return res;
 }
 
@@ -837,7 +840,8 @@
         bn = r;
     }
        BBPkeepref(*ret = bn->batCacheid);
-       BBPreleaseref(b->batCacheid);
+       if (b != bn)
+               BBPreleaseref(b->batCacheid);
        return res;
 }
 @-
@@ -1017,8 +1021,10 @@
        msg = batac...@2_@3...@4_@5(bn,b,right);
 
        BBPkeepref(*ret = bn->batCacheid);
-       BBPreleaseref(b->batCacheid);
-       BBPreleaseref(right->batCacheid);
+       if (b != bn)
+               BBPreleaseref(b->batCacheid);
+       if (right != bn)
+               BBPreleaseref(right->batCacheid);
        return msg;
 }
 
@@ -1070,7 +1076,8 @@
        if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ); 
 
        BBPkeepref(*ret = bn->batCacheid);
-       BBPreleaseref(b->batCacheid);
+       if (b != bn)
+               BBPreleaseref(b->batCacheid);
        return MAL_SUCCEED;
 }
 
@@ -1122,7 +1129,8 @@
        if (!(bn->batDirty&2)) bn = BATsetaccess(bn, BAT_READ); 
 
        BBPkeepref(*ret = bn->batCacheid);
-       BBPreleaseref(b->batCacheid);
+       if (b != bn)
+               BBPreleaseref(b->batCacheid);
        return MAL_SUCCEED;
 }
 @c
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list