On Tue, Dec 16, 2008 at 05:28:57PM +0000, Milena Ivanova wrote:

Update of /cvsroot/monetdb/MonetDB5/src/mal In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4716

Modified Files: mal_interpreter.mx mal_recycle.mx Log Message: Subsumed instructions are not recycled. This is checked in the proper place before the attempt to obtain the lock. Mtest gave No differences encountered during testing.

"Comfirmed" ;-) Thanks! Stefan

U mal_recycle.mx Index: mal_recycle.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_recycle.mx,v retrieving revision 1.169 retrieving revision 1.170 diff -u -d -r1.169 -r1.170 --- mal_recycle.mx 15 Dec 2008 16:13:13 -0000 1.169 +++ mal_recycle.mx 16 Dec 2008 17:28:55 -0000 1.170 @@ -114,7 +114,6 @@ mal_export int recycleCacheLimit; mal_export lng recycleMemory; /* Units of memory permitted */ mal_export lng recyclerUsedMemory; -mal_export MT_Lock recycleLock; mal_export MalBlkPtr recycleBlk; mal_export double recycleAlpha; mal_export double recycleFresh; @@ -173,7 +172,7 @@ #include "mal_function.h" #include "mal_client.h"

-MT_Lock recycleLock ; +static MT_Lock recycleLock ; MalBlkPtr recycleBlk = NULL;

static void RECYCLEexitImpl(Client cntxt,MalBlkPtr mb, MalStkPtr stk, InstrPtr p); @@ -1055,7 +1054,7 @@

if( recycleBlk == 0 || reusePolicy == 0) return -1; - mal_set_lock(recycleLock,"recycle"); + mal_set_lock(recycleLock,"recycle");

for (i = 0; i < recycleBlk->stop; i++){ q = getInstrPtr(recycleBlk,i); @@ -1143,7 +1142,7 @@ updateQryStat(q->recycle,gluse); } recycleRecent = i; - mal_unset_lock(recycleLock,"recycle"); + mal_unset_lock(recycleLock,"recycle"); return i; notfound: continue; @@ -1192,7 +1191,7 @@ #else (void) evicted; #endif - mal_unset_lock(recycleLock,"recycle"); + mal_unset_lock(recycleLock,"recycle"); return pc; }

@@ -1241,8 +1240,6 @@

if ( wr > memLimit) return; - if ( p->recycle == NO_RECYCLING ) - return; if (recycleBlk){ if ( recyclerUsedMemory + wr > memLimit || recycleSize >= cacheLimit )

U mal_interpreter.mx Index: mal_interpreter.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_interpreter.mx,v retrieving revision 1.274 retrieving revision 1.275 diff -u -d -r1.274 -r1.275 --- mal_interpreter.mx 17 Nov 2008 08:57:52 -0000 1.274 +++ mal_interpreter.mx 16 Dec 2008 17:28:55 -0000 1.275 @@ -1923,7 +1923,7 @@ @= MALrecycleStart if( !RECYCLEentry(cntxt, mb,stk,pci) ) @= MALrecycleExit - if( pci->recycle ) + if( pci->recycle > 0 ) RECYCLEexit(cntxt, mb,stk,pci); @} @-

------------------------------------------------------------------------------ SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

-- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |