MonetDB: default - Merge with Jan2014 branch.

[Stefan Manegold]

Changeset: 2da4fc4edcf1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2da4fc4edcf1
Modified Files:
        monetdb5/mal/mal_client.c
        monetdb5/mal/mal_runtime.c
Branch: default
Log Message:

Merge with Jan2014 branch.


diffs (62 lines):

diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -187,7 +187,7 @@ MCexitClient(Client c)
 #ifdef MAL_CLIENT_DEBUG
        printf("# Exit client %d\n", c->idx);
 #endif
-    finishSessionProfiler(c);
+       finishSessionProfiler(c);
        MPresetProfiler(c->fdout);
        if (c->father == NULL) { /* normal client */
                if (c->fdout && c->fdout != GDKstdout) {
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
@@ -132,27 +132,27 @@ runtimeProfileFinish(Client cntxt, MalBl
 void
 finishSessionProfiler(Client cntxt)
 {
-    int i,j;
+       int i,j;
 
-    (void) cntxt;
+       (void) cntxt;
 
-    MT_lock_set(&mal_delayLock, "sysmon");
-    for( i=j=0; i< qtop; i++)
-    if ( QRYqueue[i].cntxt != cntxt)
-        QRYqueue[j++] = QRYqueue[i];
-    else  {
-         //reset entry
-                if (QRYqueue[i].query)
-                GDKfree(QRYqueue[i].query);
-                QRYqueue[i].cntxt = 0;
-                QRYqueue[i].tag = 0;
-                QRYqueue[i].query = 0;
-                QRYqueue[i].status =0;
-                QRYqueue[i].stk =0;
-                QRYqueue[i].mb =0;
-        }
-        qtop = j;
-        MT_lock_unset(&mal_delayLock, "sysmon");
+       MT_lock_set(&mal_delayLock, "sysmon");
+       for( i=j=0; i< qtop; i++)
+       if ( QRYqueue[i].cntxt != cntxt)
+               QRYqueue[j++] = QRYqueue[i];
+       else  {
+               //reset entry
+               if (QRYqueue[i].query)
+                       GDKfree(QRYqueue[i].query);
+               QRYqueue[i].cntxt = 0;
+               QRYqueue[i].tag = 0;
+               QRYqueue[i].query = 0;
+               QRYqueue[i].status =0;
+               QRYqueue[i].stk =0;
+               QRYqueue[i].mb =0;
+       }
+       qtop = j;
+       MT_lock_unset(&mal_delayLock, "sysmon");
 }
 
 void
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list