MonetDB: default - Refine the rendering of trace info

[Martin Kersten]

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

Refine the rendering of trace info


diffs (33 lines):

diff --git a/monetdb5/mal/mal_listing.c b/monetdb5/mal/mal_listing.c
--- a/monetdb5/mal/mal_listing.c
+++ b/monetdb5/mal/mal_listing.c
@@ -119,7 +119,7 @@ renderTerm(MalBlkPtr mb, MalStkPtr stk, 
        }
 
        // show the properties when required 
-       if (flg & LIST_MAL_PROPS){
+       if ( (flg & LIST_MAL_PROPS) && idx < p->retc) {
                pstring = varGetPropStr(mb,varid);
                if( pstring)
                        snprintf(buf+len,maxlen-len,"%s",pstring);
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
@@ -231,7 +231,7 @@ offlineProfilerEvent(MalBlkPtr mb, MalSt
                // TODO Obfusate instructions unless administrator calls for it.
                
                /* generate actual call statement */
-               stmt = instruction2str(mb, stk, pci, LIST_MAL_CALL);
+               stmt = instruction2str(mb, stk, pci, LIST_MAL_ALL);
                c = stmt;
 
                while (c && *c && isspace((int)*c))
@@ -702,7 +702,7 @@ cachedProfilerEvent(MalBlkPtr mb, MalStk
        snprintf(ctm + 19, 6, ".%03d", (int)(clock.tv_usec / 1000));
 
        /* generate actual call statement */
-       stmt = instruction2str(mb, stk, pci, LIST_MAL_CALL);
+       stmt = instruction2str(mb, stk, pci, LIST_MAL_ALL);
        c = stmt;
 
        while (c && *c && (isspace((int)*c) || *c == '!'))
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list