Changeset: a4ea03d8d47d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a4ea03d8d47d
Modified Files:
gdk/gdk_aggr.c
gdk/gdk_batop.c
gdk/gdk_hash.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_orderidx.c
gdk/gdk_project.c
gdk/gdk_select.c
gdk/gdk_storage.c
monetdb5/modules/mal/groupby.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/wlc.c
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_mergetable.c
Branch: gdk_tracer
Log Message:
Checkpoint: Replaced /* CHECK */ -> #ifdef #endif
diffs (truncated from 499 to 300 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -897,7 +897,7 @@ BATgroupsum(BAT *b, BAT *g, BAT *e, BAT
/* CHECK */
// This is in ALGODEBUG
- t0 = GDKusec();
+ TRC_DEBUG_IF(ALGO) t0 = GDKusec();
if ((err = BATgroupaggrinit(b, g, e, s, &min, &max, &ngrp, &ci,
&ncand)) != NULL) {
GDKerror("BATgroupsum: %s\n", err);
@@ -972,7 +972,7 @@ BATsum(void *res, int tp, BAT *b, BAT *s
/* CHECK */
// This is in ALGODEBUG
- t0 = GDKusec();
+ TRC_DEBUG_IF(ALGO) t0 = GDKusec();
if ((err = BATgroupaggrinit(b, NULL, NULL, s, &min, &max, &ngrp, &ci,
&ncand)) != NULL) {
GDKerror("BATsum: %s\n", err);
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -508,10 +508,13 @@ BATappend(BAT *b, BAT *n, BAT *s, bool f
/* CHECK */
// The whole if statement is in DEBUG CHECK_
- if (BATttype(b) != BATttype(n) &&
+ TRC_DEBUG_IF(CHECK_)
+ {
+ if (BATttype(b) != BATttype(n) &&
ATOMtype(b->ttype) != ATOMtype(n->ttype)) {
- TRC_DEBUG(CHECK_, "Interpreting %s as %s.\n",
- ATOMname(BATttype(n)),
ATOMname(BATttype(b)));
+ TRC_DEBUG_ENDIF(CHECK_, "Interpreting %s as %s.\n",
+
ATOMname(BATttype(n)), ATOMname(BATttype(b)));
+ }
}
cnt = canditer_init(&ci, n, s);
@@ -1448,7 +1451,7 @@ BATordered(BAT *b)
/* CHECK */
// This is in DEBUGALGO
- t0 = GDKusec();
+ TRC_DEBUG_IF(ALGO) t0 = GDKusec();
if (b->ttype == TYPE_void)
return true;
@@ -1538,7 +1541,7 @@ BATordered_rev(BAT *b)
/* CHECK */
// This is in DEBUGALGO
- t0 = GDKusec();
+ TRC_DEBUG_IF(ALGO) t0 = GDKusec();
if (b == NULL)
return false;
@@ -1637,7 +1640,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
/* CHECK */
// This is in DEBUGALGO
- t0 = GDKusec();
+ TRC_DEBUG_IF(ALGO) t0 = GDKusec();
/* we haven't implemented NILs as largest value for stable
* sort, so NILs come first for ascending and last for
@@ -2097,7 +2100,7 @@ BATconstant(oid hseq, int tailtype, cons
/* CHECK */
// This is in DEBUGALGO
- t0 = GDKusec();
+ TRC_DEBUG_IF(ALGO) t0 = GDKusec();
if (v == NULL)
return NULL;
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -174,11 +174,11 @@ BATcheckhash(BAT *b)
/* but when we want to change it, we need the lock */
/* CHECK */
// This is in ACCELDEBUG
- t = GDKusec();
+ TRC_DEBUG_IF(ACCEL) t = GDKusec();
MT_lock_set(&b->batIdxLock);
/* CHECK */
// This is in ACCELDEBUG
- t = GDKusec() - t;
+ TRC_DEBUG_IF(ACCEL) t = GDKusec() - t;
/* if still 1 now that we have the lock, we can update */
if (b->thash == (Hash *) 1) {
Hash *h;
@@ -268,7 +268,7 @@ BAThashsync(void *arg)
/* CHECK */
// This is in ACCELDEBUG
- t0 = GDKusec();
+ TRC_DEBUG_IF(ACCEL) t0 = GDKusec();
/* we could check whether b->thash == NULL before getting the
* lock, and only lock if it isn't; however, it's very
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -908,8 +908,11 @@ HEAP_empty(Heap *heap, size_t nprivate,
headp->next = 0;
/* CHECK */
// HEAP_printstatus is also in if DEBUG-TRACE
- TRC_DEBUG(TRACE, "We created the following heap\n");
- HEAP_printstatus(heap);
+ TRC_DEBUG_IF(TRACE)
+ {
+ TRC_DEBUG_ENDIF(TRACE, "We created the following heap\n");
+ HEAP_printstatus(heap);
+ }
}
void
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -282,7 +282,7 @@ BATimpsync(void *arg)
/* CHECK */
// This is defined in ACCELDEBUG
- t0 = GDKusec();
+ TRC_DEBUG_IF(ACCEL) t0 = GDKusec();
MT_lock_set(&b->batIdxLock);
if ((imprints = b->timprints) != NULL) {
@@ -379,7 +379,7 @@ BATimprints(BAT *b)
/* CHECK */
// This is defined in ACCELDEBUG
- t0 = GDKusec();
+ TRC_DEBUG_IF(ACCEL) t0 = GDKusec();
if (b->timprints == NULL) {
BUN cnt;
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -3554,7 +3554,7 @@ BATthetajoin(BAT **r1p, BAT **r2p, BAT *
/* CHECK */
// This is in ALGODEBUG
- t0 = GDKusec();
+ TRC_DEBUG_IF(ALGO) t0 = GDKusec();
*r1p = NULL;
if (r2p) {
@@ -3583,7 +3583,7 @@ BATjoin(BAT **r1p, BAT **r2p, BAT *l, BA
/* CHECK */
// This is in ALGODEBUG
- t0 = GDKusec();
+ TRC_DEBUG_IF(ALGO) t0 = GDKusec();
if ((parent = VIEWtparent(l)) != 0) {
BAT *b = BBPdescriptor(parent);
@@ -3765,7 +3765,7 @@ BATbandjoin(BAT **r1p, BAT **r2p, BAT *l
/* CHECK */
// This is in ALGODEBUG
- t0 = GDKusec();
+ TRC_DEBUG_IF(ALGO) t0 = GDKusec();
TRC_DEBUG(ALGO, "BATbandjoin("
"l=" ALGOBATFMT ",r=" ALGOBATFMT ","
@@ -3794,7 +3794,7 @@ BATrangejoin(BAT **r1p, BAT **r2p, BAT *
/* CHECK */
// This is in ALGODEBUG
- t0 = GDKusec();
+ TRC_DEBUG_IF(ALGO) t0 = GDKusec();
*r1p = NULL;
if (r2p) {
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -24,7 +24,7 @@ BATidxsync(void *arg)
/* CHECK */
// This is in ACCEL DEBUG
- t0 = GDKusec();
+ TRC_DEBUG_IF(ACCEL) t0 = GDKusec();
MT_lock_set(&b->batIdxLock);
if ((hp = b->torderidx) != NULL) {
@@ -81,7 +81,7 @@ BATcheckorderidx(BAT *b)
return false;
/* CHECK */
// This is in DEBUG ACCEL
- t = GDKusec();
+ TRC_DEBUG_IF(ACCEL) t = GDKusec();
assert(b->batCacheid > 0);
/* we don't need the lock just to read the value b->torderidx */
if (b->torderidx == (Heap *) 1) {
@@ -135,7 +135,7 @@ BATcheckorderidx(BAT *b)
ret = b->torderidx != NULL;
/* CHECK */
// The if statement in in ACCEL DEBUG
- if (ret) TRC_DEBUG(ACCEL, "BATcheckorderidx(" ALGOBATFMT "): already
has orderidx, waited " LLFMT " usec\n", ALGOBATPAR(b), GDKusec() - t);
+ TRC_DEBUG_IF(ACCEL) if (ret) TRC_DEBUG_ENDIF(ACCEL, "BATcheckorderidx("
ALGOBATFMT "): already has orderidx, waited " LLFMT " usec\n", ALGOBATPAR(b),
GDKusec() - t);
return ret;
}
diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -242,7 +242,7 @@ BATproject(BAT *l, BAT *r)
/* CHECK */
// This is in ALGODEBUG
- t0 = GDKusec();
+ TRC_DEBUG_IF(ALGO) t0 = GDKusec();
TRC_DEBUG(ALGO, "%s(l=" ALGOBATFMT ","
"r=" ALGOBATFMT ")\n",
@@ -478,7 +478,7 @@ BATprojectchain(BAT **bats)
/* CHECK */
// This is in ALGODEBUG
- t0 = GDKusec();
+ TRC_DEBUG_IF(ALGO) t0 = GDKusec();
/* count number of participating BATs and allocate some
* temporary work space */
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -1010,7 +1010,7 @@ BATselect(BAT *b, BAT *s, const void *tl
/* CHECK */
// This is in ALGODEBUG
- t0 = GDKusec();
+ TRC_DEBUG_IF(ALGO) t0 = GDKusec();
BATcheck(b, "BATselect", NULL);
BATcheck(tl, "BATselect: tl value required", NULL);
@@ -1329,7 +1329,7 @@ BATselect(BAT *b, BAT *s, const void *tl
}
/* CHECK */
// This if is in ALGODEBUG
- if (view) TRC_DEBUG(ALGO, "Switch from " ALGOBATFMT " to "
ALGOBATFMT " " OIDFMT "-" OIDFMT " hseq " LLFMT "\n", ALGOBATPAR(view),
ALGOBATPAR(b), vwl, vwh, vwo);
+ TRC_DEBUG_IF(ALGO) if (view) TRC_DEBUG_ENDIF(ALGO, "Switch from
" ALGOBATFMT " to " ALGOBATFMT " " OIDFMT "-" OIDFMT " hseq " LLFMT "\n",
ALGOBATPAR(view), ALGOBATPAR(b), vwl, vwh, vwo);
}
if (b->tsorted || b->trevsorted || use_orderidx) {
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -306,7 +306,7 @@ GDKmove(int farmid, const char *dir1, co
/* CHECK */
// This is declared only if IODEBUG
- t0 = GDKms();
+ TRC_DEBUG_IF(IO_) t0 = GDKms();
if ((nme1 == NULL) || (*nme1 == 0)) {
GDKerror("GDKmove: no file specified\n");
@@ -348,7 +348,7 @@ GDKextendf(int fd, size_t size, const ch
/* if necessary, extend the underlying file */
/* CHECK */
// This is declared only if IODEBUG
- t0 = GDKms();
+ TRC_DEBUG_IF(IO_) t0 = GDKms();
if (stb.st_size < (off_t) size) {
#ifdef HAVE_FALLOCATE
if ((rt = fallocate(fd, 0, stb.st_size, (off_t) size -
stb.st_size)) < 0 &&
diff --git a/monetdb5/modules/mal/groupby.c b/monetdb5/modules/mal/groupby.c
--- a/monetdb5/modules/mal/groupby.c
+++ b/monetdb5/modules/mal/groupby.c
@@ -110,8 +110,11 @@ GROUPcollect( Client cntxt, MalBlkPtr mb
/* CHECK */
// The for-loop is in DEBUG MAL_GROUPBY
- for(i=0; i<a->last; i++)
- TRC_DEBUG(MAL_GROUPBY, "Group '%d' unique "BUNFMT "\n", i,
a->unique[i]);
+ TRC_DEBUG_IF(MAL_GROUPBY)
+ {
+ for(i=0; i<a->last; i++)
+ TRC_DEBUG_ENDIF(MAL_GROUPBY, "Group '%d' unique "BUNFMT
"\n", i, a->unique[i]);
+ }
return a;
}
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -923,8 +923,11 @@ SERVERlisten(int port, const char *usock
/* CHECK */
// From here
- gethostname(host, (int) 512);
- TRC_DEBUG(MAL_SERVER, "Ready to accept connections on: %s:%d\n", host,
port);
+ TRC_DEBUG_IF(MAL_SERVER)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
