Changeset: 8927fef1e0f5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8927fef1e0f5
Modified Files:
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_heap.c
gdk/gdk_tm.c
Branch: Sep2022
Log Message:
Merge with Jan2022 branch.
diffs (52 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -2883,6 +2883,7 @@ PROPdestroy_nolock(BAT *b)
b->tprops = NULL;
while (p) {
n = p->next;
+ assert(p->id != (enum prop_t) 20);
VALclear(&p->v);
GDKfree(p);
p = n;
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1915,6 +1915,12 @@ BBPexit(void)
HEAPdecref(b->tvheap, false);
b->tvheap = NULL;
}
+ if (b->oldtail) {
+ Heap *h = b->oldtail;
+ b->oldtail = NULL;
+ ATOMIC_AND(&h->refs,
~DELAYEDREMOVE);
+ HEAPdecref(h, false);
+ }
PROPdestroy_nolock(b);
MT_lock_unset(&b->theaplock);
BATfree(b);
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -531,7 +531,11 @@ GDKupgradevarheap(BAT *b, var_t v, BUN c
b->theap = new;
if (BBP_status(bid) & (BBPEXISTING|BBPDELETED) && b->oldtail == NULL) {
b->oldtail = old;
- ATOMIC_OR(&old->refs, DELAYEDREMOVE);
+ if ((ATOMIC_OR(&old->refs, DELAYEDREMOVE) & HEAPREFS) == 1) {
+ /* we have the only reference, we can free the
+ * memory */
+ HEAPfree(old, false);
+ }
} else {
ValPtr p = BATgetprop_nolock(b, (enum prop_t) 20);
HEAPdecref(old, p == NULL || strcmp(((Heap*)
p->val.pval)->filename, old->filename) != 0);
@@ -620,7 +624,7 @@ HEAPdecref(Heap *h, bool remove)
GDKfree(h);
break;
case 1:
- if (ATOMIC_GET(&h->refs) & DELAYEDREMOVE) {
+ if (refs & DELAYEDREMOVE) {
/* only reference left is b->oldtail */
HEAPfree(h, false);
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
