Changeset: 3e9588f8b1b5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3e9588f8b1b5
Modified Files:
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
sql/backends/monet5/sql_scenario.c
sql/server/sql_mvc.c
sql/storage/sql_storage.h
Branch: sql_profiler
Log Message:
Fix typo.
diffs (77 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
@@ -184,7 +184,7 @@ logadd(struct logbuf *logbuf, const char
* Profiling a generic event follows the same implementation of ProfilerEvent.
*/
static str
-prepare_generic_event(str face, struct GenericEvent e, int state)
+prepare_generic_event(str phase, struct GenericEvent e, int state)
{
struct logbuf logbuf = {0};
lng clk = GDKusec();
@@ -208,7 +208,7 @@ prepare_generic_event(str face, struct G
clk,
mclk,
THRgettid(),
- face,
+ phase,
state ? "done" : "start",
e.cid ? *e.cid : 0,
e.tid ? *e.tid : 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
@@ -35,7 +35,7 @@ mal_export str openProfilerStream(Client
mal_export str closeProfilerStream(Client cntxt);
mal_export void profilerEvent(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci, int start);
-mal_export void generic_event(str face, struct GenericEvent e, int state);
+mal_export void generic_event(str phase, struct GenericEvent e, int state);
mal_export void sqlProfilerEvent(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
mal_export str startProfiler(Client cntxt);
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
@@ -1223,9 +1223,9 @@ SQLparser(Client c)
if(malProfileMode > 0)
generic_event("rel_to_mal",
- (struct GenericEvent)
- { &c->idx,
&(c->curprg->def->tag), NULL, NULL, c->query? 0 : 1 },
- 1);
+ (struct GenericEvent)
+ { &c->idx,
&(c->curprg->def->tag), NULL, NULL, c->query? 0 : 1 },
+ 1);
} else {
char *q_copy = sa_strdup(m->sa, c->query);
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -125,10 +125,10 @@ mvc_fix_depend(mvc *m, sql_column *depid
}
static void
-generic_event_wrapper(str face, ulng tid, int rc, int state)
+generic_event_wrapper(str phase, ulng tid, int rc, int state)
{
if(malProfileMode > 0)
- generic_event(face,
+ generic_event(phase,
(struct GenericEvent)
{ NULL, NULL, &tid, NULL, rc },
state);
diff --git a/sql/storage/sql_storage.h b/sql/storage/sql_storage.h
--- a/sql/storage/sql_storage.h
+++ b/sql/storage/sql_storage.h
@@ -331,7 +331,7 @@ extern res_table *res_tables_remove(res_
sql_export void res_tables_destroy(res_table *results);
extern res_table *res_tables_find(res_table *results, int res_id);
-typedef void (*generic_event_wrapper_fptr) (str face, ulng tid, int rc, int
state);
+typedef void (*generic_event_wrapper_fptr) (str phase, ulng tid, int rc, int
state);
extern struct sqlstore *store_init(int debug, store_type store, int readonly,
int singleuser, generic_event_wrapper_fptr event_wrapper);
extern void store_exit(struct sqlstore *store);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
