Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9568
Modified Files:
recycle.mx
Log Message:
Move the shutdown back to the kernel
Index: recycle.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/recycle.mx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- recycle.mx 9 Mar 2008 12:59:03 -0000 1.7
+++ recycle.mx 9 Mar 2008 15:39:02 -0000 1.8
@@ -55,7 +55,7 @@
2- LRU scheme with additional cache limit set.";
command shutdown():void
-address RECYCLEshutdown
+address RECYCLEshutdownWrap
comment "Clear the recycle cache";
@h
#ifndef _RECYCLE_
@@ -80,7 +80,7 @@
recycle_export str RECYCLEsetRetain(MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
recycle_export str RECYCLEsetReuse(MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
recycle_export str RECYCLEsetCache(MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-recycle_export str RECYCLEshutdown(int *ret);
+recycle_export str RECYCLEshutdownWrap(int *ret);
#endif
@-
@@ -193,29 +193,9 @@
At the end of the session we have to cleanup the recycle cache.
@c
str
-RECYCLEshutdown(int *ret){
- InstrPtr q;
- int i,j;
- MalBlkPtr mb;
-
- (void)ret;
- if( recycleBlk == NULL)
- return MAL_SUCCEED;
-
- mal_set_lock(recycleLock,"recycle");
- mb= recycleBlk;
- recycleBlk= NULL;
- mal_unset_lock(recycleLock,"recycle");
-
- for(i=0; i< mb->stop; i++){
- q= getInstrPtr(mb,i);
- for(j=0; j< q->argc; j++)
- if( isVarConstant(mb,getArg(q,j)) ){
- if( isaBatType(getArgType(mb, q,j)) )
-
BBPdecref(getVarConstant(mb,getArg(q,j)).val.bval,TRUE);
- }
- }
- freeMalBlk(mb);
+RECYCLEshutdownWrap(int *ret){
+ (void) ret;
+ RECYCLEshutdown();
return MAL_SUCCEED;
}
@}
-------------------------------------------------------------------------
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
