Changeset: cddf66243e20 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cddf66243e20
Modified Files:
gdk/gdk_bbp.c
Branch: Feb2013
Log Message:
Simplify code.
diffs (29 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2163,17 +2163,18 @@ decref(bat i, int logical, int releaseSh
if (lock)
MT_lock_unset(&GDKswapLock(i), "BBPdecref");
- if (swap) {
- int destroy = BBP_lrefs(i) == 0 && (BBP_status(i) & BBPDELETED)
== 0;
-
- if (b && destroy) {
- BBPdestroy(b); /* free memory (if loaded) and delete
from disk (if transient but saved) */
- } else if (b) {
+ if (swap && b != NULL) {
+ if (BBP_lrefs(i) == 0 && (BBP_status(i) & BBPDELETED) == 0) {
+ /* free memory (if loaded) and delete from
+ * disk (if transient but saved) */
+ BBPdestroy(b);
+ } else {
BATDEBUG {
mnstr_printf(GDKstdout, "#BBPdecref unload and
free bat %d\n", i);
}
BBP_unload_inc(i, "BBPdecref");
- if (BBPfree(b, "BBPdecref")) /* free memory of
transient */
+ /* free memory of transient */
+ if (BBPfree(b, "BBPdecref"))
return -1; /* indicate failure */
}
}
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
