Update of /cvsroot/monetdb/MonetDB5/src/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17618
Modified Files:
mal_recycle.mx
Log Message:
Resolve compiler issue, and cut huge lines for readibility ;)
Index: mal_recycle.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_recycle.mx,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- mal_recycle.mx 13 Mar 2008 15:01:33 -0000 1.45
+++ mal_recycle.mx 14 Mar 2008 07:31:38 -0000 1.46
@@ -70,7 +70,7 @@
spaces.
@h
#define RU 1024 /* recycle unit in bytes */
-#define GIGA (long)(1024*1024*1024)
+#define GIGA (lng)(1024*1024*1024)
#define HARDLIMIT_VAR 25000
#define HARDLIMIT_STMT 4000 /* roughly 5/line needed */
@@ -104,7 +104,7 @@
mal_export int recycleClaim;
mal_export int recycleCacheLimit;
-mal_export long recycleMemory; /* Units of memory permitted */
+mal_export lng recycleMemory; /* Units of memory permitted */
mal_export MT_Lock recycleLock;
mal_export MalBlkPtr recycleBlk;
mal_export double recycleAlpha;
@@ -179,7 +179,7 @@
RCACHE_MEMCRD: reduce the storage overhead */
int recycleCacheLimit= 100;
int recycleClaim=0; /* avoid stale tables by letting users mark it */
-long recycleMemory=0; /* Units of memory permitted */
+lng recycleMemory=0; /* Units of memory permitted */
@-
The profiler record is re-used to store recycler information.
The clk is used by the LRU scheme, counter is the number of
@@ -491,13 +491,18 @@
getVarConstant(recycleBlk, ridx).val.bval ==
s->stk[idx].val.bval)
{
/* Time to check for the inclusion constraint */
- int leftbound = VALcmp( &s->stk[getArg(p,2)],
&getVar(recycleBlk,getArg(q,2))->value) >=0;
- int rightbound = p->argc == 3 || VALcmp(
&s->stk[getArg(p,3)], &getVar(recycleBlk,getArg(q,3))->value) <=0;
+ int leftbound = VALcmp( &s->stk[getArg(p,2)],
+
&getVar(recycleBlk,getArg(q,2))->value) >=0;
+ int rightbound = p->argc == 3 ||
+ VALcmp( &s->stk[getArg(p,3)],
+
&getVar(recycleBlk,getArg(q,3))->value) <=0;
if (p->argc == 6){
/* inclusion bounds */
- leftbound &= VALcmp(
&s->stk[getArg(p,4)], &getVar(recycleBlk,getArg(q,4))->value)==0;
- rightbound &= VALcmp(
&s->stk[getArg(p,5)], &getVar(recycleBlk,getArg(q,5))->value)==0;
+ leftbound &= VALcmp(
&s->stk[getArg(p,4)],
+
&getVar(recycleBlk,getArg(q,4))->value)==0;
+ rightbound &= VALcmp(
&s->stk[getArg(p,5)],
+
&getVar(recycleBlk,getArg(q,5))->value)==0;
}
if (leftbound && rightbound){
BAT *b1, *b2;
@@ -568,6 +573,8 @@
we check the recycle table for available variables.
TODO remove the need for VAR_RECYCLE!
+No, there is a distinction to keep a variable and actually doing it.
+A variable marked RECYCLE and not KEPT, calls for a re-evaluation.
A few cases should be distinguished. Target variables that have not
been marked as VAR_RECYCLE are skipped.
-------------------------------------------------------------------------
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
