MonetDB: Jul2021 - Get ref count inside lock.

[Sjoerd Mullender]

Changeset: 9841d27bcb7b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9841d27bcb7b
Modified Files:
        gdk/gdk_bbp.c
Branch: Jul2021
Log Message:

Get ref count inside lock.


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
@@ -2287,7 +2287,7 @@ BBPshare(bat parent)
 static inline int
 decref(bat i, bool logical, bool releaseShare, bool lock, const char *func)
 {
-       int refs = 0;
+       int refs = 0, lrefs;
        bool swap = false;
        bat tp = 0, tvp = 0;
        BAT *b;
@@ -2373,6 +2373,7 @@ decref(bat i, bool logical, bool release
                BBP_status_on(i, BBPUNLOADING);
                swap = true;
        }
+       lrefs = BBP_lrefs(i);
 
        /* unlock before re-locking in unload; as saving a dirty
         * persistent bat may take a long time */
@@ -2380,7 +2381,7 @@ decref(bat i, bool logical, bool release
                MT_lock_unset(&GDKswapLock(i));
 
        if (swap && b != NULL) {
-               if (BBP_lrefs(i) == 0 && (BBP_status(i) & BBPDELETED) == 0) {
+               if (lrefs == 0 && (BBP_status(i) & BBPDELETED) == 0) {
                        /* free memory (if loaded) and delete from
                         * disk (if transient but saved) */
                        BBPdestroy(b);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list