Changeset: 006d512ba9b0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=006d512ba9b0
Modified Files:
monetdb5/mal/mal.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_session.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/mal_mapi.c
Branch: noconsole
Log Message:
more server console special cases removed
diffs (264 lines):
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -144,14 +144,6 @@ void mserver_reset(int exit)
*/
mal_factory_reset();
mal_dataflow_reset();
- THRdel(mal_clients->mythread);
- GDKfree(mal_clients->errbuf);
- mal_clients->fdin->s = NULL;
- bstream_destroy(mal_clients->fdin);
- GDKfree(mal_clients->prompt);
- GDKfree(mal_clients->username);
- freeStack(mal_clients->glb);
- freeSymbol(mal_clients->curprg);
mal_client_reset();
mal_linker_reset();
mal_resource_reset();
diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c
--- a/monetdb5/mal/mal_authorize.c
+++ b/monetdb5/mal/mal_authorize.c
@@ -229,7 +229,7 @@ AUTHinitTables(const char *passwd) {
char *pw;
oid uid;
Client c = &mal_clients[0];
-
+ // TODO: does this still work without the server console?
if (passwd == NULL)
passwd = "monetdb"; /* default password */
pw = mcrypt_BackendSum(passwd, strlen(passwd));
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
@@ -442,7 +442,7 @@ MCactiveClients(void)
int freeclient=0, finishing=0, running=0, blocked = 0;
Client cntxt = mal_clients;
- for(cntxt= mal_clients; cntxt<mal_clients+MAL_MAXCLIENTS; cntxt++){
+ for(cntxt = mal_clients; cntxt < mal_clients + MAL_MAXCLIENTS;
cntxt++){
freeclient += (cntxt->mode == FREECLIENT);
finishing += (cntxt->mode == FINISHCLIENT);
running += (cntxt->mode == RUNCLIENT);
diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c
+++ b/monetdb5/mal/mal_debugger.c
@@ -388,18 +388,13 @@ mdbCommand(Client cntxt, MalBlkPtr mb, M
char oldcmd[1024] = { 0 };
do {
if (p != NULL) {
- if (cntxt != mal_clients)
- /* help mclients with fake prompt */
- if (lastcmd != 'l' && lastcmd != 'L') {
- mnstr_printf(out, "mdb>");
- printTraceCall(out, mb, stk, pc,
LIST_MAL_CALL);
- }
+ /* help mclients with fake prompt */
+ if (lastcmd != 'l' && lastcmd != 'L') {
+ mnstr_printf(out, "mdb>");
+ printTraceCall(out, mb, stk, pc, LIST_MAL_CALL);
+ }
+ }
- }
- if (cntxt == mal_clients) {
- cntxt->prompt = "mdb>";
- cntxt->promptlength = 4;
- }
if (cntxt->phase[MAL_SCENARIO_READER]) {
retryRead:
@@ -414,13 +409,7 @@ retryRead:
goto retryRead;
}
}
-#ifndef HAVE_EMBEDDED
- else if (cntxt == mal_clients) {
- /* switch to mdb streams */
- if (readConsole(cntxt) <= 0)
- break;
- }
-#endif
+
b = CURRENT(cntxt);
/* terminate the line with zero */
@@ -974,13 +963,13 @@ str mdbTrap(Client cntxt, MalBlkPtr mb,
int cnt = 20; /* total 10 sec delay */
int pc = getPC(mb,p);
- mnstr_printf(mal_clients[0].fdout, "#trapped %s.%s[%d]\n",
+ mnstr_printf(cntxt->fdout, "#trapped %s.%s[%d]\n",
getModuleId(mb->stmt[0]), getFunctionId(mb->stmt[0]),
pc);
- printInstruction(mal_clients[0].fdout, mb, stk, p, LIST_MAL_DEBUG);
+ printInstruction(cntxt->fdout, mb, stk, p, LIST_MAL_DEBUG);
cntxt->itrace = 'W';
MT_lock_set(&mal_contextLock);
if (trapped_mb) {
- mnstr_printf(mal_clients[0].fdout, "#registry not available\n");
+ mnstr_printf(cntxt->fdout, "#registry not available\n");
mnstr_flush(cntxt->fdout);
}
while (trapped_mb && cnt-- > 0) {
@@ -1015,12 +1004,12 @@ mdbStep(Client cntxt, MalBlkPtr mb, MalS
state.p = getInstrPtr(mb, pc);
state.pc = pc;
cntxt->mdb = &state;
- mnstr_printf(mal_clients[0].fdout, "#Process %d put to
sleep\n", (int) (cntxt - mal_clients));
+ mnstr_printf(out, "#Process %d put to sleep\n", (int) (cntxt -
mal_clients));
cntxt->itrace = 'W';
mdbTrap(cntxt, mb, stk, state.p);
while (cntxt->itrace == 'W')
MT_sleep_ms(300);
- mnstr_printf(mal_clients[0].fdout, "#Process %d woke up\n",
(int) (cntxt - mal_clients));
+ mnstr_printf(out, "#Process %d woke up\n", (int) (cntxt -
mal_clients));
return;
}
if (stk->cmd == 0)
@@ -1036,9 +1025,7 @@ mdbStep(Client cntxt, MalBlkPtr mb, MalS
case 'c':
ch = isBreakpoint(cntxt, mb, p, pc);
if (ch == 't') {
- if (cntxt != mal_clients)
- /* help mclients with fake prompt */
- mnstr_printf(out, "mdb>");
+ mnstr_printf(out, "mdb>");
printTraceCall(out, mb, stk, pc, LIST_MAL_CALL);
} else if (ch)
mdbCommand(cntxt, mb, stk, p, pc);
diff --git a/monetdb5/mal/mal_scenario.c b/monetdb5/mal/mal_scenario.c
--- a/monetdb5/mal/mal_scenario.c
+++ b/monetdb5/mal/mal_scenario.c
@@ -226,10 +226,6 @@ initScenario(Client c, Scenario s)
str
defaultScenario(Client c)
{
-#ifdef NEED_MT_LOCK_INIT
- if (c == mal_clients)
- MT_lock_init(&scenarioLock, "scenarioLock");
-#endif
return initScenario(c, scenarioRec);
}
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -252,6 +252,7 @@ MSscheduleClient(str command, str challe
str err;
oid uid;
sabdb *stats = NULL;
+ // TODO: this still a valid entry?
Client root = &mal_clients[0];
/* access control: verify the credentials supplied by the user,
@@ -535,16 +536,6 @@ MALexitClient(Client c)
str
MALreader(Client c)
{
-#ifndef HAVE_EMBEDDED
- int r = 1;
- if (c == mal_clients) {
- r = readConsole(c);
- if (r < 0 && c->fdin->eof == 0)
- r = MCreadClient(c);
- if (r > 0)
- return MAL_SUCCEED;
- } else
-#endif
if (MCreadClient(c) > 0)
return MAL_SUCCEED;
MT_lock_set(&mal_contextLock);
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -291,8 +291,7 @@ CLTstop(Client cntxt, MalBlkPtr mb, MalS
{
int id= *getArgReference_int(stk,pci,1);
(void) mb;
- if ( cntxt->user == mal_clients[id].user ||
- mal_clients[0].user == cntxt->user){
+ if ( cntxt->user == mal_clients[id].user){
mal_clients[id].itrace = 'x';
}
/* this forces the designated client to stop at the next instruction */
@@ -561,6 +560,7 @@ CLTshutdown(Client cntxt, MalBlkPtr mb,
break;
}
+ // TODO: there must be a better way of checking this
if ( cntxt->user != mal_clients[0].user)
throw(MAL,"mal.shutdown", "Administrator rights required");
MCstopClients(cntxt);
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
@@ -121,9 +121,7 @@ struct challengedata {
static void
doChallenge(void *data)
{
-#ifdef DEBUG_SERVER
- Client cntxt= mal_clients;
-#endif
+
char *buf = (char *) GDKmalloc(BLOCK + 1);
char challenge[13];
char *algos;
@@ -177,13 +175,7 @@ doChallenge(void *data)
return;
}
buf[len] = 0;
-#ifdef DEBUG_SERVER
- printf("mal_mapi:Client accepted %s\n", buf);
- fflush(stdout);
- mnstr_printf(cntxt->fdout, "#SERVERlisten:client accepted\n");
- mnstr_printf(cntxt->fdout, "#SERVERlisten:client string %s\n", buf);
-#endif
bs = bstream_create(fdin, 128 * BLOCK);
if (bs == NULL){
@@ -366,10 +358,6 @@ SERVERlistenThread(SOCKET *Sock)
} else {
continue;
}
-#ifdef DEBUG_SERVER
- printf("server:accepted\n");
- fflush(stdout);
-#endif
data = GDKmalloc(sizeof(*data));
if( data == NULL){
closesocket(msgsock);
@@ -478,10 +466,6 @@ SERVERlisten(int *Port, str *Usockfile,
int port;
int maxusers;
char *usockfile;
-#ifdef DEBUG_SERVER
- char msg[512], host[512];
- Client cntxt= mal_clients;
-#endif
accept_any = GDKgetenv_istrue("mapi_open");
autosense = GDKgetenv_istrue("mapi_autosense");
@@ -670,10 +654,6 @@ SERVERlisten(int *Port, str *Usockfile,
}
#endif
-#ifdef DEBUG_SERVER
- mnstr_printf(cntxt->fdout, "#SERVERlisten:Network started at %d\n",
port);
-#endif
-
psock[0] = sock;
#ifdef HAVE_SYS_UN_H
psock[1] = usock;
@@ -688,11 +668,6 @@ SERVERlisten(int *Port, str *Usockfile,
throw(MAL, "mal_mapi.listen", OPERATION_FAILED ": starting
thread failed");
}
GDKregister(pid);
-#ifdef DEBUG_SERVER
- gethostname(host, (int) 512);
- snprintf(msg, (int) 512, "#Ready to accept connections on %s:%d\n",
host, port);
- mnstr_printf(cntxt->fdout, "%s", msg);
-#endif
/* seed the randomiser such that our challenges aren't
* predictable... */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
