Changeset: 6107d21194aa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6107d21194aa
Modified Files:
monetdb5/mal/mal_runtime.c
Branch: mutation
Log Message:
merge with default.
diffs (16 lines):
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -130,11 +130,11 @@ runtimeProfileBegin(Client cntxt, MalBlk
/* always collect the MAL instruction execution time */
if ( mb->profiler)
mb->profiler[stkpc].ticks = GDKusec();
+ prof->stkpc = stkpc;
if (malProfileMode == 0)
return; /* mostly true */
- prof->stkpc = stkpc;
if (stk && mb->profiler != NULL && mb->profiler[stkpc].trace) {
gettimeofday(&mb->profiler[stkpc].clock, NULL);
/* emit the instruction upon start as well */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
