Changeset: a6b2980dbcca for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6b2980dbcca
Modified Files:
gdk/gdk_batop.c
Branch: gdk_tracer
Log Message:
Added GDKtracer to gdk_batop
diffs (truncated from 313 to 300 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -17,6 +17,7 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
+#include "gdk_tracer.h"
gdk_return
unshare_string_heap(BAT *b)
@@ -507,12 +508,13 @@ BATappend(BAT *b, BAT *n, BAT *s, bool f
GDKerror("Incompatible operands.\n");
return GDK_FAIL;
}
- CHECKDEBUG {
- if (BATttype(b) != BATttype(n) &&
- ATOMtype(b->ttype) != ATOMtype(n->ttype)) {
- fprintf(stderr,"#Interpreting %s as %s.\n",
- ATOMname(BATttype(n)), ATOMname(BATttype(b)));
- }
+
+ /* CHECK */
+ // The whole if statement is in DEBUG CHECK_
+ if (BATttype(b) != BATttype(n) &&
+ ATOMtype(b->ttype) != ATOMtype(n->ttype)) {
+ DEBUG(CHECK_, "Interpreting %s as %s.\n",
+ ATOMname(BATttype(n)),
ATOMname(BATttype(b)));
}
if (b->tunique) {
@@ -1014,10 +1016,9 @@ BATslice(BAT *b, BUN l, BUN h)
bn->trevsorted = b->trevsorted;
BATkey(bn, BATtkey(b));
}
- ALGODEBUG fprintf(stderr,
- "#BATslice(" ALGOBATFMT "," BUNFMT "," BUNFMT ")"
- "=" ALGOBATFMT "\n",
- ALGOBATPAR(b), l, h, ALGOBATPAR(bn));
+ DEBUG(ALGO, "BATslice(" ALGOBATFMT "," BUNFMT "," BUNFMT ")"
+ "=" ALGOBATFMT "\n",
+ ALGOBATPAR(b), l, h, ALGOBATPAR(bn));
return bn;
bunins_failed:
BBPreclaim(bn);
@@ -1057,7 +1058,7 @@ BATkeyed(BAT *b)
if ((*cmpf)(prev, cur) == 0) {
b->tnokey[0] = p - 1;
b->tnokey[1] = p;
- ALGODEBUG fprintf(stderr, "#BATkeyed:
fixed nokey(" BUNFMT "," BUNFMT ") for %s#" BUNFMT " (" LLFMT " usec)\n", p -
1, p, BATgetId(b), BATcount(b), GDKusec() - t0);
+ DEBUG(ALGO, "Fixed nokey(" BUNFMT ","
BUNFMT ") for %s#" BUNFMT " (" LLFMT " usec)\n", p - 1, p, BATgetId(b),
BATcount(b), GDKusec() - t0);
goto doreturn;
}
prev = cur;
@@ -1090,7 +1091,7 @@ BATkeyed(BAT *b)
if ((*cmpf)(v, BUNtail(bi, hb - lo)) ==
0) {
b->tnokey[0] = hb - lo;
b->tnokey[1] = p;
- ALGODEBUG fprintf(stderr, "#BATkeyed:
fixed nokey(" BUNFMT "," BUNFMT ") for %s#" BUNFMT " (" LLFMT " usec)\n", hb -
lo, p, BATgetId(b), BATcount(b), GDKusec() - t0);
+ DEBUG(ALGO, "Fixed nokey("
BUNFMT "," BUNFMT ") for %s#" BUNFMT " (" LLFMT " usec)\n", hb - lo, p,
BATgetId(b), BATcount(b), GDKusec() - t0);
goto doreturn;
}
}
@@ -1135,7 +1136,7 @@ BATkeyed(BAT *b)
(*cmpf)(v, BUNtail(bi, hb)) == 0) {
b->tnokey[0] = hb;
b->tnokey[1] = p;
- ALGODEBUG fprintf(stderr,
"#BATkeyed: fixed nokey(" BUNFMT "," BUNFMT ") for %s#" BUNFMT " (" LLFMT "
usec)\n", hb, p, BATgetId(b), BATcount(b), GDKusec() - t0);
+ DEBUG(ALGO, "Fixed nokey("
BUNFMT "," BUNFMT ") for %s#" BUNFMT " (" LLFMT " usec)\n", hb, p, BATgetId(b),
BATcount(b), GDKusec() - t0);
goto doreturn_free;
}
}
@@ -1166,7 +1167,9 @@ BATordered(BAT *b)
{
lng t0 = 0;
- ALGODEBUG t0 = GDKusec();
+ /* CHECK */
+ // This is in DEBUGALGO
+ t0 = GDKusec();
if (b->ttype == TYPE_void)
return true;
@@ -1187,13 +1190,13 @@ BATordered(BAT *b)
for (q = BUNlast(b), p = 1; p < q; p++) {
if (iptr[p - 1] > iptr[p]) {
b->tnosorted = p;
- ALGODEBUG fprintf(stderr, "#BATordered:
fixed nosorted(" BUNFMT ") for %s#" BUNFMT " (" LLFMT " usec)\n", p,
BATgetId(b), BATcount(b), GDKusec() - t0);
+ DEBUG(ALGO, "Fixed nosorted(" BUNFMT ")
for %s#" BUNFMT " (" LLFMT " usec)\n", p, BATgetId(b), BATcount(b), GDKusec() -
t0);
goto doreturn;
} else if (!b->trevsorted &&
b->tnorevsorted == 0 &&
iptr[p - 1] < iptr[p]) {
b->tnorevsorted = p;
- ALGODEBUG fprintf(stderr, "#BATordered:
fixed norevsorted(" BUNFMT ") for %s#" BUNFMT "\n", p, BATgetId(b),
BATcount(b));
+ DEBUG(ALGO, "Fixed norevsorted(" BUNFMT
") for %s#" BUNFMT "\n", p, BATgetId(b), BATcount(b));
}
}
break;
@@ -1203,13 +1206,13 @@ BATordered(BAT *b)
for (q = BUNlast(b), p = 1; p < q; p++) {
if (lptr[p - 1] > lptr[p]) {
b->tnosorted = p;
- ALGODEBUG fprintf(stderr, "#BATordered:
fixed nosorted(" BUNFMT ") for %s#" BUNFMT " (" LLFMT " usec)\n", p,
BATgetId(b), BATcount(b), GDKusec() - t0);
+ DEBUG(ALGO, "Fixed nosorted(" BUNFMT ")
for %s#" BUNFMT " (" LLFMT " usec)\n", p, BATgetId(b), BATcount(b), GDKusec() -
t0);
goto doreturn;
} else if (!b->trevsorted &&
b->tnorevsorted == 0 &&
lptr[p - 1] < lptr[p]) {
b->tnorevsorted = p;
- ALGODEBUG fprintf(stderr, "#BATordered:
fixed norevsorted(" BUNFMT ") for %s#" BUNFMT "\n", p, BATgetId(b),
BATcount(b));
+ DEBUG(ALGO, "Fixed norevsorted(" BUNFMT
") for %s#" BUNFMT "\n", p, BATgetId(b), BATcount(b));
}
}
break;
@@ -1219,13 +1222,13 @@ BATordered(BAT *b)
int c;
if ((c = cmpf(BUNtail(bi, p - 1), BUNtail(bi,
p))) > 0) {
b->tnosorted = p;
- ALGODEBUG fprintf(stderr, "#BATordered:
fixed nosorted(" BUNFMT ") for %s#" BUNFMT " (" LLFMT " usec)\n", p,
BATgetId(b), BATcount(b), GDKusec() - t0);
+ DEBUG(ALGO, "Fixed nosorted(" BUNFMT ")
for %s#" BUNFMT " (" LLFMT " usec)\n", p, BATgetId(b), BATcount(b), GDKusec() -
t0);
goto doreturn;
} else if (!b->trevsorted &&
b->tnorevsorted == 0 &&
c < 0) {
b->tnorevsorted = p;
- ALGODEBUG fprintf(stderr, "#BATordered:
fixed norevsorted(" BUNFMT ") for %s#" BUNFMT "\n", p, BATgetId(b),
BATcount(b));
+ DEBUG(ALGO, "Fixed norevsorted(" BUNFMT
") for %s#" BUNFMT "\n", p, BATgetId(b), BATcount(b));
}
}
break;
@@ -1235,10 +1238,10 @@ BATordered(BAT *b)
* sortedness, we know that the BAT is also reverse
* sorted */
b->tsorted = true;
- ALGODEBUG fprintf(stderr, "#BATordered: fixed sorted for %s#"
BUNFMT " (" LLFMT " usec)\n", BATgetId(b), BATcount(b), GDKusec() - t0);
+ DEBUG(ALGO, "Fixed sorted for %s#" BUNFMT " (" LLFMT "
usec)\n", BATgetId(b), BATcount(b), GDKusec() - t0);
if (!b->trevsorted && b->tnorevsorted == 0) {
b->trevsorted = true;
- ALGODEBUG fprintf(stderr, "#BATordered: fixed revsorted
for %s#" BUNFMT "\n", BATgetId(b), BATcount(b));
+ DEBUG(ALGO, "Fixed revsorted for %s#" BUNFMT "\n",
BATgetId(b), BATcount(b));
}
}
doreturn:
@@ -1254,7 +1257,9 @@ BATordered_rev(BAT *b)
{
lng t0 = 0;
- ALGODEBUG t0 = GDKusec();
+ /* CHECK */
+ // This is in DEBUGALGO
+ t0 = GDKusec();
if (b == NULL)
return false;
@@ -1273,12 +1278,12 @@ BATordered_rev(BAT *b)
for (q = BUNlast(b), p = 1; p < q; p++) {
if (cmpf(BUNtail(bi, p - 1), BUNtail(bi, p)) < 0) {
b->tnorevsorted = p;
- ALGODEBUG fprintf(stderr, "#BATordered_rev:
fixed norevsorted(" BUNFMT ") for %s#" BUNFMT " (" LLFMT " usec)\n", p,
BATgetId(b), BATcount(b), GDKusec() - t0);
+ DEBUG(ALGO, "Fixed norevsorted(" BUNFMT ") for
%s#" BUNFMT " (" LLFMT " usec)\n", p, BATgetId(b), BATcount(b), GDKusec() - t0);
goto doreturn;
}
}
b->trevsorted = true;
- ALGODEBUG fprintf(stderr, "#BATordered_rev: fixed revsorted for
%s#" BUNFMT " (" LLFMT " usec)\n", BATgetId(b), BATcount(b), GDKusec() - t0);
+ DEBUG(ALGO, "Fixed revsorted for %s#" BUNFMT " (" LLFMT "
usec)\n", BATgetId(b), BATcount(b), GDKusec() - t0);
}
doreturn:
MT_lock_unset(&b->batIdxLock);
@@ -1351,7 +1356,9 @@ BATsort(BAT **sorted, BAT **order, BAT *
lng t0 = 0;
bool mkorderidx, orderidxlock = false;
- ALGODEBUG t0 = GDKusec();
+ /* CHECK */
+ // This is in DEBUGALGO
+ t0 = GDKusec();
/* we haven't implemented NILs as largest value for stable
* sort, so NILs come first for ascending and last for
@@ -1465,16 +1472,16 @@ BATsort(BAT **sorted, BAT **order, BAT *
}
*groups = gn;
}
- ALGODEBUG fprintf(stderr, "#BATsort(b=" ALGOBATFMT ",o="
- ALGOOPTBATFMT ",g=" ALGOOPTBATFMT
- ",reverse=%d,nilslast=%d,stable=%d) = ("
- ALGOOPTBATFMT "," ALGOOPTBATFMT ","
- ALGOOPTBATFMT ") -- trivial (" LLFMT
- " usec)\n",
- ALGOBATPAR(b), ALGOOPTBATPAR(o),
- ALGOOPTBATPAR(g), reverse, nilslast, stable,
- ALGOOPTBATPAR(bn), ALGOOPTBATPAR(gn),
- ALGOOPTBATPAR(on), GDKusec() - t0);
+ DEBUG(ALGO, "BATsort(b=" ALGOBATFMT ",o="
+ ALGOOPTBATFMT ",g=" ALGOOPTBATFMT
+ ",reverse=%d,nilslast=%d,stable=%d) = ("
+ ALGOOPTBATFMT "," ALGOOPTBATFMT ","
+ ALGOOPTBATFMT ") -- trivial (" LLFMT
+ " usec)\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(o),
+ ALGOOPTBATPAR(g), reverse, nilslast,
stable,
+ ALGOOPTBATPAR(bn), ALGOOPTBATPAR(gn),
+ ALGOOPTBATPAR(on), GDKusec() - t0);
return GDK_SUCCEED;
}
if (VIEWtparent(b)) {
@@ -1552,16 +1559,16 @@ BATsort(BAT **sorted, BAT **order, BAT *
BBPunfix(on->batCacheid);
on = NULL;
}
- ALGODEBUG fprintf(stderr, "#BATsort(b=" ALGOBATFMT ",o="
- ALGOOPTBATFMT ",g=" ALGOOPTBATFMT
- ",reverse=%d,nilslast=%d,stable=%d) = ("
- ALGOOPTBATFMT "," ALGOOPTBATFMT ","
- ALGOOPTBATFMT ") -- orderidx (" LLFMT
- " usec)\n",
- ALGOBATPAR(b), ALGOOPTBATPAR(o),
- ALGOOPTBATPAR(g), reverse, nilslast, stable,
- ALGOOPTBATPAR(bn), ALGOOPTBATPAR(gn),
- ALGOOPTBATPAR(on), GDKusec() - t0);
+ DEBUG(ALGO, "BATsort(b=" ALGOBATFMT ",o="
+ ALGOOPTBATFMT ",g=" ALGOOPTBATFMT
+ ",reverse=%d,nilslast=%d,stable=%d) = ("
+ ALGOOPTBATFMT "," ALGOOPTBATFMT ","
+ ALGOOPTBATFMT ") -- orderidx (" LLFMT
+ " usec)\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(o),
+ ALGOOPTBATPAR(g), reverse, nilslast,
stable,
+ ALGOOPTBATPAR(bn), ALGOOPTBATPAR(gn),
+ ALGOOPTBATPAR(on), GDKusec() - t0);
return GDK_SUCCEED;
}
if (o) {
@@ -1654,17 +1661,17 @@ BATsort(BAT **sorted, BAT **order, BAT *
goto error;
*groups = gn;
}
- ALGODEBUG fprintf(stderr, "#BATsort(b=" ALGOBATFMT
- ",o=" ALGOOPTBATFMT ",g=" ALGOBATFMT
- ",reverse=%d,nilslast=%d,stable=%d"
- ") = (" ALGOOPTBATFMT ","
- ALGOOPTBATFMT "," ALGOOPTBATFMT
- ") -- key group (" LLFMT " usec)\n",
- ALGOBATPAR(b), ALGOOPTBATPAR(o),
- ALGOBATPAR(g), reverse, nilslast,
- stable, ALGOOPTBATPAR(bn),
- ALGOOPTBATPAR(gn), ALGOOPTBATPAR(on),
- GDKusec() - t0);
+ DEBUG(ALGO, "BATsort(b=" ALGOBATFMT
+ ",o=" ALGOOPTBATFMT ",g="
ALGOBATFMT
+
",reverse=%d,nilslast=%d,stable=%d"
+ ") = (" ALGOOPTBATFMT ","
+ ALGOOPTBATFMT "," ALGOOPTBATFMT
+ ") -- key group (" LLFMT "
usec)\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(o),
+ ALGOBATPAR(g), reverse,
nilslast,
+ stable, ALGOOPTBATPAR(bn),
+ ALGOOPTBATPAR(gn),
ALGOOPTBATPAR(on),
+ GDKusec() - t0);
return GDK_SUCCEED;
}
assert(g->ttype == TYPE_oid);
@@ -1776,14 +1783,14 @@ BATsort(BAT **sorted, BAT **order, BAT *
bn = NULL;
}
- ALGODEBUG fprintf(stderr, "#BATsort(b=" ALGOBATFMT ",o=" ALGOOPTBATFMT
- ",g=" ALGOOPTBATFMT ",reverse=%d,nilslast=%d,"
- "stable=%d) = (" ALGOOPTBATFMT "," ALGOOPTBATFMT ","
- ALGOOPTBATFMT ") -- %ssort (" LLFMT " usec)\n",
- ALGOBATPAR(b), ALGOOPTBATPAR(o), ALGOOPTBATPAR(g),
- reverse, nilslast, stable, ALGOOPTBATPAR(bn),
- ALGOOPTBATPAR(gn), ALGOOPTBATPAR(on),
- g ? "grouped " : "", GDKusec() - t0);
+ DEBUG(ALGO, "BATsort(b=" ALGOBATFMT ",o=" ALGOOPTBATFMT
+ ",g=" ALGOOPTBATFMT ",reverse=%d,nilslast=%d,"
+ "stable=%d) = (" ALGOOPTBATFMT ","
ALGOOPTBATFMT ","
+ ALGOOPTBATFMT ") -- %ssort (" LLFMT " usec)\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(o),
ALGOOPTBATPAR(g),
+ reverse, nilslast, stable, ALGOOPTBATPAR(bn),
+ ALGOOPTBATPAR(gn), ALGOOPTBATPAR(on),
+ g ? "grouped " : "", GDKusec() - t0);
return GDK_SUCCEED;
error:
@@ -1809,7 +1816,9 @@ BATconstant(oid hseq, int tailtype, cons
BUN i;
lng t0 = 0;
- ALGODEBUG t0 = GDKusec();
+ /* CHECK */
+ // This is in DEBUGALGO
+ t0 = GDKusec();
if (v == NULL)
return NULL;
@@ -1860,10 +1869,10 @@ BATconstant(oid hseq, int tailtype, cons
bn->tnonil = !bn->tnil;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
