Changeset: a3daa9db48a3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a3daa9db48a3
Modified Files:
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
sql/include/sql_catalog.h
Branch: Jul2021_prof_ext
Log Message:
Fix type in structs. Fix format of json objs.
diffs (65 lines):
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -185,18 +185,17 @@ static str
prepareGenericEvent(str phase, struct GenericEvent e)
{
struct logbuf logbuf = {0};
- lng clk = GDKusec();
- uint64_t mclk = (uint64_t)clk - ((uint64_t)startup_time.tv_sec*1000000
- (uint64_t)startup_time.tv_usec);
+ uint64_t mclk = (uint64_t)e.clk -
((uint64_t)startup_time.tv_sec*1000000 - (uint64_t)startup_time.tv_usec);
if (logadd(&logbuf,
"{"
"\"version\":\""MONETDB_VERSION" (hg id: %s)\""
- ",\"clk\":"LLFMT
- ",\"mclk\":%"PRIu64""
+ ",\"clk\":"ULLFMT
+ ",\"mclk\":"ULLFMT
",\"thread\":%d"
",\"phase\":\"%s\""
",\"state\":\"done\""
- ",\"usec\":"LLFMT
+ ",\"usec\":"ULLFMT
",\"clientid\":\"%d\""
",\"transactionid\":"ULLFMT
",\"tag\":"OIDFMT
@@ -204,10 +203,11 @@ prepareGenericEvent(str phase, struct Ge
",\"rc\":\"%d\""
"}\n",
mercurial_revision(),
- clk,
+ e.clk,
mclk,
THRgettid(),
phase,
+ e.usec,
e.cid ? *e.cid : 0,
e.tid ? *e.tid : 0,
e.tag ? *e.tag : 0,
diff --git a/monetdb5/mal/mal_profiler.h b/monetdb5/mal/mal_profiler.h
--- a/monetdb5/mal/mal_profiler.h
+++ b/monetdb5/mal/mal_profiler.h
@@ -25,8 +25,8 @@ struct GenericEvent {
oid* tag; /* tag of the assoc MAL block */
ulng* tid; /* transaction_id */
str query; /* statement */
- lng usec; /* event duration */
- lng clk; /* GDKusec in callside */
+ ulng usec; /* event duration */
+ ulng clk; /* GDKusec in callside */
int rc; /* return code */
};
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -302,7 +302,7 @@ typedef struct sql_trans {
ulng ts; /* transaction start timestamp */
ulng tid; /* transaction id */
- lng clk_start; /* transaction start timestamp in microseconds */
+ ulng clk_start; /* transaction start timestamp in microseconds */
sql_store store; /* keep link into the global store */
MT_Lock lock; /* lock protecting concurrent writes to the
changes list */
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
