MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

Changeset: fe63f1111d82 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe63f1111d82
Modified Files:
        
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (32 lines):

diff -r 9b9af40708d2 -r fe63f1111d82 MonetDB5/src/mal/mal_interpreter.mx
--- a/MonetDB5/src/mal/mal_interpreter.mx       Wed Sep 15 15:45:28 2010 +0200
+++ b/MonetDB5/src/mal/mal_interpreter.mx       Wed Sep 15 17:10:02 2010 +0200
@@ -271,7 +271,6 @@
                pci= pcicaller;
        } else {
                newStack(stk,mb->vsize);
-               memset((char *) stk, 0, stackSize(mb->vsize));
                stk->stktop= mb->vtop; 
                stk->stksize= mb->vsize;
                stk->blk= mb;
@@ -344,6 +343,8 @@
        if ( !stk->keepAlive && garbageControl(getInstrPtr(mb,0)) )
                garbageCollector(cntxt, mb,stk, env != stk);
        @:endProfile(stk)@
+       if (stk && stk != env)
+               GDKfree(stk);
        return ret;
 }
 @-
diff -r 9b9af40708d2 -r fe63f1111d82 MonetDB5/src/mal/mal_stack.mx
--- a/MonetDB5/src/mal/mal_stack.mx     Wed Sep 15 15:45:28 2010 +0200
+++ b/MonetDB5/src/mal/mal_stack.mx     Wed Sep 15 17:10:02 2010 +0200
@@ -104,7 +104,7 @@
 } MalStack, *MalStkPtr;
 
 #define stackSize(CNT) (sizeof(ValRecord)*(CNT) + sizeof(MalStack))
-#define newStack(S,CNT) S= (MalStkPtr) alloca(stackSize(CNT));\
+#define newStack(S,CNT) S= (MalStkPtr) GDKzalloc(stackSize(CNT));\
                (S)->stksize=CNT;
 
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list