MonetDB: default - Always inject profiler event properties if yo...

[Martin Kersten]

Changeset: 7d51b4d653a4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7d51b4d653a4
Modified Files:
        monetdb5/optimizer/opt_fastpath.c
        monetdb5/optimizer/opt_pipes.c
        monetdb5/optimizer/opt_profiler.c
Branch: default
Log Message:

Always inject profiler event properties if you wish to profile.


diffs (45 lines):

diff --git a/monetdb5/optimizer/opt_fastpath.c 
b/monetdb5/optimizer/opt_fastpath.c
--- a/monetdb5/optimizer/opt_fastpath.c
+++ b/monetdb5/optimizer/opt_fastpath.c
@@ -64,7 +64,7 @@ OPTminimalfastImplementation(Client cntx
        if( msg == MAL_SUCCEED) msg = OPTdeadcodeImplementation(cntxt, mb, stk, 
p);
        if( msg == MAL_SUCCEED) msg = OPTmultiplexImplementation(cntxt, mb, 
stk, p);
        if( msg == MAL_SUCCEED) msg = OPTgeneratorImplementation(cntxt, mb, 
stk, p);
-       //if( msg == MAL_SUCCEED) msg = OPTprofilerImplementation(cntxt, mb, 
stk, p);
+       if( msg == MAL_SUCCEED) msg = OPTprofilerImplementation(cntxt, mb, stk, 
p);
        //if( msg == MAL_SUCCEED) msg = OPTcandidatesImplementation(cntxt, mb, 
stk, p);
        if( msg == MAL_SUCCEED) msg = OPTgarbageCollectorImplementation(cntxt, 
mb, stk, p);
 
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -49,7 +49,7 @@ static struct PIPELINES {
         "optimizer.deadcode();"
         "optimizer.multiplex();"
         "optimizer.generator();"
-        //"optimizer.profiler();" only for decoration in the profiler
+        "optimizer.profiler();" 
         //"optimizer.candidates();" only for decoration in explain
         //"optimizer.mask();"
         "optimizer.garbageCollector();",
diff --git a/monetdb5/optimizer/opt_profiler.c 
b/monetdb5/optimizer/opt_profiler.c
--- a/monetdb5/optimizer/opt_profiler.c
+++ b/monetdb5/optimizer/opt_profiler.c
@@ -13,6 +13,7 @@
 
 #include "monetdb_config.h"
 #include "mal_instruction.h"
+#include "mal_profiler.h"
 #include "opt_prelude.h"
 #include "opt_profiler.h"
 
@@ -28,6 +29,9 @@ OPTprofilerImplementation(Client cntxt, 
        (void) pci;
        (void) stk;
        (void) cntxt;
+       /* we only need the beautified version if we plan to emit events */
+       if(malProfileMode == 0 )
+               return MAL_SUCCEED;
 
        for( i=0; i< mb->stop; i++){
                p= getInstrPtr(mb,i);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list