Changeset: 352bad3ffcf0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=352bad3ffcf0
Modified Files:
monetdb5/mal/mal_profiler.c
Branch: default
Log Message:
Correct heartbeat object and add source attribute
Heartbeats had a trailing ',' and the cpuload list was in quotes. The
first problem is an error, and heartbeats would not parse. The second
would not let the user interpret the cpuload attribute as a list of
numbers.
Previously the heartbeat objects had a "user" attribute that always had
the value "heartbeat". The trace objects did not have a "user"
attribute (i.e. printing it was commented). Now both kinds of object
have an attribute "source" with the values "heartbeat" and "trace"
respectively.
diffs (84 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
@@ -139,6 +139,7 @@ EXAMPLE:
static void
renderProfilerEvent(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int start, str
usrname)
{
+ (void)usrname;
char logbuffer[LOGLEN], *logbase;
size_t loglen;
str stmt, c;
@@ -158,9 +159,7 @@ renderProfilerEvent(MalBlkPtr mb, MalStk
/* make profile event tuple */
lognew();
logadd("{%s",prettify); // fill in later with the event counter
-
- if( usrname)
- //logadd("\"user\":\"%s\",%s",usrname, prettify);
+ logadd("\"source\": \"trace\"%s", prettify);
logadd("\"clk\":"LLFMT",%s",usec,prettify);
logadd("\"ctime\":"LLFMT".%06ld,%s", sec, microseconds, prettify);
@@ -384,10 +383,10 @@ getCPULoad(char cpuload[BUFSIZ]){
static FILE *proc= NULL;
lng newload;
- if ( proc == NULL || ferror(proc))
+ if (proc == NULL || ferror(proc))
proc = fopen("/proc/stat","r");
else rewind(proc);
- if ( proc == NULL) {
+ if (proc == NULL) {
/* unexpected */
return -1;
}
@@ -395,10 +394,10 @@ getCPULoad(char cpuload[BUFSIZ]){
if ((n = fread(buf, 1, BUFSIZ,proc)) == 0 )
return -1;
buf[n] = 0;
- for ( s= buf; *s; s++) {
- if ( strncmp(s,"cpu",3)== 0){
+ for (s= buf; *s; s++) {
+ if (strncmp(s,"cpu",3)== 0){
s +=3;
- if ( *s == ' ') {
+ if (*s == ' ') {
s++;
cpu = 255; // the cpu totals stored here
} else {
@@ -428,12 +427,12 @@ getCPULoad(char cpuload[BUFSIZ]){
s++;
}
- if( cpuload == 0)
+ if(cpuload == 0)
return 0;
// identify core processing
- len += snprintf(cpuload, BUFSIZ, "[ ");
- for ( cpu = 0; cpuload && cpu < 255 && corestat[cpu].user; cpu++) {
- len +=snprintf(cpuload + len, BUFSIZ - len, "%c %.2f",
(cpu?',':' '), corestat[cpu].load);
+ len += snprintf(cpuload, BUFSIZ, "[");
+ for (cpu = 0; cpuload && cpu < 255 && corestat[cpu].user; cpu++) {
+ len +=snprintf(cpuload + len, BUFSIZ - len, "%s%.2f",
(cpu?",":""), corestat[cpu].load);
}
(void) snprintf(cpuload + len, BUFSIZ - len, "]");
return 0;
@@ -455,7 +454,7 @@ profilerHeartbeatEvent(char *alter)
lognew();
logadd("{%s",prettify); // fill in later with the event counter
- logadd("\"user\":\"heartbeat\",%s", prettify);
+ logadd("\"source\":\"heartbeat\",%s", prettify);
logadd("\"rss\":"SZFMT ",%s", MT_getrss()/1024/1024, prettify);
#ifdef HAVE_SYS_RESOURCE_H
getrusage(RUSAGE_SELF, &infoUsage);
@@ -472,7 +471,7 @@ profilerHeartbeatEvent(char *alter)
prevUsage = infoUsage;
#endif
logadd("\"state\":\"%s\",%s",alter,prettify);
- logadd("\"cpuload\":\"%s\",%s",cpuload,prettify);
+ logadd("\"cpuload\":%s%s",cpuload,prettify);
logadd("}\n"); // end marker
logjsonInternal(logbuffer);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
