Update of /cvsroot/monetdb/MonetDB5/src/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6644/src/mal
Modified Files:
Tag: GDK-2
mal_profiler.mx mal_sabaoth.mx
Log Message:
propagated changes of Thursday Sep 06 2007 - Monday Sep 10 2007
from the development trunk to the GDK-2 branch
Index: mal_sabaoth.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_sabaoth.mx,v
retrieving revision 1.27.2.4
retrieving revision 1.27.2.5
diff -u -d -r1.27.2.4 -r1.27.2.5
--- mal_sabaoth.mx 6 Sep 2007 13:52:35 -0000 1.27.2.4
+++ mal_sabaoth.mx 10 Sep 2007 14:26:50 -0000 1.27.2.5
@@ -736,7 +736,9 @@
memmove(&avg30[0], &avg30[1], sizeof(int) * 29);
avg10[9] = avg30[29] = ret->crashavg1 =
(start != 0 ? (db->state != SABdbRunning ? 1 :
0) : 0);
- ret->crashcntr = ret->startcntr - ret->stopcntr;
+ ret->crashcntr =
+ ret->startcntr - (db->state == SABdbRunning ? 1
: 0) -
+ ret->stopcntr;
for (i = 0; i < 10; i++)
ret->crashavg10 += avg10[i];
ret->crashavg10 = ret->crashavg10 / 10.0;
Index: mal_profiler.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_profiler.mx,v
retrieving revision 1.98.4.2
retrieving revision 1.98.4.3
diff -u -d -r1.98.4.2 -r1.98.4.3
--- mal_profiler.mx 10 Aug 2007 15:39:43 -0000 1.98.4.2
+++ mal_profiler.mx 10 Sep 2007 14:26:50 -0000 1.98.4.3
@@ -154,7 +154,6 @@
...
profiler.stop();
@end example
[EMAIL PROTECTED] Stethoscope The MAL Modules, Event Caching, The MAL Profiler
@{
The profiler is activated by defining MALprofiler in the source tree.
This leads to securing space for the counters and for code
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
