Changeset: 56c727e754ac for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=56c727e754ac
Modified Files:
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_cand.c
gdk/gdk_cross.c
gdk/gdk_delta.c
gdk/gdk_delta.h
gdk/gdk_tm.c
gdk/gdk_tracer.h
Branch: gdk_tracer
Log Message:
Replaced gdk_aggr, gdk_align, gdk_cond, gdk_cross, gdk_delta, gdk_tm
diffs (231 lines):
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -10,6 +10,7 @@
#include "gdk.h"
#include "gdk_private.h"
#include "gdk_calc_private.h"
+#include "gdk_tracer.h"
#include <math.h>
/* grouped aggregates
@@ -946,15 +947,13 @@ BATgroupsum(BAT *b, BAT *g, BAT *e, BAT
bn = NULL;
}
- ALGODEBUG fprintf(stderr,
- "#%s:
%s(b="ALGOBATFMT",g="ALGOOPTBATFMT",e="ALGOOPTBATFMT",s="ALGOOPTBATFMT")="ALGOOPTBATFMT":
%s; "
- "start " OIDFMT ", count " BUNFMT " (" LLFMT " usec)"
- "\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(b), ALGOOPTBATPAR(g), ALGOOPTBATPAR(e),
- ALGOOPTBATPAR(s), ALGOOPTBATPAR(bn),
- algo ? algo : "",
- ci.seq, ncand, GDKusec() - t0);
+ DEBUG(ALGO,
"(b="ALGOBATFMT",g="ALGOOPTBATFMT",e="ALGOOPTBATFMT",s="ALGOOPTBATFMT")="ALGOOPTBATFMT":
%s; "
+ "start " OIDFMT ", count " BUNFMT " (" LLFMT "
usec)"
+ "\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(g),
ALGOOPTBATPAR(e),
+ ALGOOPTBATPAR(s), ALGOOPTBATPAR(bn),
+ algo ? algo : "",
+ ci.seq, ncand, GDKusec() - t0);
return bn;
}
@@ -1072,14 +1071,12 @@ BATsum(void *res, int tp, BAT *b, BAT *s
nils = dosum(Tloc(b, 0), b->tnonil, b->hseqbase, &ci, ncand,
res, true, b->ttype, tp, &min, min, max,
skip_nils, abort_on_error, nil_if_empty, "BATsum", &algo);
- ALGODEBUG fprintf(stderr,
- "#%s: %s(b="ALGOBATFMT",s="ALGOOPTBATFMT"): %s; "
- "start " OIDFMT ", count " BUNFMT " (" LLFMT " usec)"
- "\n",
- MT_thread_getname(), __func__,
- ALGOBATPAR(b), ALGOOPTBATPAR(s),
- algo ? algo : "",
- ci.seq, ncand, GDKusec() - t0);
+ DEBUG(ALGO, "(b="ALGOBATFMT",s="ALGOOPTBATFMT"): %s; "
+ "start " OIDFMT ", count " BUNFMT " (" LLFMT "
usec)"
+ "\n",
+ ALGOBATPAR(b), ALGOOPTBATPAR(s),
+ algo ? algo : "",
+ ci.seq, ncand, GDKusec() - t0);
return nils < BUN_NONE ? GDK_SUCCEED : GDK_FAIL;
}
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -48,6 +48,7 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
+#include "gdk_tracer.h"
/* Return TRUE if the two BATs are aligned (same size, same
* hseqbase). */
@@ -137,7 +138,7 @@ VIEWcreate(oid seq, BAT *b)
GDKfree(bn);
return NULL;
}
- ALGODEBUG fprintf(stderr, "#VIEWcreate(" ALGOBATFMT ")=" ALGOBATFMT
"\n", ALGOBATPAR(b), ALGOBATPAR(bn));
+ DEBUG(ALGO, "VIEWcreate(" ALGOBATFMT ")=" ALGOBATFMT "\n",
ALGOBATPAR(b), ALGOBATPAR(bn));
return bn;
}
@@ -164,8 +165,8 @@ BATmaterialize(BAT *b)
p = 0;
q = BUNlast(b);
assert(cnt >= q - p);
- ALGODEBUG fprintf(stderr, "#BATmaterialize(" ALGOBATFMT ")\n",
- ALGOBATPAR(b));
+ DEBUG(ALGO, "BATmaterialize(" ALGOBATFMT ")\n",
+ ALGOBATPAR(b));
if (tt != TYPE_void) {
/* no voids */
diff --git a/gdk/gdk_cand.c b/gdk/gdk_cand.c
--- a/gdk/gdk_cand.c
+++ b/gdk/gdk_cand.c
@@ -10,6 +10,7 @@
#include "gdk.h"
#include "gdk_private.h"
#include "gdk_cand.h"
+#include "gdk_tracer.h"
/* create a new, dense candidate list with values from `first' up to,
* but not including, `last' */
@@ -917,9 +918,9 @@ BATnegcands(BAT *dense_cands, BAT *odels
dense_cands->batDirtydesc = true;
dense_cands->tvheap = dels;
BATsetcount(dense_cands, dense_cands->batCount - (hi - lo));
- ALGODEBUG fprintf(stderr, "#BATnegcands(cands=" ALGOBATFMT ","
- "dels=" ALGOBATFMT ")\n",
- ALGOBATPAR(dense_cands),
- ALGOBATPAR(odels));
+ DEBUG(ALGO, "BATnegcands(cands=" ALGOBATFMT ","
+ "dels=" ALGOBATFMT ")\n",
+ ALGOBATPAR(dense_cands),
+ ALGOBATPAR(odels));
return GDK_SUCCEED;
}
diff --git a/gdk/gdk_cross.c b/gdk/gdk_cross.c
--- a/gdk/gdk_cross.c
+++ b/gdk/gdk_cross.c
@@ -9,6 +9,7 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
+#include "gdk_tracer.h"
/* Calculate a cross product between bats l and r with optional
* candidate lists sl for l and sr for r.
@@ -66,6 +67,6 @@ BATsubcross(BAT **r1p, BAT **r2p, BAT *l
}
*r1p = bn1;
*r2p = bn2;
- ALGODEBUG fprintf(stderr, "#BATsubcross()=(" ALGOBATFMT "," ALGOBATFMT
")\n", ALGOBATPAR(bn1), ALGOBATPAR(bn2));
+ DEBUG(ALGO, "BATsubcross()=(" ALGOBATFMT "," ALGOBATFMT ")\n",
ALGOBATPAR(bn1), ALGOBATPAR(bn2));
return GDK_SUCCEED;
}
diff --git a/gdk/gdk_delta.c b/gdk/gdk_delta.c
--- a/gdk/gdk_delta.c
+++ b/gdk/gdk_delta.c
@@ -25,6 +25,7 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
+#include "gdk_tracer.h"
/*
* batcommit really forgets the atoms guarded for an undo; we just
@@ -35,7 +36,7 @@ BATcommit(BAT *b)
{
if (b == NULL)
return;
- DELTADEBUG fprintf(stderr, "#BATcommit1 %s free %zu ins " BUNFMT " base
%p\n",
+ DEBUG(DELTA, "BATcommit1 %s free %zu ins " BUNFMT " base %p\n",
BATgetId(b),
b->theap.free,
b->batInserted,
@@ -47,11 +48,11 @@ BATcommit(BAT *b)
b->batDirtydesc = true;
}
b->batInserted = BUNlast(b);
- DELTADEBUG fprintf(stderr, "#BATcommit2 %s free %zu ins " BUNFMT " base
%p\n",
- BATgetId(b),
- b->theap.free,
- b->batInserted,
- b->theap.base);
+ DEBUG(DELTA, "BATcommit2 %s free %zu ins " BUNFMT " base %p\n",
+ BATgetId(b),
+ b->theap.free,
+ b->batInserted,
+ b->theap.base);
}
/*
@@ -83,7 +84,7 @@ BATundo(BAT *b)
if (b == NULL)
return;
- DELTADEBUG fprintf(stderr, "#BATundo %s \n", BATgetId(b));
+ DEBUG(DELTA, "BATundo: %s \n", BATgetId(b));
if (b->batDirtyflushed) {
b->batDirtydesc = b->theap.dirty = true;
} else {
diff --git a/gdk/gdk_delta.h b/gdk/gdk_delta.h
--- a/gdk/gdk_delta.h
+++ b/gdk/gdk_delta.h
@@ -21,8 +21,8 @@
(P1)->theap.free = 0; \
(P1)->batInserted = 0; \
(P1)->tshift = ATOMelmshift(Tsize(P1)); \
- DELTADEBUG fprintf(stderr, \
- "#DELTAinit %s free %zu ins " BUNFMT \
+ DEBUG(DELTA, \
+ "%s free %zu ins " BUNFMT \
" base %p\n", \
BATgetId(P1), \
(P1)->theap.free, \
diff --git a/gdk/gdk_tm.c b/gdk/gdk_tm.c
--- a/gdk/gdk_tm.c
+++ b/gdk/gdk_tm.c
@@ -20,6 +20,7 @@
#include "gdk.h"
#include "gdk_private.h"
#include "gdk_tm.h"
+#include "gdk_tracer.h"
/*
* The physical (disk) commit protocol is handled mostly by
@@ -102,7 +103,7 @@ epilogue(int cnt, bat *subcommit)
if (b) {
/* check mmap modes */
if (BATcheckmodes(b, true) != GDK_SUCCEED)
- fprintf(stderr, "#epilogue:
BATcheckmodes failed\n");
+ ERROR(GDK_TM, "BATcheckmodes failed\n");
}
}
if ((BBP_status(bid) & BBPDELETED) && BBP_refs(bid) <= 0 &&
BBP_lrefs(bid) <= 0) {
diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -86,6 +86,8 @@ static const char *LAYER_STR[] = {
COMP( ALLOC ) \
COMP( PAR ) \
COMP( ALGO ) \
+ COMP( DELTA ) \
+ \
COMP( GEOM ) \
COMP( LIDAR ) \
COMP( BAM ) \
@@ -171,6 +173,8 @@ static const char *LAYER_STR[] = {
COMP( MAL_OPT_MACRO ) \
COMP( MAL_OPT_POSTFIX ) \
\
+ COMP( GDK_TM ) \
+ \
COMP( COMPONENTS_COUNT ) \
typedef enum {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
