Changeset: bcad972fa78d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bcad972fa78d
Modified Files:
gdk/gdk_select.c
Branch: gdk_tracer
Log Message:
Added GDKtracer to gdk_select
diffs (truncated from 399 to 300 lines):
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -9,6 +9,7 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
+#include "gdk_tracer.h"
#include <math.h>
/* auxiliary functions and structs for imprints */
@@ -44,10 +45,9 @@ virtualize(BAT *bn)
* (const oid *) Tloc(bn, 0) + BATcount(bn) - 1 ==
* (const oid *) Tloc(bn, BUNlast(bn) - 1))) {
/* column is dense, replace by virtual oid */
- ALGODEBUG fprintf(stderr, "#%s: %s(bn=" ALGOBATFMT
",seq="OIDFMT")\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(bn),
- BATcount(bn) > 0 ? * (const oid *) Tloc(bn,
0) : 0);
+ DEBUG(ALGO, "(bn=" ALGOBATFMT ",seq="OIDFMT")\n",
+ ALGOBATPAR(bn),
+ BATcount(bn) > 0 ? * (const oid *)
Tloc(bn, 0) : 0);
if (BATcount(bn) == 0)
bn->tseqbase = 0;
else
@@ -99,12 +99,11 @@ hashselect(BAT *b, struct canditer *rest
if (phash) {
BAT *b2 = BBPdescriptor(VIEWtparent(b));
*algo = "hashselect on parent";
- ALGODEBUG fprintf(stderr, "#%s: %s(" ALGOBATFMT "): "
- "using parent(" ALGOBATFMT ") "
- "for hash\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(b),
- ALGOBATPAR(b2));
+ DEBUG(ALGO, "(" ALGOBATFMT "): "
+ "using parent(" ALGOBATFMT ") "
+ "for hash\n",
+ ALGOBATPAR(b),
+ ALGOBATPAR(b2));
d = (BUN) ((b->theap.base - b2->theap.base) >> b->tshift);
l += d;
h += d;
@@ -1008,7 +1007,9 @@ BATselect(BAT *b, BAT *s, const void *tl
} vl, vh;
lng t0 = 0;
- ALGODEBUG t0 = GDKusec();
+ /* CHECK */
+ // This is in ALGODEBUG
+ t0 = GDKusec();
BATcheck(b, "BATselect", NULL);
BATcheck(tl, "BATselect: tl value required", NULL);
@@ -1022,13 +1023,12 @@ BATselect(BAT *b, BAT *s, const void *tl
if (canditer_init(&ci, b, s) == 0) {
/* trivially empty result */
bn = BATdense(0, 0, 0);
- ALGODEBUG fprintf(stderr, "#%s: %s(b=" ALGOBATFMT
- ",s=" ALGOOPTBATFMT ",anti=%d)=" ALGOOPTBATFMT
- " (" LLFMT " usec): "
- "trivially empty\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(b), ALGOOPTBATPAR(s), anti,
- ALGOOPTBATPAR(bn), GDKusec() - t0);
+ DEBUG(ALGO, "(b=" ALGOBATFMT
+ ",s=" ALGOOPTBATFMT ",anti=%d)="
ALGOOPTBATFMT
+ " (" LLFMT " usec): "
+ "trivially empty\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(s), anti,
+ ALGOOPTBATPAR(bn), GDKusec() - t0);
return bn;
}
@@ -1043,13 +1043,12 @@ BATselect(BAT *b, BAT *s, const void *tl
* want an interval that's open on at least one
* side */
bn = BATdense(0, 0, 0);
- ALGODEBUG fprintf(stderr, "#%s: %s(b=" ALGOBATFMT
- ",s=" ALGOOPTBATFMT ",li=%d,hi=%d,anti=%d)="
ALGOOPTBATFMT
- " (" LLFMT " usec): "
- "empty interval\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(b), ALGOOPTBATPAR(s),
- li, hi, anti, ALGOOPTBATPAR(bn), GDKusec() -
t0);
+ DEBUG(ALGO, "(b=" ALGOBATFMT
+ ",s=" ALGOOPTBATFMT
",li=%d,hi=%d,anti=%d)=" ALGOOPTBATFMT
+ " (" LLFMT " usec): "
+ "empty interval\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(s),
+ li, hi, anti, ALGOOPTBATPAR(bn),
GDKusec() - t0);
return bn;
}
@@ -1082,23 +1081,21 @@ BATselect(BAT *b, BAT *s, const void *tl
hval = ti;
lnil = ATOMcmp(t, tl, nil) == 0;
anti = false;
- ALGODEBUG fprintf(stderr, "#%s: %s(b=" ALGOBATFMT
- ",s=" ALGOOPTBATFMT ",anti=%d): "
- "anti: switch ranges...\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(b), ALGOOPTBATPAR(s),
- anti);
+ DEBUG(ALGO, "(b=" ALGOBATFMT
+ ",s=" ALGOOPTBATFMT ",anti=%d):
"
+ "anti: switch ranges...\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(s),
+ anti);
} else if (!lval && !hval) {
/* antiselect for nil-nil range: all non-nil
* values are in range; we must return all
* other non-nil values, i.e. nothing */
bn = BATdense(0, 0, 0);
- ALGODEBUG fprintf(stderr, "#%s: %s(b=" ALGOBATFMT
- ",s=" ALGOOPTBATFMT ",anti=%d)="
ALGOOPTBATFMT
- " (" LLFMT " usec): "
- "anti: nil-nil range, nonil\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(b), ALGOOPTBATPAR(s),
+ DEBUG(ALGO, "(b=" ALGOBATFMT
+ ",s=" ALGOOPTBATFMT
",anti=%d)=" ALGOOPTBATFMT
+ " (" LLFMT " usec): "
+ "anti: nil-nil range, nonil\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(s),
anti, ALGOOPTBATPAR(bn), GDKusec() -
t0);
return bn;
} else if (equi && lnil) {
@@ -1109,11 +1106,10 @@ BATselect(BAT *b, BAT *s, const void *tl
anti = false;
lval = false;
hval = false;
- ALGODEBUG fprintf(stderr, "#%s: %s(b=" ALGOBATFMT
- ",s=" ALGOOPTBATFMT ",anti=0): "
- "anti-nil...\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(b), ALGOOPTBATPAR(s));
+ DEBUG(ALGO, "(b=" ALGOBATFMT
+ ",s=" ALGOOPTBATFMT ",anti=0): "
+ "anti-nil...\n",
+ ALGOBATPAR(b),
ALGOOPTBATPAR(s));
} else if (equi) {
equi = false;
if (!(li && hi)) {
@@ -1123,13 +1119,12 @@ BATselect(BAT *b, BAT *s, const void *tl
anti = false;
lval = false;
hval = false;
- ALGODEBUG fprintf(stderr, "#%s: %s(b="
- ALGOBATFMT ",s="
- ALGOOPTBATFMT ",anti=0): "
- "anti-nothing...\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(b),
- ALGOOPTBATPAR(s));
+ DEBUG(ALGO, "(b="
+ ALGOBATFMT ",s="
+ ALGOOPTBATFMT
",anti=0): "
+ "anti-nothing...\n",
+ ALGOBATPAR(b),
+ ALGOOPTBATPAR(s));
}
} else if (ATOMcmp(t, tl, th) > 0) {
/* empty range: turn into range select for
@@ -1138,11 +1133,10 @@ BATselect(BAT *b, BAT *s, const void *tl
anti = false;
lval = false;
hval = false;
- ALGODEBUG fprintf(stderr, "#%s: %s(b=" ALGOBATFMT
- ",s=" ALGOOPTBATFMT ",anti=0): "
- "anti-nil...\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(b), ALGOOPTBATPAR(s));
+ DEBUG(ALGO, "(b=" ALGOBATFMT
+ ",s=" ALGOOPTBATFMT ",anti=0): "
+ "anti-nil...\n",
+ ALGOBATPAR(b),
ALGOOPTBATPAR(s));
}
}
@@ -1152,25 +1146,23 @@ BATselect(BAT *b, BAT *s, const void *tl
if (hval && ((equi && !(li && hi)) || ATOMcmp(t, tl, th) > 0)) {
/* empty range */
bn = BATdense(0, 0, 0);
- ALGODEBUG fprintf(stderr, "#%s: %s(b=" ALGOBATFMT
- ",s=" ALGOOPTBATFMT ",anti=%d)=" ALGOOPTBATFMT
- " (" LLFMT " usec): "
- "empty range\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(b), ALGOOPTBATPAR(s), anti,
- ALGOOPTBATPAR(bn), GDKusec() - t0);
+ DEBUG(ALGO, "(b=" ALGOBATFMT
+ ",s=" ALGOOPTBATFMT ",anti=%d)="
ALGOOPTBATFMT
+ " (" LLFMT " usec): "
+ "empty range\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(s), anti,
+ ALGOOPTBATPAR(bn), GDKusec() - t0);
return bn;
}
if (equi && lnil && b->tnonil) {
/* return all nils, but there aren't any */
bn = BATdense(0, 0, 0);
- ALGODEBUG fprintf(stderr, "#%s: %s(b=" ALGOBATFMT
- ",s=" ALGOOPTBATFMT ",anti=%d)=" ALGOOPTBATFMT
- " (" LLFMT " usec): "
- "equi-nil, nonil\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(b), ALGOOPTBATPAR(s), anti,
- ALGOOPTBATPAR(bn), GDKusec() - t0);
+ DEBUG(ALGO, "(b=" ALGOBATFMT
+ ",s=" ALGOOPTBATFMT ",anti=%d)="
ALGOOPTBATFMT
+ " (" LLFMT " usec): "
+ "equi-nil, nonil\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(s), anti,
+ ALGOOPTBATPAR(bn), GDKusec() - t0);
return bn;
}
@@ -1178,13 +1170,12 @@ BATselect(BAT *b, BAT *s, const void *tl
/* return all non-nils from a BAT that doesn't have
* any: i.e. return everything */
bn = canditer_slice(&ci, 0, ci.ncand);
- ALGODEBUG fprintf(stderr, "#%s: %s(b=" ALGOBATFMT
- ",s=" ALGOOPTBATFMT ",anti=%d)=" ALGOOPTBATFMT
- " (" LLFMT " usec): "
- "everything, nonil\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(b), ALGOOPTBATPAR(s), anti,
- ALGOOPTBATPAR(bn), GDKusec() - t0);
+ DEBUG(ALGO, "(b=" ALGOBATFMT
+ ",s=" ALGOOPTBATFMT ",anti=%d)="
ALGOOPTBATFMT
+ " (" LLFMT " usec): "
+ "everything, nonil\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(s), anti,
+ ALGOOPTBATPAR(bn), GDKusec() - t0);
return bn;
}
@@ -1205,12 +1196,11 @@ BATselect(BAT *b, BAT *s, const void *tl
* left over for
* anti */
bn = BATdense(0, 0, 0);
- ALGODEBUG fprintf(stderr, "#%s:
%s(b=" ALGOBATFMT
- ",s="
ALGOOPTBATFMT ",anti=%d)=" ALGOOPTBATFMT
- " (" LLFMT "
usec): "
- "nothing, out
of range\n",
-
MT_thread_getname(), __func__,
-
ALGOBATPAR(b), ALGOOPTBATPAR(s), anti, ALGOOPTBATPAR(bn), GDKusec() - t0);
+ DEBUG(ALGO, "(b=" ALGOBATFMT
+ ",s="
ALGOOPTBATFMT ",anti=%d)=" ALGOOPTBATFMT
+ " ("
LLFMT " usec): "
+
"nothing, out of range\n",
+
ALGOBATPAR(b), ALGOOPTBATPAR(s), anti, ALGOOPTBATPAR(bn), GDKusec() - t0);
return bn;
}
}
@@ -1226,15 +1216,14 @@ BATselect(BAT *b, BAT *s, const void *tl
/* smallest value in BAT larger than
* what we're looking for */
bn = BATdense(0, 0, 0);
- ALGODEBUG fprintf(stderr, "#%s: %s(b="
- ALGOBATFMT ",s="
- ALGOOPTBATFMT ",anti=%d)="
ALGOOPTBATFMT
- " (" LLFMT " usec): "
- "nothing, out of range\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(b),
- ALGOOPTBATPAR(s), anti,
- ALGOOPTBATPAR(bn), GDKusec()
- t0);
+ DEBUG(ALGO, "(b="
+ ALGOBATFMT ",s="
+ ALGOOPTBATFMT
",anti=%d)=" ALGOOPTBATFMT
+ " (" LLFMT " usec): "
+ "nothing, out of
range\n",
+ ALGOBATPAR(b),
+ ALGOOPTBATPAR(s), anti,
+ ALGOOPTBATPAR(bn),
GDKusec() - t0);
return bn;
}
}
@@ -1244,15 +1233,14 @@ BATselect(BAT *b, BAT *s, const void *tl
/* largest value in BAT smaller than
* what we're looking for */
bn = BATdense(0, 0, 0);
- ALGODEBUG fprintf(stderr, "#%s: %s(b="
- ALGOBATFMT ",s="
- ALGOOPTBATFMT ",anti=%d)="
ALGOOPTBATFMT
- " (" LLFMT " usec): "
- "nothing, out of range\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(b),
- ALGOOPTBATPAR(s), anti,
- ALGOOPTBATPAR(bn), GDKusec()
- t0);
+ DEBUG(ALGO, "(b="
+ ALGOBATFMT ",s="
+ ALGOOPTBATFMT
",anti=%d)=" ALGOOPTBATFMT
+ " (" LLFMT " usec): "
+ "nothing, out of
range\n",
+ ALGOBATPAR(b),
+ ALGOOPTBATPAR(s), anti,
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
