Changeset: cab6171bd6f4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cab6171bd6f4
Modified Files:
gdk/gdk_batop.c
gdk/gdk_hash.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_orderidx.c
gdk/gdk_project.c
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (237 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1065,7 +1065,9 @@ BATkeyed(BAT *b)
int
BATordered(BAT *b)
{
- lng t0 = GDKusec();
+ lng t0 = 0;
+
+ ALGODEBUG t0 = GDKusec();
if (b->ttype == TYPE_void)
return 1;
@@ -1151,7 +1153,9 @@ BATordered(BAT *b)
int
BATordered_rev(BAT *b)
{
- lng t0 = GDKusec();
+ lng t0 = 0;
+
+ ALGODEBUG t0 = GDKusec();
if (b == NULL)
return 0;
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -193,11 +193,11 @@ int
BATcheckhash(BAT *b)
{
int ret;
- lng t;
+ lng t = 0;
- t = GDKusec();
+ ALGODEBUG t = GDKusec();
MT_lock_set(&GDKhashLock(b->batCacheid));
- t = GDKusec() - t;
+ ALGODEBUG t = GDKusec() - t;
if (b->thash == (Hash *) 1) {
Hash *h;
Heap *hp;
@@ -285,9 +285,11 @@ BAThashsync(void *arg)
struct hashsync *hs = arg;
Heap *hp = hs->hp;
int fd;
- lng t0 = GDKusec();
+ lng t0 = 0;
const char *failed = " failed";
+ ALGODEBUG t0 = GDKusec();
+
if (HEAPsave(hp, hp->filename, NULL) == GDK_SUCCEED &&
(fd = GDKfdlocate(hp->farmid, hp->filename, "rb+", NULL)) >= 0) {
((size_t *) hp->base)[0] |= 1 << 24;
@@ -391,7 +393,7 @@ BAThash(BAT *b, BUN masksize)
p = q;
}
- t0 = GDKusec();
+ ALGODEBUG t0 = GDKusec();
do {
BUN nslots = mask >> 3; /* 1/8 full is too full */
@@ -519,9 +521,11 @@ BAThash(BAT *b, BUN masksize)
ALGODEBUG fprintf(stderr, "#BAThash: NOT persisting
hash %d\n", b->batCacheid);
#endif
b->thash = h;
- t1 = GDKusec();
- ALGODEBUG fprintf(stderr, "#BAThash: hash construction " LLFMT
" usec\n", t1 - t0);
- ALGODEBUG HASHcollisions(b, b->thash);
+ ALGODEBUG {
+ t1 = GDKusec();
+ fprintf(stderr, "#BAThash: hash construction " LLFMT "
usec\n", t1 - t0);
+ HASHcollisions(b, b->thash);
+ }
}
MT_lock_unset(&GDKhashLock(b->batCacheid));
return GDK_SUCCEED;
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -279,7 +279,7 @@ BATimprints(BAT *b)
{
BAT *o = NULL, *s1 = NULL, *s2 = NULL, *s3 = NULL, *s4 = NULL;
Imprints *imprints;
- lng t0 = 0, t1 = 0;
+ lng t0 = 0;
/* we only create imprints for types that look like types we know */
switch (ATOMbasetype(b->ttype)) {
@@ -316,7 +316,7 @@ BATimprints(BAT *b)
assert(b->timprints == NULL);
}
MT_lock_set(&GDKimprintsLock(b->batCacheid));
- t0 = GDKusec();
+ ALGODEBUG t0 = GDKusec();
if (b->timprints == NULL) {
BUN cnt;
str nme = BBP_physical(b->batCacheid);
@@ -496,8 +496,7 @@ BATimprints(BAT *b)
b->timprints = imprints;
}
- t1 = GDKusec();
- ALGODEBUG fprintf(stderr, "#BATimprints: imprints construction " LLFMT
" usec\n", t1 - t0);
+ ALGODEBUG fprintf(stderr, "#BATimprints: imprints construction " LLFMT
" usec\n", GDKusec() - t0);
MT_lock_unset(&GDKimprintsLock(b->batCacheid));
/* BBPUnfix tries to get the imprints lock which might lead to a
deadlock
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -3821,7 +3821,8 @@ gdk_return
BATleftjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, int
nil_matches, BUN estimate)
{
return subleftjoin(r1p, r2p, l, r, sl, sr, nil_matches,
- 0, 0, 0, estimate, "BATleftjoin", GDKusec());
+ 0, 0, 0, estimate, "BATleftjoin",
+ GDKdebug & ALGOMASK ? GDKusec() : 0);
}
/* Performs a left outer join over l and r. Returns two new, aligned,
@@ -3833,7 +3834,8 @@ gdk_return
BATouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, int
nil_matches, BUN estimate)
{
return subleftjoin(r1p, r2p, l, r, sl, sr, nil_matches,
- 1, 0, 0, estimate, "BATouterjoin", GDKusec());
+ 1, 0, 0, estimate, "BATouterjoin",
+ GDKdebug & ALGOMASK ? GDKusec() : 0);
}
/* Perform a semi-join over l and r. Returns two new, aligned,
@@ -3844,7 +3846,8 @@ gdk_return
BATsemijoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, int
nil_matches, BUN estimate)
{
return subleftjoin(r1p, r2p, l, r, sl, sr, nil_matches,
- 0, 1, 0, estimate, "BATsemijoin", GDKusec());
+ 0, 1, 0, estimate, "BATsemijoin",
+ GDKdebug & ALGOMASK ? GDKusec() : 0);
}
/* Return the difference of l and r. The result is a BAT with in the
@@ -3857,7 +3860,8 @@ BATdiff(BAT *l, BAT *r, BAT *sl, BAT *sr
BAT *bn;
if (subleftjoin(&bn, NULL, l, r, sl, sr, nil_matches,
- 0, 0, 1, estimate, "BATdiff", GDKusec()) == GDK_SUCCEED)
+ 0, 0, 1, estimate, "BATdiff",
+ GDKdebug & ALGOMASK ? GDKusec() : 0) == GDK_SUCCEED)
return bn;
return NULL;
}
@@ -3868,7 +3872,7 @@ BATthetajoin(BAT **r1p, BAT **r2p, BAT *
BAT *r1, *r2;
BUN maxsize;
int opcode = 0;
- lng t0;
+ lng t0 = 0;
/* encode operator as a bit mask into opcode */
switch (op) {
@@ -3894,7 +3898,7 @@ BATthetajoin(BAT **r1p, BAT **r2p, BAT *
return GDK_FAIL;
}
- t0 = GDKusec();
+ ALGODEBUG t0 = GDKusec();
*r1p = NULL;
*r2p = NULL;
if (joinparamcheck(l, r, NULL, sl, sr, "BATthetajoin") != GDK_SUCCEED)
@@ -3920,9 +3924,11 @@ BATjoin(BAT **r1p, BAT **r2p, BAT *l, BA
#endif
int swap;
size_t mem_size;
- lng t0 = GDKusec();
+ lng t0 = 0;
const char *reason = "";
+ ALGODEBUG t0 = GDKusec();
+
*r1p = NULL;
*r2p = NULL;
if (joinparamcheck(l, r, NULL, sl, sr, "BATjoin") != GDK_SUCCEED)
@@ -4067,7 +4073,9 @@ BATbandjoin(BAT **r1p, BAT **r2p, BAT *l
{
BAT *r1, *r2;
BUN maxsize;
- lng t0 = GDKusec();
+ lng t0 = 0;
+
+ ALGODEBUG t0 = GDKusec();
*r1p = NULL;
*r2p = NULL;
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -25,7 +25,9 @@ BATidxsync(void *arg)
struct idxsync *hs = arg;
Heap *hp = hs->hp;
int fd;
- lng t0 = GDKusec();
+ lng t0 = 0;
+
+ ALGODEBUG t0 = GDKusec();
if (HEAPsave(hp, hp->filename, NULL) != GDK_SUCCEED ||
(fd = GDKfdlocate(hp->farmid, hp->filename, "rb+", NULL)) < 0) {
@@ -58,10 +60,10 @@ int
BATcheckorderidx(BAT *b)
{
int ret;
- lng t;
+ lng t = 0;
assert(b->batCacheid > 0);
- t = GDKusec();
+ ALGODEBUG t = GDKusec();
MT_lock_set(&GDKhashLock(b->batCacheid));
if (b->torderidx == (Heap *) 1) {
Heap *hp;
diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -191,7 +191,9 @@ BATproject(BAT *l, BAT *r)
gdk_return res;
int tpe = ATOMtype(r->ttype), nilcheck = 1, stringtrick = 0;
BUN lcount = BATcount(l), rcount = BATcount(r);
- lng t0 = GDKusec();
+ lng t0 = 0;
+
+ ALGODEBUG t0 = GDKusec();
ALGODEBUG fprintf(stderr, "#BATproject(l=%s#" BUNFMT "%s%s%s,"
"r=%s#" BUNFMT "[%s]%s%s%s)\n",
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
