Changeset: 8e992b126fa3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8e992b126fa3
Modified Files:
gdk/gdk_imprints.c
gdk/gdk_system.c
Branch: Jun2020
Log Message:
Debugger only functions should write to stderr.
diffs (123 lines):
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -713,6 +713,7 @@ IMPSfree(BAT *b)
s[j] = '\0'; \
} while (0)
+/* function used for debugging */
void
IMPSprint(BAT *b)
{
@@ -726,7 +727,7 @@ IMPSprint(BAT *b)
int i;
if (!BATcheckimprints(b)) {
- TRC_DEBUG(ACCELERATOR, "No imprint\n");
+ fprintf(stderr, "No imprint\n");
return;
}
imprints = b->timprints;
@@ -735,33 +736,33 @@ IMPSprint(BAT *b)
max_bins = min_bins + 64;
cnt_bins = max_bins + 64;
- TRC_DEBUG(ACCELERATOR,
- "bits = %d, impcnt = " BUNFMT ", dictcnt = " BUNFMT "\n",
- imprints->bits, imprints->impcnt, imprints->dictcnt);
- TRC_DEBUG(ACCELERATOR, "MIN\n");
+ fprintf(stderr,
+ "bits = %d, impcnt = " BUNFMT ", dictcnt = " BUNFMT "\n",
+ imprints->bits, imprints->impcnt, imprints->dictcnt);
+ fprintf(stderr, "MIN\n");
for (i = 0; i < imprints->bits; i++) {
- TRC_DEBUG(ACCELERATOR, "[ " BUNFMT " ]\n", min_bins[i]);
+ fprintf(stderr, "[ " BUNFMT " ]\n", min_bins[i]);
}
- TRC_DEBUG(ACCELERATOR, "MAX\n");
+ fprintf(stderr, "MAX\n");
for (i = 0; i < imprints->bits; i++) {
- TRC_DEBUG(ACCELERATOR, "[ " BUNFMT " ]\n", max_bins[i]);
+ fprintf(stderr, "[ " BUNFMT " ]\n", max_bins[i]);
}
- TRC_DEBUG(ACCELERATOR, "COUNT\n");
+ fprintf(stderr, "COUNT\n");
for (i = 0; i < imprints->bits; i++) {
- TRC_DEBUG(ACCELERATOR, "[ " BUNFMT " ]\n", cnt_bins[i]);
+ fprintf(stderr, "[ " BUNFMT " ]\n", cnt_bins[i]);
}
for (dcnt = 0, icnt = 0, pages = 1; dcnt < imprints->dictcnt; dcnt++) {
if (d[dcnt].repeat) {
BINSIZE(imprints->bits, IMPSPRNTMASK, " ");
pages += d[dcnt].cnt;
- TRC_DEBUG(ACCELERATOR, "[ " BUNFMT " ]r %s\n", pages,
s);
+ fprintf(stderr, "[ " BUNFMT " ]r %s\n", pages, s);
icnt++;
} else {
l = icnt + d[dcnt].cnt;
for (; icnt < l; icnt++) {
BINSIZE(imprints->bits, IMPSPRNTMASK, " ");
- TRC_DEBUG(ACCELERATOR, "[ " BUNFMT " ] %s\n",
pages++, s);
+ fprintf(stderr, "[ " BUNFMT " ] %s\n",
pages++, s);
}
}
}
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -122,6 +122,7 @@ lock_isset(MT_Lock *l)
return true;
}
+/* function used for debugging */
void
GDKlockstatistics(int what)
{
@@ -129,7 +130,7 @@ GDKlockstatistics(int what)
int n = 0;
if (ATOMIC_TAS(&GDKlocklistlock) != 0) {
- TRC_DEBUG(TEM, "GDKlocklistlock is set, so cannot access lock
list\n");
+ fprintf(stderr, "GDKlocklistlock is set, so cannot access lock
list\n");
return;
}
if (what == -1) {
@@ -142,25 +143,25 @@ GDKlockstatistics(int what)
return;
}
GDKlocklist = sortlocklist(GDKlocklist);
- TRC_DEBUG(TEM, "lock
name\tcount\tcontention\tsleep\tlocked\t(un)locker\tthread\n");
+ fprintf(stderr, "lock
name\tcount\tcontention\tsleep\tlocked\t(un)locker\tthread\n");
for (l = GDKlocklist; l; l = l->next) {
n++;
if (what == 0 ||
(what == 1 && l->count) ||
(what == 2 && ATOMIC_GET(&l->contention)) ||
(what == 3 && lock_isset(l)))
- TRC_DEBUG(TEM, "%-18s\t%zu\t%zu\t%zu\t%s\t%s\t%s\n",
- l->name, l->count,
- (size_t) ATOMIC_GET(&l->contention),
- (size_t) ATOMIC_GET(&l->sleep),
- lock_isset(l) ? "locked" : "",
- l->locker ? l->locker : "",
- l->thread ? l->thread : "");
+ fprintf(stderr, "%-18s\t%zu\t%zu\t%zu\t%s\t%s\t%s\n",
+ l->name, l->count,
+ (size_t) ATOMIC_GET(&l->contention),
+ (size_t) ATOMIC_GET(&l->sleep),
+ lock_isset(l) ? "locked" : "",
+ l->locker ? l->locker : "",
+ l->thread ? l->thread : "");
}
- TRC_DEBUG(TEM, "Number of locks: %d\n", n);
- TRC_DEBUG(TEM, "Total lock count: %zu\n", (size_t)
ATOMIC_GET(&GDKlockcnt));
- TRC_DEBUG(TEM, "Lock contention: %zu\n", (size_t)
ATOMIC_GET(&GDKlockcontentioncnt));
- TRC_DEBUG(TEM, "Lock sleep count: %zu\n", (size_t)
ATOMIC_GET(&GDKlocksleepcnt));
+ fprintf(stderr, "Number of locks: %d\n", n);
+ fprintf(stderr, "Total lock count: %zu\n", (size_t)
ATOMIC_GET(&GDKlockcnt));
+ fprintf(stderr, "Lock contention: %zu\n", (size_t)
ATOMIC_GET(&GDKlockcontentioncnt));
+ fprintf(stderr, "Lock sleep count: %zu\n", (size_t)
ATOMIC_GET(&GDKlocksleepcnt));
ATOMIC_CLEAR(&GDKlocklistlock);
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
