Changeset: cd6e8588f88c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/cd6e8588f88c
Modified Files:
gdk/gdk_bbp.c
gdk/gdk_system.c
sql/backends/monet5/sql_scenario.c
sql/storage/store.c
Branch: Aug2024
Log Message:
Merge with Dec2023 branch.
diffs (75 lines):
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,6 +1,6 @@
exports
-HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP&NOT_WIN32?MAL-signatures-hge
-!HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP&NOT_WIN32?MAL-signatures
+HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP&HAVE_CUDF?MAL-signatures-hge
+!HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP&HAVE_CUDF?MAL-signatures
NOT_WIN32?melcheck
mclient-uri
testcondvar
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -4912,6 +4912,7 @@ BBPprintinfo(void)
}
uint32_t nfree = BBP_nfree;
BBPtmunlock();
+ printf("BATs:\n");
if (bats[1][1][1][1][1].nr > 0)
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)
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -145,6 +145,7 @@ GDKlockstatistics(int what)
MT_Lock *l;
int n = 0;
+ printf("Locks:\n");
if (ATOMIC_TAS(&GDKlocklistlock) != 0) {
printf("GDKlocklistlock is set, so cannot access lock list\n");
return;
@@ -285,6 +286,8 @@ dump_threads(void)
{
char buf[1024];
thread_lock();
+ if (!GDK_TRACER_TEST(M_DEBUG, THRD))
+ printf("Threads:\n");
for (struct mtthread *t = mtthreads; t; t = t->next) {
MT_Lock *lk = t->lockwait;
MT_Sema *sm = t->semawait;
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -100,6 +100,7 @@ CLIENTprintinfo(void)
struct tm tm;
MT_lock_set(&mal_contextLock);
+ printf("Clients:\n");
for (Client c = mal_clients; c < mal_clients + MAL_MAXCLIENTS; c++) {
switch (c->mode) {
case RUNCLIENT:
@@ -112,6 +113,9 @@ CLIENTprintinfo(void)
if (c->idle) {
localtime_r(&c->idle, &tm);
strftime(tmbuf, sizeof(tmbuf), ", idle since %F
%H:%M:%S%z", &tm);
+ } else if (c->lastcmd) {
+ localtime_r(&c->lastcmd, &tm);
+ strftime(tmbuf, sizeof(tmbuf), ", busy since %F
%H:%M:%S%z", &tm);
} else
tmbuf[0] = 0;
if (c->sqlcontext && ((backend *) c->sqlcontext)->mvc
&& ((backend *) c->sqlcontext)->mvc->session && ((backend *)
c->sqlcontext)->mvc->session->tr && ((backend *)
c->sqlcontext)->mvc->session->tr->active)
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -7479,6 +7479,7 @@ void
store_printinfo(sqlstore *store)
{
MT_lock_set(&store->commit);
+ printf("WAL:\n");
printf("SQL store oldest pending "ULLFMT"\n", store->oldest_pending);
log_printinfo(store->logger);
MT_lock_unset(&store->commit);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
