MonetDB: default - Minor code reshuffle

[Martin Kersten]

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

Minor code reshuffle


diffs (26 lines):

diff --git a/monetdb5/mal/mal_interpreter.mx b/monetdb5/mal/mal_interpreter.mx
--- a/monetdb5/mal/mal_interpreter.mx
+++ b/monetdb5/mal/mal_interpreter.mx
@@ -2582,11 +2582,10 @@ void releaseBAT(MalBlkPtr mb, MalStkPtr 
                        newclk = GDKusec();
                        mb->profiler[ppc].counter++;
                        mb->profiler[ppc].ticks = newclk - @1->clk;
+                       mb->profiler[ppc].totalticks += mb->profiler[ppc].ticks;
                        mb->profiler[ppc].clk += mb->profiler[ppc].clk;
-                       if (pci) {
-                               mb->profiler[ppc].rbytes = getVolume(stk, pci, 
0);
-                               mb->profiler[ppc].wbytes = getVolume(stk, pci, 
1);
-                       }
+                       mb->profiler[ppc].rbytes = getVolume(stk, pci, 0);
+                       mb->profiler[ppc].wbytes = getVolume(stk, pci, 1);
                        profilerEvent(cntxt->idx, mb, stk, ppc,"done ");
                        ppc = -1;
                }
@@ -2672,6 +2671,7 @@ lng getVolume(MalStkPtr stk, InstrPtr pc
        BAT *b;
        int isview = 0;
 
+       if ( pci == 0) return 0;
        limit = rd == 0 ? pci->retc : pci->argc;
        i = rd ? pci->retc : 0;
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list