MonetDB: gdk_tracer - Fixes

[Martin Kersten]

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

Fixes


diffs (45 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
@@ -68,9 +68,7 @@ MCinit(void)
                maxclients = atoi(max_clients);
        if (maxclients <= 0) {
                maxclients = 64;
-               if (GDKsetenv("max_clients", "64") != GDK_SUCCEED) {
-                       TRC_ERROR(MAL_CLIENT, "GDKsetenv failed\n");
-               }
+               GDKsetenv("max_clients", "64") ;
        }
 
        MAL_MAXCLIENTS = /* client connections */ maxclients;
@@ -79,8 +77,9 @@ MCinit(void)
                TRC_CRITICAL(MAL_CLIENT, "Initialization failed: " 
MAL_MALLOC_FAIL "\n");
                return false;
        }
-       for (int i = 0; i < MAL_MAXCLIENTS; i++)
+       for (int i = 0; i < MAL_MAXCLIENTS; i++){
                ATOMIC_INIT(&mal_clients[i].lastprint, 0);
+       }
        return true;
 }
 
@@ -217,9 +216,7 @@ MCinitClientRecord(Client c, oid user, b
 
        c->fdin = fin ? fin : bstream_create(GDKstdin, 0);
        if ( c->fdin == NULL){
-               MT_lock_set(&mal_contextLock);
                c->mode = FREECLIENT;
-               MT_lock_unset(&mal_contextLock);
                TRC_ERROR(MAL_CLIENT, "No stdin channel available\n");
                return NULL;
        }
@@ -253,9 +250,7 @@ MCinitClientRecord(Client c, oid user, b
                if (fin == NULL) {
                        c->fdin->s = NULL;
                        bstream_destroy(c->fdin);
-                       MT_lock_set(&mal_contextLock);
                        c->mode = FREECLIENT;
-                       MT_lock_unset(&mal_contextLock);
                }
                TRC_ERROR(MAL_CLIENT, "Client prompt undefined\n");
                return NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list