Changeset: 30db1d399fce for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=30db1d399fce
Modified Files:
MonetDB5/mal/mal_dataflow.c
MonetDB5/mal/mal_interpreter.c
MonetDB5/mal/mal_resource.c
Branch: tracer
Log Message:
Revert "Replaced fprintf after merge with default"
This reverts commit 6568036af6de6a88383e2069478c154de7c9235f.
diffs (105 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
@@ -395,8 +395,8 @@ DFLOWworker(void *T)
}
}
error = runMALsequence(flow->cntxt, flow->mb, fe->pc, fe->pc +
1, flow->stk, 0, 0);
- DEBUG(PAR, "Executed pc=%d wrk=%d claim=" LLFMT "," LLFMT ","
LLFMT " %s\n",
- fe->pc, id, fe->argclaim, fe->hotclaim, fe->maxclaim,
error ? error : "");
+ PARDEBUG fprintf(stderr, "#executed pc= %d wrk= %d claim= "
LLFMT "," LLFMT "," LLFMT " %s\n",
+ fe->pc, id, fe->argclaim,
fe->hotclaim, fe->maxclaim, error ? error : "");
/* release the memory claim */
MALadmission(flow->cntxt, flow->mb, flow->stk, p,
-fe->argclaim);
/* update the numa information. keep the thread-id producing
the value */
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",
+ fprintf(stderr, "#%s: query already
running "LLFMT"s: %.200s\n",
cntxt->mythread->name,
(lng) (time(0) -
cntxt->lastcmd),
q ? q : "");
diff --git a/MonetDB5/mal/mal_resource.c b/MonetDB5/mal/mal_resource.c
--- a/MonetDB5/mal/mal_resource.c
+++ b/MonetDB5/mal/mal_resource.c
@@ -131,18 +131,21 @@ MALadmission(Client cntxt, MalBlkPtr mb,
*/
workers = stk->workers;
if( cntxt->workerlimit && cntxt->workerlimit <= workers){
- DEBUG(PAR, "Worker limit reached, %d <= %d\n",
cntxt->workerlimit, workers);
+ PARDEBUG
+ fprintf(stderr, "#DFLOWadmit worker limit reached, %d
<= %d\n", cntxt->workerlimit, workers);
MT_lock_unset(&admissionLock);
return -1;
}
/* Determine if the total memory resource is exhausted, because it is
overall limitation.
*/
if ( memoryclaims < 0){
- DEBUG(PAR, "Memoryclaim reset\n");
+ PARDEBUG
+ fprintf(stderr, "#DFLOWadmit memoryclaim reset ");
memoryclaims = 0;
}
if ( memorypool <= 0 && memoryclaims == 0){
- DEBUG(PAR, "Memorypool reset\n");
+ PARDEBUG
+ fprintf(stderr, "#DFLOWadmit memorypool reset ");
memorypool = (lng)(MEMORY_THRESHOLD );
}
@@ -155,7 +158,8 @@ MALadmission(Client cntxt, MalBlkPtr mb,
mbytes = ((lng) cntxt->memorylimit) * 1024 *
1024;
if (argclaim + stk->memory > mbytes){
MT_lock_unset(&admissionLock);
- DEBUG(PAR, "Delayed due to lack of
session memory " LLFMT " requested "LLFMT"\n",
+ PARDEBUG
+ fprintf(stderr, "#Delayed due to lack
of session memory " LLFMT " requested "LLFMT"\n",
stk->memory, argclaim);
return -1;
}
@@ -163,13 +167,15 @@ MALadmission(Client cntxt, MalBlkPtr mb,
memorypool -= (lng) (argclaim);
stk->memory += argclaim;
memoryclaims++;
- DEBUG(PAR, "%3d thread %d pool " LLFMT "claims " LLFMT
"\n",
- memoryclaims, THRgettid(), memorypool,
argclaim);
+ PARDEBUG
+ fprintf(stderr, "#DFLOWadmit %3d thread %d pool " LLFMT
"claims " LLFMT "\n",
+ memoryclaims, THRgettid(),
memorypool, argclaim);
MT_lock_unset(&admissionLock);
stk->workers++;
return 0;
}
- DEBUG(PAR, "Delayed due to lack of memory " LLFMT " requested "
LLFMT " memoryclaims %d\n",
+ PARDEBUG
+ fprintf(stderr, "#Delayed due to lack of memory " LLFMT "
requested " LLFMT " memoryclaims %d\n",
memorypool, argclaim, memoryclaims);
MT_lock_unset(&admissionLock);
return -1;
@@ -177,7 +183,8 @@ MALadmission(Client cntxt, MalBlkPtr mb,
/* return the session budget */
if(cntxt->memorylimit){
- DEBUG(PAR, "Return memory to session budget " LLFMT "\n",
stk->memory);
+ PARDEBUG
+ fprintf(stderr, "#Return memory to session budget "
LLFMT "\n", stk->memory);
stk->memory += -argclaim;
}
/* release memory claimed before */
@@ -185,8 +192,9 @@ MALadmission(Client cntxt, MalBlkPtr mb,
memoryclaims--;
stk->workers--;
- DEBUG(PAR, "%3d thread %d pool " LLFMT " claims " LLFMT "\n",
- memoryclaims, THRgettid(), memorypool, argclaim);
+ PARDEBUG
+ fprintf(stderr, "#DFLOWadmit %3d thread %d pool " LLFMT " claims "
LLFMT "\n",
+ memoryclaims, THRgettid(), memorypool,
argclaim);
MT_lock_unset(&admissionLock);
return 0;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
