MonetDB: scoping - Merged with default

[Pedro Ferreira]

Changeset: a3c58542a294 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3c58542a294
Modified Files:
        monetdb5/mal/mal_runtime.c
Branch: scoping
Log Message:

Merged with default


diffs (28 lines):

diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -139,12 +139,8 @@ runtimeProfileInit(Client cntxt, MalBlkP
                return;
        }
        // check for recursive call, which does not change the number of workers
-       for( i = qtail; i != qhead; i++){
-               if( i == qsize){
-                       i = 0;
-               }
-               if( i == qhead)
-                       break;
+       i=qtail;
+       while (i != qhead){
                if (QRYqueue[i].mb && QRYqueue[i].mb == mb &&  stk->up == 
QRYqueue[i].stk){
                        QRYqueue[i].stk = stk;
                        mb->tag = stk->tag = qtag++;
@@ -153,6 +149,9 @@ runtimeProfileInit(Client cntxt, MalBlkP
                }
                if ( QRYqueue[i].status)
                        paused += (QRYqueue[i].status[0] == 'p' || 
QRYqueue[i].status[0] == 'r'); /* running, prepared or paused */
+               i++;
+               if ( i >= qsize)
+                       i = 0;
        }
        assert(qhead < qsize);
        if( (int) (qsize - paused) < MAL_MAXCLIENTS){
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list