Changeset: c65d1c9dff58 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c65d1c9dff58
Modified Files:
MonetDB5/mal/mal_dataflow.c
MonetDB5/mal/mal_interpreter.c
MonetDB5/modules/mal/mal_mapi.c
MonetDB5/modules/mal/mdb.c
Branch: gdk-tracer
Log Message:
Explicit add of component and rename of a function
diffs (61 lines):
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
@@ -686,10 +686,10 @@ static void showFlowEvent(DataFlow flow,
int i;
FlowEvent fe = flow->status;
- INFO(MAL_ALL, "End of data flow '%d' done '%d'\n", pc, flow->stop -
flow->start);
+ INFO(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) {
- INFO(MAL_ALL, "Missed pc %d status %d %d blocks %d\n",
fe[i].state, i, fe[i].pc, fe[i].blocks);
+ INFO(MAL_DATAFLOW, "Missed pc %d status %d %d blocks
%d\n", fe[i].state, i, fe[i].pc, fe[i].blocks);
debugInstruction(MAL_DATAFLOW, fe[i].flow->mb, 0,
getInstrPtr(fe[i].flow->mb, fe[i].pc), LIST_MAL_MAPI);
}
}
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
@@ -569,7 +569,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;
- INFO(MAL_ALL, "%s: query already
running "LLFMT"s: %.200s\n",
+ INFO(MAL_INTERPRETER, "%s: query
already running "LLFMT"s: %.200s\n",
cntxt->mythread->name,
(lng) (time(0) -
cntxt->lastcmd),
q ? q : "");
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
@@ -1032,7 +1032,7 @@ SERVERlisten_port(int *ret, int *pid)
str
SERVERstop(void *ret)
{
- INFO(MAL_ALL, "Server stop\n");
+ INFO(MAL_SERVER, "Server stop\n");
ATOMIC_SET(&serverexiting, 1);
/* wait until they all exited, but skip the wait if the whole
* system is going down */
diff --git a/MonetDB5/modules/mal/mdb.c b/MonetDB5/modules/mal/mdb.c
--- a/MonetDB5/modules/mal/mdb.c
+++ b/MonetDB5/modules/mal/mdb.c
@@ -638,7 +638,7 @@ MDBlistDetail(Client cntxt, MalBlkPtr mb
{
(void) p;
(void) stk;
- debugFunction(cntxt->fdout, mb, 0, LIST_MAL_NAME | LIST_MAL_VALUE |
LIST_MAL_TYPE | LIST_MAL_PROPS, 0, mb->stop );
+ snprintFunction(cntxt->fdout, mb, 0, LIST_MAL_NAME | LIST_MAL_VALUE |
LIST_MAL_TYPE | LIST_MAL_PROPS, 0, mb->stop );
return MAL_SUCCEED;
}
@@ -652,7 +652,7 @@ MDBlist3Detail(Client cntxt, MalBlkPtr m
s = findSymbol(cntxt->usermodule, putName(modnme), putName(fcnnme));
if (s == NULL)
throw(MAL,"mdb.list","Could not find %s.%s", modnme, fcnnme);
- debugFunction(cntxt->fdout, s->def, 0, LIST_MAL_NAME | LIST_MAL_VALUE
| LIST_MAL_TYPE | LIST_MAL_PROPS , 0, s->def->stop);
+ snprintFunction(cntxt->fdout, s->def, 0, LIST_MAL_NAME |
LIST_MAL_VALUE | LIST_MAL_TYPE | LIST_MAL_PROPS , 0, s->def->stop);
(void) mb; /* fool compiler */
return NULL;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
