Changeset: 34afc0a9c3bd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/34afc0a9c3bd
Modified Files:
        gdk/gdk_bbp.c
Branch: Dec2023
Log Message:

Put hot/cold category at end.


diffs (114 lines):

diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -4927,7 +4927,7 @@ BBPprintinfo(void)
                                nbats++;
                                MT_lock_set(&b->theaplock);
                                ATOMIC_BASE_TYPE status = BBP_status(i);
-                               struct counters *bt = &bats[r > 
0][BATdirty(b)][(status & BBPPERSISTENT) != 0][(status & BBPHOT) != 0][(status 
& BBPLOADED) != 0];
+                               struct counters *bt = &bats[r > 
0][BATdirty(b)][(status & BBPPERSISTENT) != 0][(status & BBPLOADED) != 
0][(status & BBPHOT) != 0];
                                bt->nr++;
                                bt->sz += HEAPmemsize(b->theap) + 
HEAPmemsize(b->tvheap);
                                bt->vmsz += HEAPvmsize(b->theap) + 
HEAPvmsize(b->tvheap);
@@ -4939,69 +4939,69 @@ BBPprintinfo(void)
        uint32_t nfree = BBP_nfree;
        BBPtmunlock();
        if (bats[1][1][1][1][1].nr > 0)
-               printf("fix, dirty, persistent, hot, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][1][1][1].nr, bats[1][1][1][1][1].vmsz, 
bats[1][1][1][1][1].sz);
+               printf("fix, dirty, persistent, loaded, hot: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][1][1][1].nr, bats[1][1][1][1][1].vmsz, 
bats[1][1][1][1][1].sz);
        if (bats[1][1][1][1][0].nr > 0)
-               printf("fix, dirty, persistent, hot, not loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][1][1][0].nr, bats[1][1][1][1][0].vmsz, 
bats[1][1][1][1][0].sz);
+               printf("fix, dirty, persistent, not loaded, hot: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][1][1][0].nr, bats[1][1][1][1][0].vmsz, 
bats[1][1][1][1][0].sz);
        if (bats[1][1][1][0][1].nr > 0)
-               printf("fix, dirty, persistent, cold, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][1][0][1].nr, bats[1][1][1][0][1].vmsz, 
bats[1][1][1][0][1].sz);
+               printf("fix, dirty, persistent, loaded, cold: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][1][0][1].nr, bats[1][1][1][0][1].vmsz, 
bats[1][1][1][0][1].sz);
        if (bats[1][1][1][0][0].nr > 0)
-               printf("fix, dirty, persistent, cold, not loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][1][0][0].nr, bats[1][1][1][0][0].vmsz, 
bats[1][1][1][0][0].sz);
+               printf("fix, dirty, persistent, not loaded, cold: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][1][0][0].nr, bats[1][1][1][0][0].vmsz, 
bats[1][1][1][0][0].sz);
        if (bats[1][1][0][1][1].nr > 0)
-               printf("fix, dirty, transient, hot, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][0][1][1].nr, bats[1][1][0][1][1].vmsz, 
bats[1][1][0][1][1].sz);
+               printf("fix, dirty, transient, loaded, hot: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][0][1][1].nr, bats[1][1][0][1][1].vmsz, 
bats[1][1][0][1][1].sz);
        if (bats[1][1][0][1][0].nr > 0)
-               printf("fix, dirty, transient, hot, not loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][0][1][0].nr, bats[1][1][0][1][0].vmsz, 
bats[1][1][0][1][0].sz);
+               printf("fix, dirty, transient, not loaded, hot: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][0][1][0].nr, bats[1][1][0][1][0].vmsz, 
bats[1][1][0][1][0].sz);
        if (bats[1][1][0][0][1].nr > 0)
-               printf("fix, dirty, transient, cold, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][0][0][1].nr, bats[1][1][0][0][1].vmsz, 
bats[1][1][0][0][1].sz);
+               printf("fix, dirty, transient, loaded, cold: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][0][0][1].nr, bats[1][1][0][0][1].vmsz, 
bats[1][1][0][0][1].sz);
        if (bats[1][1][0][0][0].nr > 0)
-               printf("fix, dirty, transient, cold, not loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][0][0][0].nr, bats[1][1][0][0][0].vmsz, 
bats[1][1][0][0][0].sz);
+               printf("fix, dirty, transient, not loaded, cold: %d bats, %zu 
virtual, %zu malloc\n", bats[1][1][0][0][0].nr, bats[1][1][0][0][0].vmsz, 
bats[1][1][0][0][0].sz);
        if (bats[1][0][1][1][1].nr > 0)
-               printf("fix, clean, persistent, hot, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][1][1][1].nr, bats[1][0][1][1][1].vmsz, 
bats[1][0][1][1][1].sz);
+               printf("fix, clean, persistent, loaded, hot: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][1][1][1].nr, bats[1][0][1][1][1].vmsz, 
bats[1][0][1][1][1].sz);
        if (bats[1][0][1][1][0].nr > 0)
-               printf("fix, clean, persistent, hot, not loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][1][1][0].nr, bats[1][0][1][1][0].vmsz, 
bats[1][0][1][1][0].sz);
+               printf("fix, clean, persistent, not loaded, hot: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][1][1][0].nr, bats[1][0][1][1][0].vmsz, 
bats[1][0][1][1][0].sz);
        if (bats[1][0][1][0][1].nr > 0)
-               printf("fix, clean, persistent, cold, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][1][0][1].nr, bats[1][0][1][0][1].vmsz, 
bats[1][0][1][0][1].sz);
+               printf("fix, clean, persistent, loaded, cold: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][1][0][1].nr, bats[1][0][1][0][1].vmsz, 
bats[1][0][1][0][1].sz);
        if (bats[1][0][1][0][0].nr > 0)
-               printf("fix, clean, persistent, cold, not loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][1][0][0].nr, bats[1][0][1][0][0].vmsz, 
bats[1][0][1][0][0].sz);
+               printf("fix, clean, persistent, not loaded, cold: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][1][0][0].nr, bats[1][0][1][0][0].vmsz, 
bats[1][0][1][0][0].sz);
        if (bats[1][0][0][1][1].nr > 0)
-               printf("fix, clean, transient, hot, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][0][1][1].nr, bats[1][0][0][1][1].vmsz, 
bats[1][0][0][1][1].sz);
+               printf("fix, clean, transient, loaded, hot: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][0][1][1].nr, bats[1][0][0][1][1].vmsz, 
bats[1][0][0][1][1].sz);
        if (bats[1][0][0][1][0].nr > 0)
-               printf("fix, clean, transient, hot, not loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][0][1][0].nr, bats[1][0][0][1][0].vmsz, 
bats[1][0][0][1][0].sz);
+               printf("fix, clean, transient, not loaded, hot: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][0][1][0].nr, bats[1][0][0][1][0].vmsz, 
bats[1][0][0][1][0].sz);
        if (bats[1][0][0][0][1].nr > 0)
-               printf("fix, clean, transient, cold, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][0][0][1].nr, bats[1][0][0][0][1].vmsz, 
bats[1][0][0][0][1].sz);
+               printf("fix, clean, transient, loaded, cold: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][0][0][1].nr, bats[1][0][0][0][1].vmsz, 
bats[1][0][0][0][1].sz);
        if (bats[1][0][0][0][0].nr > 0)
-               printf("fix, clean, transient, cold, not loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][0][0][0].nr, bats[1][0][0][0][0].vmsz, 
bats[1][0][0][0][0].sz);
+               printf("fix, clean, transient, not loaded, cold: %d bats, %zu 
virtual, %zu malloc\n", bats[1][0][0][0][0].nr, bats[1][0][0][0][0].vmsz, 
bats[1][0][0][0][0].sz);
        if (bats[0][1][1][1][1].nr > 0)
-               printf("no fix, dirty, persistent, hot, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[0][1][1][1][1].nr, bats[0][1][1][1][1].vmsz, 
bats[0][1][1][1][1].sz);
+               printf("no fix, dirty, persistent, loaded, hot: %d bats, %zu 
virtual, %zu malloc\n", bats[0][1][1][1][1].nr, bats[0][1][1][1][1].vmsz, 
bats[0][1][1][1][1].sz);
        if (bats[0][1][1][1][0].nr > 0)
-               printf("no fix, dirty, persistent, hot, not loaded: %d bats, 
%zu virtual, %zu malloc\n", bats[0][1][1][1][0].nr, bats[0][1][1][1][0].vmsz, 
bats[0][1][1][1][0].sz);
+               printf("no fix, dirty, persistent, not loaded, hot: %d bats, 
%zu virtual, %zu malloc\n", bats[0][1][1][1][0].nr, bats[0][1][1][1][0].vmsz, 
bats[0][1][1][1][0].sz);
        if (bats[0][1][1][0][1].nr > 0)
-               printf("no fix, dirty, persistent, cold, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[0][1][1][0][1].nr, bats[0][1][1][0][1].vmsz, 
bats[0][1][1][0][1].sz);
+               printf("no fix, dirty, persistent, loaded, cold: %d bats, %zu 
virtual, %zu malloc\n", bats[0][1][1][0][1].nr, bats[0][1][1][0][1].vmsz, 
bats[0][1][1][0][1].sz);
        if (bats[0][1][1][0][0].nr > 0)
-               printf("no fix, dirty, persistent, cold, not loaded: %d bats, 
%zu virtual, %zu malloc\n", bats[0][1][1][0][0].nr, bats[0][1][1][0][0].vmsz, 
bats[0][1][1][0][0].sz);
+               printf("no fix, dirty, persistent, not loaded, cold: %d bats, 
%zu virtual, %zu malloc\n", bats[0][1][1][0][0].nr, bats[0][1][1][0][0].vmsz, 
bats[0][1][1][0][0].sz);
        if (bats[0][1][0][1][1].nr > 0)
-               printf("no fix, dirty, transient, hot, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[0][1][0][1][1].nr, bats[0][1][0][1][1].vmsz, 
bats[0][1][0][1][1].sz);
+               printf("no fix, dirty, transient, loaded, hot: %d bats, %zu 
virtual, %zu malloc\n", bats[0][1][0][1][1].nr, bats[0][1][0][1][1].vmsz, 
bats[0][1][0][1][1].sz);
        if (bats[0][1][0][1][0].nr > 0)
-               printf("no fix, dirty, transient, hot, not loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[0][1][0][1][0].nr, bats[0][1][0][1][0].vmsz, 
bats[0][1][0][1][0].sz);
+               printf("no fix, dirty, transient, not loaded, hot: %d bats, %zu 
virtual, %zu malloc\n", bats[0][1][0][1][0].nr, bats[0][1][0][1][0].vmsz, 
bats[0][1][0][1][0].sz);
        if (bats[0][1][0][0][1].nr > 0)
-               printf("no fix, dirty, transient, cold, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[0][1][0][0][1].nr, bats[0][1][0][0][1].vmsz, 
bats[0][1][0][0][1].sz);
+               printf("no fix, dirty, transient, loaded, cold: %d bats, %zu 
virtual, %zu malloc\n", bats[0][1][0][0][1].nr, bats[0][1][0][0][1].vmsz, 
bats[0][1][0][0][1].sz);
        if (bats[0][1][0][0][0].nr > 0)
-               printf("no fix, dirty, transient, cold, not loaded: %d bats, 
%zu virtual, %zu malloc\n", bats[0][1][0][0][0].nr, bats[0][1][0][0][0].vmsz, 
bats[0][1][0][0][0].sz);
+               printf("no fix, dirty, transient, not loaded, cold: %d bats, 
%zu virtual, %zu malloc\n", bats[0][1][0][0][0].nr, bats[0][1][0][0][0].vmsz, 
bats[0][1][0][0][0].sz);
        if (bats[0][0][1][1][1].nr > 0)
-               printf("no fix, clean, persistent, hot, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[0][0][1][1][1].nr, bats[0][0][1][1][1].vmsz, 
bats[0][0][1][1][1].sz);
+               printf("no fix, clean, persistent, loaded, hot: %d bats, %zu 
virtual, %zu malloc\n", bats[0][0][1][1][1].nr, bats[0][0][1][1][1].vmsz, 
bats[0][0][1][1][1].sz);
        if (bats[0][0][1][1][0].nr > 0)
-               printf("no fix, clean, persistent, hot, not loaded: %d bats, 
%zu virtual, %zu malloc\n", bats[0][0][1][1][0].nr, bats[0][0][1][1][0].vmsz, 
bats[0][0][1][1][0].sz);
+               printf("no fix, clean, persistent, not loaded, hot: %d bats, 
%zu virtual, %zu malloc\n", bats[0][0][1][1][0].nr, bats[0][0][1][1][0].vmsz, 
bats[0][0][1][1][0].sz);
        if (bats[0][0][1][0][1].nr > 0)
-               printf("no fix, clean, persistent, cold, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[0][0][1][0][1].nr, bats[0][0][1][0][1].vmsz, 
bats[0][0][1][0][1].sz);
+               printf("no fix, clean, persistent, loaded, cold: %d bats, %zu 
virtual, %zu malloc\n", bats[0][0][1][0][1].nr, bats[0][0][1][0][1].vmsz, 
bats[0][0][1][0][1].sz);
        if (bats[0][0][1][0][0].nr > 0)
-               printf("no fix, clean, persistent, cold, not loaded: %d bats, 
%zu virtual, %zu malloc\n", bats[0][0][1][0][0].nr, bats[0][0][1][0][0].vmsz, 
bats[0][0][1][0][0].sz);
+               printf("no fix, clean, persistent, not loaded, cold: %d bats, 
%zu virtual, %zu malloc\n", bats[0][0][1][0][0].nr, bats[0][0][1][0][0].vmsz, 
bats[0][0][1][0][0].sz);
        if (bats[0][0][0][1][1].nr > 0)
-               printf("no fix, clean, transient, hot, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[0][0][0][1][1].nr, bats[0][0][0][1][1].vmsz, 
bats[0][0][0][1][1].sz);
+               printf("no fix, clean, transient, loaded, hot: %d bats, %zu 
virtual, %zu malloc\n", bats[0][0][0][1][1].nr, bats[0][0][0][1][1].vmsz, 
bats[0][0][0][1][1].sz);
        if (bats[0][0][0][1][0].nr > 0)
-               printf("no fix, clean, transient, hot, not loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[0][0][0][1][0].nr, bats[0][0][0][1][0].vmsz, 
bats[0][0][0][1][0].sz);
+               printf("no fix, clean, transient, not loaded, hot: %d bats, %zu 
virtual, %zu malloc\n", bats[0][0][0][1][0].nr, bats[0][0][0][1][0].vmsz, 
bats[0][0][0][1][0].sz);
        if (bats[0][0][0][0][1].nr > 0)
-               printf("no fix, clean, transient, cold, loaded: %d bats, %zu 
virtual, %zu malloc\n", bats[0][0][0][0][1].nr, bats[0][0][0][0][1].vmsz, 
bats[0][0][0][0][1].sz);
+               printf("no fix, clean, transient, loaded, cold: %d bats, %zu 
virtual, %zu malloc\n", bats[0][0][0][0][1].nr, bats[0][0][0][0][1].vmsz, 
bats[0][0][0][0][1].sz);
        if (bats[0][0][0][0][0].nr > 0)
-               printf("no fix, clean, transient, cold, not loaded: %d bats, 
%zu virtual, %zu malloc\n", bats[0][0][0][0][0].nr, bats[0][0][0][0][0].vmsz, 
bats[0][0][0][0][0].sz);
+               printf("no fix, clean, transient, not loaded, cold: %d bats, 
%zu virtual, %zu malloc\n", bats[0][0][0][0][0].nr, bats[0][0][0][0][0].vmsz, 
bats[0][0][0][0][0].sz);
 
        printf("%d bats total, %d in use, %"PRIu32" free bats in common shared 
list\n",
               sz - 1, nbats, nfree);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to