Changeset: b0b96e059a97 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b0b96e059a97
Modified Files:
        gdk/gdk_heap.c
        gdk/gdk_tm.c
Branch: Jul2021
Log Message:

Code cleanup.


diffs (27 lines):

diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -622,7 +622,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);
                }
diff --git a/gdk/gdk_tm.c b/gdk/gdk_tm.c
--- a/gdk/gdk_tm.c
+++ b/gdk/gdk_tm.c
@@ -85,9 +85,9 @@ epilogue(int cnt, bat *subcommit, bool l
                        ValPtr p = BATgetprop_nolock(b, (enum prop_t) 20);
                        if (p != NULL) {
                                Heap *tail = p->val.pval;
-                               assert(BATgetprop_nolock(b, (enum prop_t) 21) 
!= NULL);
                                BATrmprop_nolock(b, (enum prop_t) 20);
-                               ValPtr p = BATgetprop_nolock(b, (enum prop_t) 
21);
+                               p = BATgetprop_nolock(b, (enum prop_t) 21);
+                               assert(p != NULL);
                                Heap *h = p->val.pval;
                                if (h != (Heap *) 1)
                                        HEAPdecref(h, true);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to