MonetDB: leftmart - better timing messages

[lsidir]

Changeset: 1f485f1354e2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f485f1354e2
Modified Files:
        gdk/gdk_hash.c
        gdk/gdk_imprints.c
        gdk/gdk_orderidx.c
Branch: leftmart
Log Message:

better timing messages


diffs (52 lines):

diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -267,7 +267,7 @@ BATcheckhash(BAT *b)
                                        b->T->hash = h;
                                        ALGODEBUG fprintf(stderr, 
"#BATcheckhash: reusing persisted hash %s\n", BATgetId(b));
                                        
MT_lock_unset(&GDKhashLock(abs(b->batCacheid)));
-                                       IDXACCESS fprintf(stderr, "[%d,%d]:%c 
(" BUNFMT ") #BATcheckhash: load persistent hash index (ms=" LLFMT
+                                       IDXACCESS fprintf(stderr, "[%d,%d]:%c 
(" BUNFMT ") #BATcheckhash: load persistent hash index (usec " LLFMT
                                                                  ")\n", 
b->batCacheid,-VIEWtparent(b), h->type, BATcount(b), GDKusec() - t);
                                        return 1;
                                }
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -186,12 +186,14 @@ int
 BATcheckimprints(BAT *b)
 {
        int ret;
+       lng t;
 
        if (VIEWtparent(b)) {
                assert(b->T->imprints == NULL);
                b = BBPdescriptor(-VIEWtparent(b));
        }
 
+       t = GDKusec();
        MT_lock_set(&GDKimprintsLock(abs(b->batCacheid)));
        if (b->T->imprints == (Imprints *) 1) {
                Imprints *imprints;
@@ -244,7 +246,9 @@ BATcheckimprints(BAT *b)
                                        b->T->imprints = imprints;
                                        ALGODEBUG fprintf(stderr, 
"#BATcheckimprints: reusing persisted imprints %d\n", b->batCacheid);
                                        
MT_lock_unset(&GDKimprintsLock(abs(b->batCacheid)));
-                                       IDXACCESS fprintf(stderr, "[%d] 
#BATcheckimprints: loaded persistent imprints\n", b->batCacheid);
+                                       IDXACCESS fprintf(stderr, "[%d,%d]:%d 
(" BUNFMT ") #BATcheckimprints: load persistent imprints index (usec " LLFMT
+                                                                 ")\n", 
b->batCacheid,-VIEWtparent(b), b->ttype, BATcount(b), GDKusec() - t);
+
                                        return 1;
                                }
                                GDKfree(imprints);
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -63,7 +63,6 @@ BATcheckorderidx(BAT *b)
        assert(b->batCacheid > 0);
        t = GDKusec();
        MT_lock_set(&GDKhashLock(abs(b->batCacheid)));
-       t = GDKusec() - t;
        if (b->torderidx == (Heap *) 1) {
                Heap *hp;
                const char *nme = BBP_physical(b->batCacheid);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list