Changeset: 97b69f686f2a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=97b69f686f2a
Modified Files:
        monetdb5/mal/mal_profiler.c
Branch: default
Log Message:

Profiler JSON objects now carry version information


diffs (30 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
@@ -15,6 +15,7 @@
  * reset once the owner leaves.
  */
 #include "monetdb_config.h"
+#include "mutils.h"         /* mercurial_revision */
 #include "mal_function.h"
 #include "mal_listing.h"
 #include "mal_profiler.h"
@@ -56,6 +57,7 @@ static struct{
        double load;
 } corestat[256];
 
+
 /* the heartbeat process produces a ping event once every X milliseconds */
 //#ifdef ATOMIC_LOCK
 //static MT_Lock mal_beatLock MT_LOCK_INITIALIZER("beatLock");
@@ -153,6 +155,10 @@ renderProfilerEvent(MalBlkPtr mb, MalStk
        /* make profile event tuple  */
        lognew();
        logadd("{%s",prettify); // fill in later with the event counter
+       /* TODO: This could probably be optimized somehow to avoid the
+        * function call to mercurial_revision().
+        */
+       logadd("\"version\":\""VERSION" (hg id: %s)\",%s", 
mercurial_revision(), prettify);
        logadd("\"source\":\"trace\",%s", prettify);
 
        logadd("\"clk\":"LLFMT",%s", usec, prettify);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to