Changeset: 83d4955ab8cc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/83d4955ab8cc Branch: default Log Message:
Merge with Dec2025 branch. diffs (51 lines): diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -46,7 +46,7 @@ 4. **Irresponsible communication.** Fail Tensions can occur between community members even when they are trying their best to collaborate. Not every conflict represents a code of conduct violation, and this Code of Conduct reinforces encouraged behaviors and norms that can help avoid conflicts and minimize harm. -When an incident does occur, it is important to report it promptly. To report a possible violation, you can send an email to [email protected] (a small group of people) or [email protected] (one person). +When an incident does occur, it is important to report it promptly. To report a possible violation, you can send an email to [email protected]. Community Moderators take reports of violations seriously and will make every effort to respond in a timely manner. They will investigate all reports of code of conduct violations, reviewing messages, logs, and recordings, or interviewing witnesses and other participants. Community Moderators will keep investigation and enforcement actions as transparent as possible while prioritizing safety and confidentiality. In order to honor these values, enforcement actions are carried out in private with the involved parties, but communicating to the whole community may be part of a mutually agreed upon resolution. diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c --- a/gdk/gdk_bbp.c +++ b/gdk/gdk_bbp.c @@ -1637,6 +1637,8 @@ BBPtrim(bool aggressive, bat nbat) int waitctr = 0; bool changed = false; unsigned flag = BBPUNLOADING | BBPSYNCING | BBPSAVING; + size_t mem = 0; + if (!aggressive) flag |= BBPHOT; lng t0 = GDKusec(); @@ -1667,6 +1669,8 @@ BBPtrim(bool aggressive, bat nbat) BBP_status_on(bid, BBPUNLOADING); swap = true; waitctr += BATdirty(b) ? 9 : 1; + mem += HEAPvmsize(b->theap); + mem += HEAPvmsize(b->tvheap); } MT_lock_unset(&b->theaplock); } @@ -1686,7 +1690,7 @@ BBPtrim(bool aggressive, bat nbat) } } if (n > 0) - TRC_INFO(BAT, "unloaded %d bats in "LLFMT" usec%s\n", n, GDKusec() - t0, aggressive ? " (also hot)" : ""); + TRC_INFO(BAT, "unloaded %d bats, %zu%s bytes in "LLFMT" usec%s\n", n, mem, humansize(mem, (char[24]){0}, 24), GDKusec() - t0, aggressive ? " (also hot)" : ""); return changed; } @@ -1717,7 +1721,7 @@ BBPmanager(void *dummy) return; } MT_thread_setworking("BBPtrim"); - changed = BBPtrim(false, nbat); + changed = BBPtrim(GDKvm_cursize() > (size_t) (GDK_vm_maxsize * 0.8), nbat); MT_thread_setworking("BBPcallbacks"); BBPcallbacks(); if (GDKexiting()) _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
