Changeset: f3a714c78be0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f3a714c78be0
Modified Files:
clients/mapiclient/stethoscope.c
monetdb5/mal/mal_profiler.c
Branch: default
Log Message:
Use the enclosing module name for reference
The instruction already contains module.operator, which leaves the +f
option free to denote the enclosing mal block. This simplifies stethoscope
tools to denote the context.
diffs (27 lines):
diff --git a/clients/mapiclient/stethoscope.c b/clients/mapiclient/stethoscope.c
--- a/clients/mapiclient/stethoscope.c
+++ b/clients/mapiclient/stethoscope.c
@@ -120,7 +120,7 @@ usage(void)
fprintf(stderr, " S = monitor start of instruction profiling\n");
fprintf(stderr, " a = aggregate clock ticks per instruction\n");
fprintf(stderr, " e = event counter\n");
- fprintf(stderr, " f = module.function name\n");
+ fprintf(stderr, " f = enclosing module.function name\n");
fprintf(stderr, " i = instruction counter\n");
fprintf(stderr, " I = interpreter thread number\n");
fprintf(stderr, " T = wall clock time\n");
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
@@ -328,9 +328,8 @@ offlineProfilerEvent(int idx, MalBlkPtr
log(LLFMT",\t", memoryclaims?((lng)(MEMORY_THRESHOLD *
monet_memory)-memorypool)/1024/1024:0);
}
if (profileCounter[PROFfunc].status) {
- if (getModuleId(pci) && getFunctionId(pci)) {
- log2("\"%s.%s\",\t",
- getModuleId(pci), getFunctionId(pci));
+ if (getModuleId(getInstrPtr(mb,0)) &&
getFunctionId(getInstrPtr(mb,0))) {
+ log2("\"%s.%s\",\t", getModuleId(getInstrPtr(mb,0)),
getFunctionId(getInstrPtr(mb,0)));
} else
log("\"%s\",\t", operatorName(pci->token));
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
