MonetDB: default - Check for proper client id in system monitor

[Martin Kersten]

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

Check for proper client id in system monitor
Now you can see all your queries and stop/resume them.


diffs (51 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
@@ -545,7 +545,7 @@ str runMALsequence(Client cntxt, MalBlkP
                                continue;
                        }
                        if ( stk->status == 'q')
-                               stk->cmd = 'q';
+                               stk->cmd = 'x';
 
                        if (stk->cmd == 0)
                                stk->cmd = cntxt->itrace;
diff --git a/monetdb5/modules/mal/sysmon.c b/monetdb5/modules/mal/sysmon.c
--- a/monetdb5/modules/mal/sysmon.c
+++ b/monetdb5/modules/mal/sysmon.c
@@ -90,7 +90,7 @@ SYSMONqueue(Client cntxt, MalBlkPtr mb, 
 
        MT_lock_set(&mal_delayLock, "sysmon");
        for ( i = 0; i< QRYqueue[i].tag; i++)
-       if( QRYqueue[i].query && (QRYqueue[i].cntxt->idx == 0 || 
QRYqueue[i].cntxt == cntxt)) {
+       if( QRYqueue[i].query && (QRYqueue[i].cntxt->idx == 0 || 
QRYqueue[i].cntxt->user == cntxt->user)) {
                now= (lng) time(0);
                if ( (now-QRYqueue[i].start) > QRYqueue[i].runtime)
                        prog =QRYqueue[i].runtime > 0 ? 100: int_nil;
@@ -148,7 +148,7 @@ SYSMONpause(Client cntxt, MalBlkPtr mb, 
        }
        MT_lock_set(&mal_delayLock, "sysmon");
        for ( i = 0; QRYqueue[i].tag; i++)
-       if( QRYqueue[i].tag == tag && (QRYqueue[i].cntxt == cntxt || cntxt->idx 
==0)){
+       if( QRYqueue[i].tag == tag && (QRYqueue[i].cntxt->user == cntxt->user 
|| cntxt->idx ==0)){
                QRYqueue[i].stk->status = 'p';
                QRYqueue[i].status = "paused";
        }
@@ -170,7 +170,7 @@ SYSMONresume(Client cntxt, MalBlkPtr mb,
        }
        MT_lock_set(&mal_delayLock, "sysmon");
        for ( i = 0; QRYqueue[i].tag; i++)
-       if( QRYqueue[i].tag == tag && (QRYqueue[i].cntxt == cntxt || cntxt->idx 
==0)){
+       if( QRYqueue[i].tag == tag && (QRYqueue[i].cntxt->user == cntxt->user 
|| cntxt->idx ==0)){
                QRYqueue[i].stk->status = 0;
                QRYqueue[i].status = "QRYqueue";
        }
@@ -192,7 +192,7 @@ SYSMONstop(Client cntxt, MalBlkPtr mb, M
        }
        MT_lock_set(&mal_delayLock, "sysmon");
        for ( i = 0; QRYqueue[i].tag; i++)
-       if( QRYqueue[i].tag == tag && (QRYqueue[i].cntxt == cntxt || cntxt->idx 
==0)){
+       if( QRYqueue[i].tag == tag && (QRYqueue[i].cntxt->user == cntxt->user 
|| cntxt->idx ==0)){
                QRYqueue[i].stk->status = 'q';
                QRYqueue[i].status = "stopping";
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list