Changeset: eb4fcbaaff75 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb4fcbaaff75
Modified Files:
monetdb5/mal/mal_client.c
monetdb5/mal/mal_namespace.c
monetdb5/modules/mal/mal_mapi.c
Branch: default
Log Message:
There is no console to leave the exception behind.
diffs (101 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
@@ -69,7 +69,7 @@ MCinit(void)
if (maxclients <= 0) {
maxclients = 64;
if (GDKsetenv("max_clients", "64") != GDK_SUCCEED) {
- fprintf(stderr,"#MCinit: GDKsetenv failed");
+ fprintf(stderr, "!MCinit: GDKsetenv failed");
return false;
}
}
@@ -77,7 +77,7 @@ MCinit(void)
MAL_MAXCLIENTS = /* client connections */ maxclients;
mal_clients = GDKzalloc(sizeof(ClientRec) * MAL_MAXCLIENTS);
if( mal_clients == NULL){
- fprintf(stderr,"#MCinit:" MAL_MALLOC_FAIL);
+ fprintf(stderr,"!MCinit:" MAL_MALLOC_FAIL);
return false;
}
return true;
@@ -223,7 +223,7 @@ MCinitClientRecord(Client c, oid user, b
MT_lock_set(&mal_contextLock);
c->mode = FREECLIENT;
MT_lock_unset(&mal_contextLock);
- showException(GDKout, MAL, "initClientRecord", MAL_MALLOC_FAIL);
+ fprintf(stderr,"!initClientRecord:" MAL_MALLOC_FAIL);
return NULL;
}
c->yycur = 0;
@@ -257,7 +257,7 @@ MCinitClientRecord(Client c, oid user, b
c->mode = FREECLIENT;
MT_lock_unset(&mal_contextLock);
}
- showException(GDKout, MAL, "initClientRecord", MAL_MALLOC_FAIL);
+ fprintf(stderr, "!initClientRecord:" MAL_MALLOC_FAIL);
return NULL;
}
c->promptlength = strlen(prompt);
diff --git a/monetdb5/mal/mal_namespace.c b/monetdb5/mal/mal_namespace.c
--- a/monetdb5/mal/mal_namespace.c
+++ b/monetdb5/mal/mal_namespace.c
@@ -120,7 +120,7 @@ static str findName(const char *nme, siz
struct namespace *ns = GDKmalloc(sizeof(struct namespace));
if (ns == NULL) {
/* error we cannot recover from */
- showException(GDKout, MAL, "findName", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ fprintf(stderr, "!findName" SQLSTATE(HY001)
MAL_MALLOC_FAIL);
mal_exit(1);
}
ns->next = namespace;
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -149,6 +149,7 @@ doChallenge(void *data)
memcpy(challenge, ((struct challengedata *) data)->challenge,
sizeof(challenge));
GDKfree(data);
if (buf == NULL) {
+ fprintf(stderr, "#doChallenge" MAL_MALLOC_FAIL);
close_stream(fdin);
close_stream(fdout);
return;
@@ -459,8 +460,7 @@ SERVERlistenThread(SOCKET *Sock)
default:
/* some unknown state */
closesocket(msgsock);
- fprintf(stderr, "!mal_mapi.listen: "
- "unknown command type
in first byte\n");
+ fprintf(stderr, "!mal_mapi.listen:
unknown command type in first byte\n");
continue;
}
#endif
@@ -474,7 +474,7 @@ SERVERlistenThread(SOCKET *Sock)
data = GDKmalloc(sizeof(*data));
if( data == NULL){
closesocket(msgsock);
- showException(GDKstdout, MAL, "initClient",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
+ fprintf(stderr, "#initClient " SQLSTATE(HY001)
MAL_MALLOC_FAIL);
continue;
}
data->in = socket_rstream(msgsock, "Server read");
@@ -485,8 +485,7 @@ SERVERlistenThread(SOCKET *Sock)
mnstr_destroy(data->out);
GDKfree(data);
closesocket(msgsock);
- showException(GDKstdout, MAL, "initClient",
- "cannot allocate stream");
+ fprintf(stderr, "!initClient cannot allocate stream");
continue;
}
s = block_stream(data->in);
@@ -511,8 +510,7 @@ SERVERlistenThread(SOCKET *Sock)
mnstr_destroy(data->out);
GDKfree(data);
closesocket(msgsock);
- showException(GDKstdout, MAL, "initClient",
- "cannot fork new client
thread");
+ fprintf(stderr, "!initClient:cannot fork new client
thread");
continue;
}
} while (!ATOMIC_GET(&serverexiting) && !GDKexiting());
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
