MonetDB: userstats - merged with default

[Ying Zhang]

Changeset: 851d30f9dd52 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=851d30f9dd52
Modified Files:
        monetdb5/mal/mal_runtime.c
        monetdb5/modules/mal/sysmon.c
Branch: userstats
Log Message:

merged with default


diffs (24 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
@@ -221,7 +221,7 @@ runtimeProfileInit(Client cntxt, MalBlkP
 
        tmp = QRYqueue;
        if ( QRYqueue == NULL) {
-               QRYqueue = (QueryQueue) GDKzalloc( sizeof (struct QRYQUEUE) * 
(qsize= 8)); /* for testing */
+               QRYqueue = (QueryQueue) GDKzalloc( sizeof (struct QRYQUEUE) * 
(qsize= MAL_MAXCLIENTS));
 
                if ( QRYqueue == NULL){
                        addMalException(mb,"runtimeProfileInit" 
MAL_MALLOC_FAIL);
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
@@ -147,7 +147,7 @@ SYSMONqueue(Client cntxt, MalBlkPtr mb, 
 
        (void) cntxt;
        (void) mb;
-       sz = MAL_MAXCLIENTS;    // reserve space for all possible clients.
+       sz = qsize;     // reserve space for all tuples in QRYqueue
        tag = COLnew(0, TYPE_lng, sz, TRANSIENT);
        sessionid = COLnew(0, TYPE_int, sz, TRANSIENT);
        user = COLnew(0, TYPE_str, sz, TRANSIENT);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list