Update of /cvsroot/monetdb/MonetDB5/src/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32665/src/mal
Modified Files:
mal_recycle.mx
Log Message:
improved the monitoring (ie we now keep number of statements (nr of calls too
RECYCLEentry) and number of recycled)
Todo improve saved time
Index: mal_recycle.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_recycle.mx,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- mal_recycle.mx 12 Mar 2008 07:20:08 -0000 1.36
+++ mal_recycle.mx 12 Mar 2008 08:19:52 -0000 1.37
@@ -198,6 +198,7 @@
@- Monitoring the Recycler
@c
lng recyclerUsedMemory = 0;
+int statements = 0;
int recycled = 0;
int savedTime = 0; /* sum of all recycled clk's */
int monitorRecycler = 0;
@@ -285,9 +286,9 @@
recyclerUsedMemory -= recycleBlk->profiler[max].obytes;
removeInstruction(recycleBlk,getInstrPtr(recycleBlk,max));
if (monitorRecycler)
- fprintf(stderr, "memory=%lld, stop=%d,
recycled=%d, saved=%d\n",
+ fprintf(stderr, "memory=%lld, stop=%d,
recycled=%d(%d), saved=%d\n",
recyclerUsedMemory, recycleBlk->stop,
- recycled, savedTime);
+ recycled, statements, savedTime);
recycleVersion++;
mal_unset_lock(recycleLock,"recycle");
}
@@ -348,9 +349,10 @@
recycleBlk->profiler[i].obytes = wr;
recyclerUsedMemory += wr;
if (monitorRecycler)
- fprintf(stderr, "memory=%lld, stop=%d, recycled=%d, saved=%d\n",
- recyclerUsedMemory, recycleBlk->stop,
- recycled, savedTime);
+ fprintf(stderr,
+ "memory=%lld, stop=%d, recycled=%d(%d), saved=%d\n",
+ recyclerUsedMemory, recycleBlk->stop,
+ recycled, statements, savedTime);
#ifdef _DEBUG_RECYCLE_
stream_printf(GDKout,"RECYCLE catalog \n");
printFunction(GDKout,recycleBlk,LIST_MAL_ALL);
@@ -501,7 +503,6 @@
getVar(mb,getArg(p,j))->recycle= getArg(q,j);
}
recycleBlk->profiler[i].counter++;
- recycled++;
savedTime += recycleBlk->profiler[i].ticks;
return i;
notfound: continue;
@@ -556,6 +557,8 @@
@c
if (recycleCacheLimit && i>=0)
RECYCLEcache(i);
+ statements++;
+ recycled += cnt==p->retc;
return cnt == p->retc;
}
-------------------------------------------------------------------------
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
