Changeset: 6ab7318316a6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ab7318316a6
Modified Files:
MonetDB5/mal/mal_dataflow.c
MonetDB5/mal/mal_resource.c
MonetDB5/optimizer/opt_mitosis.c
Branch: gdk-tracer
Log Message:
Added GDKtracer back to conflicting files
diffs (112 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
@@ -398,7 +398,7 @@ DFLOWworker(void *T)
}
}
error = runMALsequence(flow->cntxt, flow->mb, fe->pc, fe->pc +
1, flow->stk, 0, 0);
- PARDEBUG fprintf(stderr, "#executed pc= %d wrk= %d claim= "
LLFMT "," LLFMT "," LLFMT " %s\n",
+ DEBUG(PAR, "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);
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
@@ -114,16 +114,14 @@ MALadmission_claim(Client cntxt, MalBlkP
* of parallism for a single dataflow graph.
*/
if(cntxt->workerlimit && cntxt->workerlimit < stk->workers){
- PARDEBUG
- fprintf(stderr, "#DFLOWadmit worker limit reached, %d
<= %d\n", cntxt->workerlimit, stk->workers);
+ DEBUG(PAR, "Worker limit reached, %d <= %d\n",
cntxt->workerlimit, stk->workers);
MT_lock_unset(&admissionLock);
return -1;
}
/* Determine if the total memory resource is exhausted, because it is
overall limitation. */
if ( memorypool <= 0){
// we accidently released too much memory or need to initialize
- PARDEBUG
- fprintf(stderr, "#DFLOWadmit memorypool reset ");
+ DEBUG(PAR, "Memorypool reset\n");
memorypool = (lng) MEMORY_THRESHOLD;
}
@@ -134,23 +132,20 @@ MALadmission_claim(Client cntxt, MalBlkP
if ( 0 && cntxt->memorylimit) {
if (argclaim + stk->memory > (lng) cntxt->memorylimit *
LL_CONSTANT(1048576)){
MT_lock_unset(&admissionLock);
- PARDEBUG
- fprintf(stderr, "#Delayed due to lack
of session memory " LLFMT " requested "LLFMT"\n",
+ DEBUG(PAR, "Delayed due to lack of session
memory " LLFMT " requested "LLFMT"\n",
stk->memory, argclaim);
return -1;
}
stk->memory += argclaim;
}
memorypool -= argclaim;
- PARDEBUG
- fprintf(stderr, "#DFLOWadmit thread %d pool " LLFMT
"claims " LLFMT "\n",
- THRgettid(), memorypool, argclaim);
+ DEBUG(PAR, "Thread %d pool " LLFMT "claims " LLFMT "\n",
+ THRgettid(), memorypool, argclaim);
stk->workers++;
MT_lock_unset(&admissionLock);
return 0;
}
- PARDEBUG
- fprintf(stderr, "#Delayed due to lack of memory " LLFMT "
requested " LLFMT "\n",
+ DEBUG(PAR, "Delayed due to lack of memory " LLFMT " requested " LLFMT
"\n",
memorypool, argclaim);
MT_lock_unset(&admissionLock);
return -1;
@@ -167,20 +162,17 @@ MALadmission_release(Client cntxt, MalBl
MT_lock_set(&admissionLock);
if ( 0 && cntxt->memorylimit) {
- PARDEBUG
- fprintf(stderr, "#Return memory to session budget "
LLFMT "\n", stk->memory);
+ DEBUG(PAR, "Return memory to session budget " LLFMT "\n",
stk->memory);
stk->memory -= argclaim;
}
memorypool += argclaim;
if ( memorypool > (lng) MEMORY_THRESHOLD ){
- PARDEBUG
- fprintf(stderr, "#DFLOWadmit memorypool reset ");
+ DEBUG(PAR, "Memorypool reset\n");
memorypool = (lng) MEMORY_THRESHOLD;
}
stk->workers--;
- PARDEBUG
- fprintf(stderr, "#DFLOWadmit thread %d pool " LLFMT " claims "
LLFMT "\n",
- THRgettid(), memorypool, argclaim);
+ DEBUG(PAR, "Thread %d pool " LLFMT " claims " LLFMT "\n",
+ THRgettid(), memorypool, argclaim);
MT_lock_unset(&admissionLock);
return;
}
diff --git a/MonetDB5/optimizer/opt_mitosis.c b/MonetDB5/optimizer/opt_mitosis.c
--- a/MonetDB5/optimizer/opt_mitosis.c
+++ b/MonetDB5/optimizer/opt_mitosis.c
@@ -170,15 +170,13 @@ OPTmitosisImplementation(Client cntxt, M
if (mito_size > 0)
pieces = (int) ((rowcnt * row_size) / (mito_size * 1024));
- if(OPTdebug & OPTmitosis){
- fprintf(stderr, "#opt_mitosis: target is %s.%s "
+ DEBUG(MAL_OPT_MITOSIS, "Target is %s.%s"
" with " BUNFMT "
rows of size %d into %zu"
- " rows/piece %d
threads %d pieces"
- " fixed parts
%d fixed size %d chunk = "BUNFMT"\n",
- getVarConstant(mb, getArg(target, 2)).val.sval,
- getVarConstant(mb, getArg(target, 3)).val.sval,
- rowcnt, row_size, m, threads, pieces,
mito_parts, mito_size, rowcnt / pieces * row_size);
- }
+ " rows/piece %d
threads %d pieces"
+ " fixed parts %d
fixed size %d chunk = "BUNFMT"\n",
+ getVarConstant(mb, getArg(target, 2)).val.sval,
+ getVarConstant(mb, getArg(target, 3)).val.sval,
+ rowcnt, row_size, m, threads, pieces,
mito_parts, mito_size, rowcnt / pieces * row_size);
if (pieces <= 1)
goto bailout;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
