Update of /cvsroot/monetdb/MonetDB5/src/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18627

Modified Files:
        mal_interpreter.mx 
Log Message:
Initialize the performance profile flags once per block


Index: mal_interpreter.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_interpreter.mx,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -d -r1.221 -r1.222
--- mal_interpreter.mx  17 Mar 2008 07:02:29 -0000      1.221
+++ mal_interpreter.mx  17 Mar 2008 07:30:58 -0000      1.222
@@ -635,6 +635,8 @@
        lng oldtimer=0;
        struct Mallinfo oldMemory;
        int stkpc=0;
+       FlowStep flow;
+       char *pending;
 
 #ifdef HAVE_SYS_RESOURCE_H
        int oldinblock=0;
@@ -647,8 +649,6 @@
 The instructions are sorted by dependency on enabled input
 arguments.
 @c
-       FlowStep flow;
-       char *pending;
 
        (void)env;
        (void)pcicaller;
@@ -1608,24 +1608,27 @@
 #ifdef MALprofiler
        lng newclk=0;
        int ppc= -1;
+       if (malProfileMode)
+               setFilterOnBlock(mb, 0, 0);
 #endif
 @= beginProfile
 #ifdef MALprofiler
        if (malProfileMode == 0)
                /* mostly true */;
        else {
-               setFilterOnBlock(mb, 0, 0);
-               if( mb->profiler != NULL && mb->profiler[stkpc].trace)
-               {
-                       ppc= stkpc;
+               if( mb->profiler != NULL ){
                        stk->clk= GDKusec();
-                       mb->profiler[ppc].clk= stk->clk;
-                       time(&stk->clock);
-                       mb->profiler[ppc].clock= stk->clock;
+                       if( mb->profiler[stkpc].trace)
+                       {
+                               ppc= stkpc;
+                               mb->profiler[ppc].clk= stk->clk;
+                               time(&stk->clock);
+                               mb->profiler[ppc].clock= stk->clock;
 #ifdef HAVE_TIMES
-                       times(&stk->timer);
-                       mb->profiler[ppc].timer= stk->timer;
+                               times(&stk->timer);
+                               mb->profiler[ppc].timer= stk->timer;
 #endif
+                       }
                }
        }
 #endif


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to