Changeset: 5c80622bef5d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5c80622bef5d
Modified Files:
monetdb5/mal/mal_profiler.c
sql/backends/monet5/sql_scenario.c
Branch: Jul2021_prof_ext
Log Message:
Disable start event of non-mal stmts. Query can be identified through sql_parse
event.
Remove logging of pc==1.
diffs (47 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
@@ -194,7 +194,7 @@ prepare_generic_event(str phase, struct
",\"clk\":"LLFMT
",\"mclk\":%"PRIu64""
",\"thread\":%d"
- ",\"face\":\"%s\""
+ ",\"phase\":\"%s\""
",\"state\":\"%s\""
",\"clientid\":\"%d\""
",\"transactionid\":"ULLFMT
@@ -236,6 +236,7 @@ render_generic_event(str msg, struct Gen
void
generic_event(str msg, struct GenericEvent e, int state)
{
+ if (state == 0) return; // ignore start of non-mal event
if( maleventstream ) {
render_generic_event(msg, e, state);
}
@@ -683,11 +684,11 @@ profilerEvent(Client cntxt, MalBlkPtr mb
if (pci == NULL) return;
if (getModuleId(pci) == myname) // ignore profiler commands from
monitoring
return;
+ if (start == TRUE) return; // ignore start of mal event
+ if ( mb && (getPC(mb,pci) != 0)) return; // ignore event that are not
PC = 0
if(maleventstream) {
- if( mb && (getPC(mb,pci) == 0 || getPC(mb,pci) == 1) && start
== FALSE) {
- renderProfilerEvent(cntxt, mb, stk, pci, start);
- }
+ renderProfilerEvent(cntxt, mb, stk, pci, start);
if (!start && pci->pc ==0)
profilerHeartbeatEvent("ping");
if (start && pci->token == ENDsymbol)
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1148,7 +1148,7 @@ SQLparser(Client c)
c->query = query_cleaned(m->sa, QUERY(m->scanner));
if(malProfileMode > 0) {
- str escaped_query = c->query? mal_quote(c->query,
sizeof(c->query)) : NULL;
+ str escaped_query = c->query? mal_quote(c->query,
strlen(c->query)) : NULL;
generic_event("sql_parse",
(struct GenericEvent)
{ &c->idx, &(c->curprg->def->tag),
NULL, escaped_query, c->query? 0 : 1 },
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
