MonetDB: default - Silence compilers

[Martin Kersten]

Changeset: 17e3df6fb1bf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=17e3df6fb1bf
Modified Files:
        monetdb5/mal/mal_interpreter.c
        monetdb5/mal/mal_recycle.c
Branch: default
Log Message:

Silence compilers


diffs (63 lines):

diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -547,7 +547,9 @@ str runMALsequence(Client cntxt, MalBlkP
                }
 
                runtimeProfileBegin(cntxt, mb, stk, stkpc, &runtimeProfile, 1);
-               if ( (clk =RECYCLEentry(cntxt, mb, stk, pci, stkpc)) ){
+        if (pci->recycle > 0)
+            clk = GDKusec();
+        if (!RECYCLEentry(cntxt, mb, stk, pci,stkpc)){
                        /* The interpreter loop
                         * The interpreter is geared towards execution a MAL
                         * procedure together with all its decendant
diff --git a/monetdb5/mal/mal_recycle.c b/monetdb5/mal/mal_recycle.c
--- a/monetdb5/mal/mal_recycle.c
+++ b/monetdb5/mal/mal_recycle.c
@@ -646,7 +646,7 @@ newpass:
  */
 int
 RECYCLEinterest(InstrPtr p){
-       if (p->recycle <= REC_NO_INTEREST || p->token== ASSIGNsymbol )
+       if (p->recycle <= REC_NO_INTEREST )
                return 0;
        return getFunctionId(p) != NULL;
 }
@@ -1392,14 +1392,14 @@ RECYCLEentry(Client cntxt, MalBlkPtr mb,
 
        cntxt->rcc->statements++;
        if ( p->recycle == NO_RECYCLING )
-               return 1;       /* don't count subsumption instructions */
+               return 0;       /* don't count subsumption instructions */
        if ( recycleBlk == NULL )
-               return 1;
+               return 0;
        if ( !RECYCLEinterest(p) )  /* don't scan RecyclerPool for 
non-monitored instructions */
-               return 1;
+               return 0;
        if ( cntxt->rcc->curQ < 0 )     /* don't use recycling before 
initialization
                                by prelude() */
-               return 1;
+               return 0;
        i = RECYCLEreuse(cntxt,mb,stk,p,pc) >= 0;
 #ifdef _DEBUG_RECYCLE_
        if ( i > 0) {
@@ -1407,7 +1407,7 @@ RECYCLEentry(Client cntxt, MalBlkPtr mb,
                printInstruction(cntxt->fdout,mb,0,p, LIST_MAL_STMT);
        }
 #endif
-       return i >= 0 ? 0: GDKusec();
+       return i;
 }
 
 /*
@@ -1747,7 +1747,7 @@ RECYCLEdump(stream *s)
 {
     int i, incache;
     str msg= MAL_SUCCEED;
-    lng sz, persmem=0;
+    lng sz=0, persmem=0;
     ValPtr v;
     Client c;
     lng statements=0, recycled=0, recycleMiss=0, recycleRem=0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list