Update of /cvsroot/monetdb/MonetDB5/src/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv560
Modified Files:
mal_instruction.mx mal_parser.mx mal_recycle.mx
Log Message:
A few changes to prepare for larger variable lists
Index: mal_parser.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_parser.mx,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -d -r1.213 -r1.214
--- mal_parser.mx 24 Jan 2008 11:55:17 -0000 1.213
+++ mal_parser.mx 19 Mar 2008 08:29:27 -0000 1.214
@@ -1074,7 +1074,7 @@
}
/* re-arrange the parameters, results first*/
max= curInstr->maxarg;
- newarg= (short*)GDKmalloc(max*sizeof(short));
+ newarg= (short*)GDKmalloc(max*sizeof(curInstr->argv[0]));
for(i1= retc; i1<curInstr->argc; i1++)
newarg[i2++]= curInstr->argv[i1];
curInstr->retc= curInstr->argc-retc;
Index: mal_recycle.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_recycle.mx,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- mal_recycle.mx 17 Mar 2008 21:38:02 -0000 1.59
+++ mal_recycle.mx 19 Mar 2008 08:29:27 -0000 1.60
@@ -156,8 +156,8 @@
int recycleVolume = 0;
@-
-RETAIN_EXACT only looks at precisely matching instructions.
-RETAIN_COVER exploits potentional overlap in range selects
+REUSE_EXACT only looks at precisely matching instructions.
+REUSE_COVER exploits potentional overlap in range selects
to reduce the amount of scanning.
@c
int reusePolicy = REUSE_NONE; /* recycle reuse policy
Index: mal_instruction.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_instruction.mx,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -d -r1.318 -r1.319
--- mal_instruction.mx 17 Mar 2008 07:02:29 -0000 1.318
+++ mal_instruction.mx 19 Mar 2008 08:29:26 -0000 1.319
@@ -955,7 +955,7 @@
mb->stmt[mb->stop] = NULL;
}
if (p == NULL) {
- p = GDKmalloc(MAXARG * sizeof(short) + sizeof(InstrRecord));
+ p = GDKmalloc(MAXARG * sizeof(p->maxarg) + sizeof(InstrRecord));
p->maxarg = MAXARG;
}
p->typechk = TYPE_UNKNOWN;
@@ -1002,7 +1002,7 @@
copyInstruction(InstrPtr p)
{
InstrPtr new;
- new = (InstrPtr) GDKmalloc(sizeof(InstrRecord) + p->maxarg *
sizeof(short));
+ new = (InstrPtr) GDKmalloc(sizeof(InstrRecord) + p->maxarg *
sizeof(p->maxarg));
oldmoveInstruction(new, p);
return new;
}
@@ -1948,7 +1948,7 @@
InstrPtr pn;
int pc = 0,pclimit;
int space = p->maxarg * sizeof(short) + sizeof(InstrRecord);
- pn = GDKmalloc(space + MAXARG * sizeof(short));
+ pn = GDKmalloc(space + MAXARG * sizeof(p->maxarg));
memcpy((char *) pn, (char *) p, space);
pn->maxarg += MAXARG;
/* instructions are either created in isolation or
-------------------------------------------------------------------------
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
