MonetDB: default - Reduce tracing of malloc information in steth...

[Martin Kersten]

Changeset: a423006bb8bd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a423006bb8bd
Modified Files:
        monetdb5/mal/mal_profiler.c
Branch: default
Log Message:

Reduce tracing of malloc information in stethoscope
The detailed memory breakdown for malloc structures in the mal_profiler
is replaced by the more informative RSS level. It shows the memory
footprint as observed at the time of event generation.


diffs (66 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
@@ -216,6 +216,8 @@ offlineProfilerHeader(void)
        }
 
        if (profileCounter[PROFmemory].status) {
+               log("rss,\t");
+/*
                log("maxrss,\t");
                log("arena,\t");
                log("ordblks,\t");
@@ -224,6 +226,7 @@ offlineProfilerHeader(void)
                log("hblks,\t");
                log("fsmblks,\t");
                log("uordblks,\t");
+*/
        }
        if (profileCounter[PROFreads].status)
                log("blk reads,\t");
@@ -256,7 +259,7 @@ offlineProfilerHeader(void)
 void
 offlineProfilerEvent(int idx, MalBlkPtr mb, MalStkPtr stk, int pc, int start)
 {
-       static struct Mallinfo prevMalloc;
+       /*static struct Mallinfo prevMalloc;*/
        InstrPtr pci = getInstrPtr(mb, pc);
 
 #ifdef HAVE_SYS_RESOURCE_H
@@ -267,7 +270,9 @@ offlineProfilerEvent(int idx, MalBlkPtr 
 #ifdef HAVE_TIMES
        struct tms newTms;
 #endif
+/*
        struct Mallinfo infoMalloc;
+*/
        str stmt, c;
 
        if (delayswitch > 0) {
@@ -290,7 +295,9 @@ offlineProfilerEvent(int idx, MalBlkPtr 
 #ifdef HAVE_TIMES
        times(&newTms);
 #endif
+/*
        infoMalloc = MT_mallinfo();
+*/
 #ifdef HAVE_SYS_RESOURCE_H
        getrusage(RUSAGE_SELF, &infoUsage);
 #endif
@@ -355,6 +362,8 @@ offlineProfilerEvent(int idx, MalBlkPtr 
 #endif
 
        if (profileCounter[PROFmemory].status && delayswitch < 0) {
+               log(SZFMT ",\t", MT_getrss());
+/*
 #ifdef HAVE_SYS_RESOURCE_H
                log("%ld,\t", infoUsage.ru_maxrss);
 #endif
@@ -366,6 +375,7 @@ offlineProfilerEvent(int idx, MalBlkPtr 
                log(SZFMT ",\t", (size_t)(infoMalloc.fsmblks - 
prevMalloc.fsmblks));
                log(SZFMT ",\t", (size_t)(infoMalloc.uordblks - 
prevMalloc.uordblks));
                prevMalloc = infoMalloc;
+*/
        }
 #ifdef HAVE_SYS_RESOURCE_H
        if ((profileCounter[PROFreads].status ||
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list