Changeset: f57be5525dd4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f57be5525dd4
Modified Files:
gdk/gdk_tracer.h
monetdb5/mal/mal.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_resolve.c
monetdb5/modules/atoms/inet.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/manifold.c
monetdb5/modules/mal/oltp.c
monetdb5/modules/mal/tablet.c
Branch: default
Log Message:
Code cleanup
diffs (truncated from 601 to 300 lines):
diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -149,18 +149,10 @@ typedef enum {
COMP( SQL_STATEMENT ) \
COMP( SQL_BAT ) \
\
- COMP( MAL_INTERPRETER ) \
COMP( MAL_WLC ) \
COMP( MAL_REMOTE ) \
- COMP( MAL_ATOMS ) \
- COMP( MAL_TABLET ) \
- COMP( MAL_OLTP ) \
COMP( MAL_MAPI ) \
COMP( MAL_SERVER ) \
- COMP( MAL_DATAFLOW ) \
- COMP( MAL_MANIFOLD ) \
- COMP( MAL_EXCEPTION ) \
- COMP( MAL_MAL ) \
\
COMP( MAL_OPTIMIZER ) \
\
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -70,7 +70,7 @@ int mal_init(void){
#ifndef NDEBUG
mdbExit();
#endif
- TRC_ERROR(MAL_MAL, "%s\n", err);
+ TRC_ERROR(MAL_SERVER, "%s\n", err);
freeException(err);
return -1;
}
@@ -99,11 +99,11 @@ void mserver_reset(void)
AUTHreset();
if (!GDKinmemory()) {
if ((err = msab_wildRetreat()) != NULL) {
- TRC_ERROR(MAL_MAL, "%s\n", err);
+ TRC_ERROR(MAL_SERVER, "%s\n", err);
free(err);
}
if ((err = msab_registerStop()) != NULL) {
- TRC_ERROR(MAL_MAL, "%s\n", err);
+ TRC_ERROR(MAL_SERVER, "%s\n", err);
free(err);
}
}
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
@@ -77,7 +77,7 @@ MCinit(void)
MAL_MAXCLIENTS = /* client connections */ maxclients;
mal_clients = GDKzalloc(sizeof(ClientRec) * MAL_MAXCLIENTS);
if( mal_clients == NULL){
- TRC_CRITICAL(MAL_MAL, "Initialization failed: " MAL_MALLOC_FAIL
"\n");
+ TRC_CRITICAL(MAL_SERVER, "Initialization failed: "
MAL_MALLOC_FAIL "\n");
return false;
}
for (int i = 0; i < MAL_MAXCLIENTS; i++){
@@ -217,7 +217,7 @@ MCinitClientRecord(Client c, oid user, b
c->fdin = fin ? fin : bstream_create(GDKstdin, 0);
if ( c->fdin == NULL){
c->mode = FREECLIENT;
- TRC_ERROR(MAL_MAL, "No stdin channel available\n");
+ TRC_ERROR(MAL_SERVER, "No stdin channel available\n");
return NULL;
}
c->yycur = 0;
diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -323,7 +323,6 @@ DFLOWworker(void *T)
struct worker *t = (struct worker *) T;
DataFlow flow;
FlowEvent fe = 0, fnxt = 0;
- int id = (int) (t - workers);
int tid = THRgettid();
str error = 0;
int i,last;
@@ -395,8 +394,6 @@ DFLOWworker(void *T)
}
}
error = runMALsequence(flow->cntxt, flow->mb, fe->pc, fe->pc +
1, flow->stk, 0, 0);
- TRC_DEBUG(MAL_DATAFLOW, "Executed pc=%d wrk=%d claim=" LLFMT
"," LLFMT "," LLFMT " %s\n",
- fe->pc, id, claim,
fe->hotclaim, fe->maxclaim, error ? error : "");
/* release the memory claim */
MALadmission_release(flow->cntxt, flow->mb, flow->stk, p,
claim);
/* update the numa information. keep the thread-id producing
the value */
@@ -668,23 +665,6 @@ DFLOWinitBlk(DataFlow flow, MalBlkPtr mb
* They take effect after we have ensured that the basic properties for
* execution hold.
*/
-/*
-static void showFlowEvent(DataFlow flow, int pc)
-{
- int i;
- FlowEvent fe = flow->status;
-
- TRC_DEBUG(MAL_DATAFLOW, "End of data flow '%d' done '%d'\n", pc,
flow->stop - flow->start);
- for (i = 0; i < flow->stop - flow->start; i++)
- if (fe[i].state != DFLOWwrapup && fe[i].pc >= 0) {
- {
- TRC_DEBUG(MAL_DATAFLOW, "Missed pc %d status %d
%d blocks %d\n", fe[i].state, i, fe[i].pc, fe[i].blocks);
- traceInstruction(MAL_DATAFLOW, fe[i].flow->mb,
0, getInstrPtr(fe[i].flow->mb, fe[i].pc), LIST_MAL_MAPI);
- }
- }
-}
-*/
-
static str
DFLOWscheduler(DataFlow flow, struct worker *w)
{
@@ -716,7 +696,6 @@ DFLOWscheduler(DataFlow flow, struct wor
fe[i].argclaim = getMemoryClaim(fe[0].flow->mb,
fe[0].flow->stk, p, j, FALSE);
q_enqueue(todo, flow->status + i);
flow->status[i].state = DFLOWrunning;
- TRC_DEBUG(MAL_DATAFLOW, "Enqueue pc=%d\n",
flow->status[i].pc);
}
MT_lock_unset(&flow->flowlock);
MT_sema_up(&w->s);
@@ -743,7 +722,6 @@ DFLOWscheduler(DataFlow flow, struct wor
flow->status[i].state = DFLOWrunning;
flow->status[i].blocks--;
q_enqueue(todo, flow->status + i);
- TRC_DEBUG(MAL_DATAFLOW, "Enqueue
pc=%d\n", flow->status[i].pc);
} else {
flow->status[i].blocks--;
}
@@ -756,7 +734,7 @@ DFLOWscheduler(DataFlow flow, struct wor
/* wrap up errors */
assert(flow->done->last == 0);
if ((ret = ATOMIC_PTR_XCG(&flow->error, NULL)) != NULL ) {
- TRC_DEBUG(MAL_DATAFLOW, "Errors encountered: %s\n", ret);
+ TRC_DEBUG(MAL_SERVER, "Errors encountered: %s\n", ret);
}
return ret;
}
diff --git a/monetdb5/mal/mal_exception.c b/monetdb5/mal/mal_exception.c
--- a/monetdb5/mal/mal_exception.c
+++ b/monetdb5/mal/mal_exception.c
@@ -64,7 +64,7 @@ createExceptionInternal(enum malexceptio
/* Leave a message behind in the logging system */
len = snprintf(local, GDKMAXERRLEN - 1, "%s:%s:",
exceptionNames[type], fcn);
len = vsnprintf(local + len, GDKMAXERRLEN -1, format, ap);
- TRC_ERROR(MAL_EXCEPTION, "%s\n", local);
+ TRC_ERROR(MAL_SERVER, "%s\n", local);
return M5OutOfMemory; /* last resort */
}
len = snprintf(message, GDKMAXERRLEN, "%s:%s:", exceptionNames[type],
fcn);
@@ -83,9 +83,9 @@ createExceptionInternal(enum malexceptio
}
char *q = message;
for (char *p = strchr(q, '\n'); p; q = p + 1, p = strchr(q, '\n'))
- TRC_ERROR(MAL_EXCEPTION, "%.*s\n", (int) (p - q), q);
+ TRC_ERROR(MAL_SERVER, "%.*s\n", (int) (p - q), q);
if (*q)
- TRC_ERROR(MAL_EXCEPTION, "%s\n", q);
+ TRC_ERROR(MAL_SERVER, "%s\n", q);
return message;
}
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -563,7 +563,7 @@ str runMALsequence(Client cntxt, MalBlkP
* time and print the query */
if (ATOMIC_CAS(&cntxt->lastprint, &lp, t)) {
const char *q = cntxt->getquery ?
cntxt->getquery(cntxt) : NULL;
- TRC_INFO(MAL_INTERPRETER, "%s: query
already running "LLFMT"s: %.200s\n",
+ TRC_INFO(MAL_SERVER, "%s: query already
running "LLFMT"s: %.200s\n",
cntxt->mythread->name,
(lng) (time(0) -
cntxt->lastcmd),
q ? q : "");
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 */
- TRC_CRITICAL(MAL_MAL, SQLSTATE(HY013) MAL_MALLOC_FAIL
"\n");
+ TRC_CRITICAL(MAL_SERVER, SQLSTATE(HY013)
MAL_MALLOC_FAIL "\n");
mal_exit(1);
}
ns->next = namespace;
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -140,7 +140,7 @@ renderProfilerEvent(Client cntxt, MalBlk
*/
if( !start && pci->calls > HIGHWATERMARK){
if( pci->calls == 10000 || pci->calls == 100000 || pci->calls
== 1000000 || pci->calls == 10000000)
- TRC_WARNING(MAL_MAL, "Too many calls: %d\n",
pci->calls);
+ TRC_WARNING(MAL_SERVER, "Too many calls: %d\n",
pci->calls);
return;
}
diff --git a/monetdb5/mal/mal_resolve.c b/monetdb5/mal/mal_resolve.c
--- a/monetdb5/mal/mal_resolve.c
+++ b/monetdb5/mal/mal_resolve.c
@@ -344,7 +344,6 @@ findFunctionType(Module scope, MalBlkPtr
* Also mark all variables that are subject to garbage control.
* Beware, this is not yet effectuated in the interpreter.
*/
- traceInstruction(MAL_MAL, mb, 0, p, LIST_MAL_DEBUG);
p->typechk = TYPE_RESOLVED;
for (i = 0; i < p->retc; i++) {
diff --git a/monetdb5/modules/atoms/inet.c b/monetdb5/modules/atoms/inet.c
--- a/monetdb5/modules/atoms/inet.c
+++ b/monetdb5/modules/atoms/inet.c
@@ -434,11 +434,13 @@ INET_comp_CW(bit *retval, const inet *va
/* all operations here are done byte based, to avoid byte sex
* problems */
- TRC_DEBUG(MAL_ATOMS,
+ /*
+ TRC_DEBUG(MAL_SERVER,
"%x %x %x %x => %x %x %x %x %x %x %x %x\n",
m[0], m[1], m[2], m[3], val1->q1, val1->q2,
val1->q3, val1->q4, val2->q1, val2->q2, val2->q3,
val2->q4);
+ */
if ((val1->q1 & m[0]) == (val2->q1 & m[0]) &&
(val1->q2 & m[1]) == (val2->q2 & m[1]) &&
@@ -523,10 +525,12 @@ INETbroadcast(inet *retval, const inet *
m[2] = (msk >> 8) & 0xFF;
m[3] = msk & 0xFF;
- TRC_DEBUG(MAL_ATOMS,
+ /*
+ TRC_DEBUG(MAL_SERVER,
"%x %x %x %x => %x %x %x %x\n",
m[0], m[1], m[2], m[3], val->q1, val->q2,
val->q3, val->q4);
+ */
/* apply the inverted mask, so we get the broadcast */
retval->q1 |= m[0];
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
@@ -251,8 +251,6 @@ doChallenge(void *data)
}
}
- TRC_DEBUG(MAL_SERVER, "Client accepted: %s\n", buf);
-
bs = bstream_create(fdin, 128 * BLOCK);
if (bs == NULL){
@@ -466,8 +464,6 @@ SERVERlistenThread(SOCKET *Sock)
continue;
}
- TRC_DEBUG(MAL_SERVER, "Server accepted\n");
-
data = GDKmalloc(sizeof(*data));
if( data == NULL){
closesocket(msgsock);
@@ -902,7 +898,6 @@ SERVERlisten(int port, const char *usock
}
#endif
- TRC_DEBUG(MAL_SERVER, "Network started at: %d\n", port);
psock[0] = sock;
#ifdef HAVE_SYS_UN_H
@@ -922,10 +917,8 @@ SERVERlisten(int port, const char *usock
throw(MAL, "mal_mapi.listen", OPERATION_FAILED ": starting
thread failed");
}
- TRC_DEBUG_IF(MAL_SERVER) {
- gethostname(host, sizeof(host));
- TRC_DEBUG_ENDIF(MAL_SERVER, "Ready to accept connections on:
%s:%d\n", host, port);
- }
+ gethostname(host, sizeof(host));
+ TRC_DEBUG(MAL_SERVER, "Ready to accept connections on: %s:%d\n", host,
port);
/* seed the randomiser such that our challenges aren't
* predictable... */
diff --git a/monetdb5/modules/mal/manifold.c b/monetdb5/modules/mal/manifold.c
--- a/monetdb5/modules/mal/manifold.c
+++ b/monetdb5/modules/mal/manifold.c
@@ -171,7 +171,7 @@ MANIFOLDjob(MULTItask *mut)
}
}
- TRC_DEBUG(MAL_MANIFOLD, "fvar %d lvar %d type %d\n",
mut->fvar,mut->lvar, ATOMstorage(mut->args[mut->fvar].b->ttype));
+ /* TRC_DEBUG(MAL_SERVER, "fvar %d lvar %d type %d\n",
mut->fvar,mut->lvar, ATOMstorage(mut->args[mut->fvar].b->ttype));*/
// use limited argument list expansion.
switch(mut->pci->argc){
@@ -228,10 +228,11 @@ MANIFOLDtypecheck(Client cntxt, MalBlkPt
setVarUDFtype(nmb,k);
}
- TRC_DEBUG(MAL_MANIFOLD, "Manifold operation\n");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
