Changeset: c2582038778d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c2582038778d
Modified Files:
gdk/gdk_project.c
Branch: gdk_tracer
Log Message:
Added GDKtracer to gdk_project
diffs (152 lines):
diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -239,12 +239,14 @@ BATproject(BAT *l, BAT *r)
struct canditer ci, *lci = NULL;
lng t0 = 0;
- ALGODEBUG t0 = GDKusec();
+ /* CHECK */
+ // This is in ALGODEBUG
+ t0 = GDKusec();
- ALGODEBUG fprintf(stderr, "#%s: %s(l=" ALGOBATFMT ","
- "r=" ALGOBATFMT ")\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(l), ALGOBATPAR(r));
+ DEBUG(ALGO, "%s(l=" ALGOBATFMT ","
+ "r=" ALGOBATFMT ")\n",
+ __func__,
+ ALGOBATPAR(l), ALGOBATPAR(r));
assert(ATOMtype(l->ttype) == TYPE_oid);
@@ -257,9 +259,9 @@ BATproject(BAT *l, BAT *r)
}
bn = BATslice(r, lo - r->hseqbase, hi - r->hseqbase);
BAThseqbase(bn, l->hseqbase);
- ALGODEBUG fprintf(stderr, "#%s: %s(l=%s,r=%s)=" ALGOOPTBATFMT "
(slice)\n",
- MT_thread_getname(), __func__,
- BATgetId(l), BATgetId(r), ALGOOPTBATPAR(bn));
+ DEBUG(ALGO, "%s(l=%s,r=%s)=" ALGOOPTBATFMT " (slice)\n",
+ __func__,
+ BATgetId(l), BATgetId(r),
ALGOOPTBATPAR(bn));
return bn;
}
if (l->ttype == TYPE_void && l->tvheap != NULL) {
@@ -280,9 +282,9 @@ BATproject(BAT *l, BAT *r)
BATcount(bn) == 0) {
BATtseqbase(bn, 0);
}
- ALGODEBUG fprintf(stderr, "#%s: %s(l=%s,r=%s)=" ALGOOPTBATFMT "
(constant)\n",
- MT_thread_getname(), __func__,
- BATgetId(l), BATgetId(r), ALGOOPTBATPAR(bn));
+ DEBUG(ALGO, "%s(l=%s,r=%s)=" ALGOOPTBATFMT " (constant)\n",
+ __func__,
+ BATgetId(l), BATgetId(r),
ALGOOPTBATPAR(bn));
return bn;
}
@@ -305,9 +307,9 @@ BATproject(BAT *l, BAT *r)
}
bn = COLnew(l->hseqbase, tpe, lcount, TRANSIENT);
if (bn == NULL) {
- ALGODEBUG fprintf(stderr, "#%s: %s(l=%s,r=%s)=0\n",
- MT_thread_getname(), __func__,
- BATgetId(l), BATgetId(r));
+ DEBUG(ALGO, "%s(l=%s,r=%s)=0\n",
+ __func__,
+ BATgetId(l), BATgetId(r));
return NULL;
}
if (stringtrick) {
@@ -429,11 +431,11 @@ BATproject(BAT *l, BAT *r)
if (!BATtdense(r))
BATtseqbase(bn, oid_nil);
- ALGODEBUG fprintf(stderr, "#%s: %s(l=%s,r=%s)=" ALGOBATFMT "%s " LLFMT
"us\n",
- MT_thread_getname(), __func__,
- BATgetId(l), BATgetId(r), ALGOBATPAR(bn),
- bn->ttype == TYPE_str && bn->tvheap == r->tvheap ? "
shared string heap" : "",
- GDKusec() - t0);
+ DEBUG(ALGO, "%s(l=%s,r=%s)=" ALGOBATFMT "%s " LLFMT "us\n",
+ __func__,
+ BATgetId(l), BATgetId(r),
ALGOBATPAR(bn),
+ bn->ttype == TYPE_str && bn->tvheap ==
r->tvheap ? " shared string heap" : "",
+ GDKusec() - t0);
return bn;
bailout:
@@ -473,15 +475,16 @@ BATprojectchain(BAT **bats)
int tpe;
lng t0 = 0;
- ALGODEBUG t0 = GDKusec();
+ /* CHECK */
+ // This is in ALGODEBUG
+ t0 = GDKusec();
/* count number of participating BATs and allocate some
* temporary work space */
for (n = 0; bats[n]; n++) {
b = bats[n];
- ALGODEBUG fprintf(stderr, "#%s: %s arg %d: " ALGOBATFMT "\n",
- MT_thread_getname(), __func__, n + 1,
- ALGOBATPAR(b));
+ DEBUG(ALGO, "%s arg %d: " ALGOBATFMT "\n",
+ __func__, n + 1, ALGOBATPAR(b));
}
if (n == 0) {
GDKerror("%s: must have BAT arguments\n", __func__);
@@ -489,10 +492,10 @@ BATprojectchain(BAT **bats)
}
if (n == 1) {
bn = COLcopy(b, b->ttype, true, TRANSIENT);
- ALGODEBUG fprintf(stderr, "#%s: %s with 1 bat: copy: "
- ALGOOPTBATFMT " (" LLFMT " usec)\n",
- MT_thread_getname(), __func__,
- ALGOOPTBATPAR(bn), GDKusec() - t0);
+ DEBUG(ALGO, "%s with 1 bat: copy: "
+ ALGOOPTBATFMT " (" LLFMT " usec)\n",
+ __func__,
+ ALGOOPTBATPAR(bn), GDKusec() - t0);
return bn;
}
@@ -523,10 +526,10 @@ BATprojectchain(BAT **bats)
bn = BATconstant(ba[0].hlo, tpe == TYPE_oid ? TYPE_void : tpe,
nil, ba[0].cnt, TRANSIENT);
GDKfree(ba);
- ALGODEBUG fprintf(stderr, "#%s: %s with %d bats: nil/empty: "
- ALGOOPTBATFMT " (" LLFMT " usec)\n",
- MT_thread_getname(), __func__, n,
- ALGOOPTBATPAR(bn), GDKusec() - t0);
+ DEBUG(ALGO, "%s with %d bats: nil/empty: "
+ ALGOOPTBATFMT " (" LLFMT " usec)\n",
+ __func__, n,
+ ALGOOPTBATPAR(bn), GDKusec() - t0);
return bn;
}
@@ -656,16 +659,15 @@ BATprojectchain(BAT **bats)
bn->tnonil = nonil;
bn->tseqbase = oid_nil;
GDKfree(ba);
- ALGODEBUG fprintf(stderr, "#%s: %s with %d bats: "
- ALGOOPTBATFMT " (" LLFMT " usec)\n",
- MT_thread_getname(), __func__, n,
- ALGOOPTBATPAR(bn), GDKusec() - t0);
+ DEBUG(ALGO, "%s with %d bats: "
+ ALGOOPTBATFMT " (" LLFMT " usec)\n",
+ __func__, n,
+ ALGOOPTBATPAR(bn), GDKusec() - t0);
return bn;
bunins_failed:
GDKfree(ba);
BBPreclaim(bn);
- ALGODEBUG fprintf(stderr, "#%s: %s failed\n",
- MT_thread_getname(), __func__);
+ DEBUG(ALGO, "%s failed\n", __func__);
return NULL;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
