Changeset: 56df106730b3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=56df106730b3
Modified Files:
        monetdb5/modules/mal/xid.c
Branch: xid
Log Message:

Keep an eye on the wallclock


diffs (25 lines):

diff --git a/monetdb5/modules/mal/xid.c b/monetdb5/modules/mal/xid.c
--- a/monetdb5/modules/mal/xid.c
+++ b/monetdb5/modules/mal/xid.c
@@ -248,8 +248,8 @@ XIDcompressCol( Client cntxt, InstrPtr p
                col[XID_IDX_ORIG].count = (xid)cnt; /* keep original size */
                col[XID_IDX_COMP].count = (xid)(i+1); /* keep compression size 
*/
                col[XID_IDX_SHIF].count = (xid)min; /* keep oid range shift */
-               mnstr_printf(cntxt->fdout,"#xid, %d, %s compress, " BUNFMT "," 
BUNFMT ", %4.2f  clk " LLFMT " usec\n",
-                       getArg(pci,0), s, cnt, i, i/(cnt/100.0), GDKusec()-clk);
+               mnstr_printf(cntxt->fdout,"#xid, %d, %s compress, " BUNFMT "," 
BUNFMT ", %4.2f  clk " LLFMT " sec "LLFMT " usec\n",
+                       getArg(pci,0), s, cnt, i, i/(cnt/100.0), 
GDKusec()/1000000, GDKusec()-clk);
 
                cn->heap.xidcompressed = 1;
        }
@@ -526,8 +526,8 @@ XIDdecompressCol( Client cntxt, InstrPtr
                msg = XIDdecode(&cnt,col,o,lim,cap,min);
                if (msg != MAL_SUCCEED)
                        return msg;
-               mnstr_printf(cntxt->fdout,"#xid, %d, %s decompress, " BUNFMT ", 
" BUNFMT ", clk " LLFMT " usec\n",
-                       getArg(pci,1), s, lim, cnt, GDKusec()-clk);
+               mnstr_printf(cntxt->fdout,"#xid, %d, %s decompress, " BUNFMT ", 
" BUNFMT ", clk " LLFMT " sec " LLFMT " usec\n",
+                       getArg(pci,1), s, lim, cnt, GDKusec()/1000000, 
GDKusec()-clk);
                if (cnt != cap)
                        throw(MAL, "xid.decompress", "decompressed %s count 
does not match original count: "BUNFMT" != "BUNFMT"", s, cnt, cap);
 
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to