Changeset: e09d55895c11 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e09d55895c11
Modified Files:
monetdb5/mal/mal_resolve.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/manifold.c
monetdb5/modules/mal/oltp.c
monetdb5/optimizer/opt_commonTerms.c
monetdb5/optimizer/opt_dataflow.c
monetdb5/scheduler/run_pipeline.c
Branch: gdk_tracer
Log Message:
Further simplication of traced debugging.
diffs (255 lines):
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
@@ -266,20 +266,6 @@ findFunctionType(Module scope, MalBlkPtr
int actual = getArgType(mb, p, i);
int formal = getArgType(s->def, sig, i);
if (resolveType(formal, actual) == -1) {
- /* CHECK */
- // IMPORTANT
- //
- // This was like that below. If not
using GDKfree() is an issue
- // let me know, because there other
cases like this one!
- //
- // #ifdef DEBUG_MAL_RESOLVE
- // char *ftpe =
getTypeName(formal);
- // char *atpe = getTypeName(actual);
- // fprintf(stderr, "#unmatched %d
formal %s actual %s\n",
- // i,
ftpe, atpe);
- // GDKfree(ftpe);
- // GDKfree(atpe);
- // #endif
unmatched = i;
break;
}
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
@@ -921,14 +921,8 @@ SERVERlisten(int port, const char *usock
throw(MAL, "mal_mapi.listen", OPERATION_FAILED ": starting
thread failed");
}
- /* CHECK */
- // From here
- TRC_DEBUG_IF(MAL_SERVER)
- {
- gethostname(host, (int) 512);
- TRC_DEBUG_ENDIF(MAL_SERVER, "Ready to accept connections on:
%s:%d\n", host, port);
- }
- // To here is in DEBUG MAL_SERVER
+ gethostname(host, (int) 512);
+ TRC_DEBUG_ENDIF(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
@@ -228,12 +228,9 @@ MANIFOLDtypecheck(Client cntxt, MalBlkPt
setVarUDFtype(nmb,k);
}
- TRC_DEBUG_IF(MAL_MANIFOLD)
- {
- TRC_DEBUG_ENDIF(MAL_MANIFOLD, "Manifold operation\n");
- traceInstruction(MAL_MANIFOLD, mb, 0, pci, LIST_MAL_ALL);
- traceInstruction(MAL_MANIFOLD, nmb, 0, q, LIST_MAL_ALL);
- }
+ TRC_DEBUG(MAL_MANIFOLD, "Manifold operation\n");
+ traceInstruction(MAL_MANIFOLD, mb, 0, pci, LIST_MAL_ALL);
+ traceInstruction(MAL_MANIFOLD, nmb, 0, q, LIST_MAL_ALL);
// Localize the underlying scalar operator
typeChecker(cntxt->usermodule, nmb, q, getPC(nmb, q), TRUE);
@@ -247,11 +244,8 @@ MANIFOLDtypecheck(Client cntxt, MalBlkPt
setVarType( mb, getArg(pci,0),
newBatType(getArgType(nmb,q,0)) );
}
- TRC_DEBUG_IF(MAL_MANIFOLD)
- {
- TRC_DEBUG_ENDIF(MAL_MANIFOLD, "Success? %s\n", (fcn == NULL?
"no":"yes"));
- traceInstruction(MAL_MANIFOLD, nmb, 0, q, LIST_MAL_ALL);
- }
+ TRC_DEBUG(MAL_MANIFOLD, "Success? %s\n", (fcn == NULL? "no":"yes"));
+ traceInstruction(MAL_MANIFOLD, nmb, 0, q, LIST_MAL_ALL);
freeMalBlk(nmb);
return fcn;
diff --git a/monetdb5/modules/mal/oltp.c b/monetdb5/modules/mal/oltp.c
--- a/monetdb5/modules/mal/oltp.c
+++ b/monetdb5/modules/mal/oltp.c
@@ -173,11 +173,7 @@ OLTPrelease(Client cntxt, MalBlkPtr mb,
MT_lock_set(&mal_oltpLock);
clk = GDKusec();
- TRC_DEBUG_IF(MAL_OLTP)
- {
- TRC_DEBUG_ENDIF(MAL_OLTP, "%6d release the locks: %d", GDKms(),
cntxt->idx);
- traceInstruction(MAL_OLTP, mb, stk, pci, LIST_MAL_ALL);
- }
+ TRC_DEBUG(MAL_OLTP, "%6d release the locks: %d", GDKms(), cntxt->idx);
for( i=1; i< pci->argc; i++){
lck= getVarConstant(mb, getArg(pci,i)).val.ival;
diff --git a/monetdb5/optimizer/opt_commonTerms.c
b/monetdb5/optimizer/opt_commonTerms.c
--- a/monetdb5/optimizer/opt_commonTerms.c
+++ b/monetdb5/optimizer/opt_commonTerms.c
@@ -121,12 +121,8 @@ OPTcommonTermsImplementation(Client cntx
h = hashInstruction(mb, p);
- TRC_DEBUG_IF(MAL_OPTIMIZER)
- {
- TRC_DEBUG_ENDIF(MAL_OPTIMIZER, "Candidate[%d] look at
list[%d] => %d\n",
-
i, h, hash[h]);
- traceInstruction(MAL_OPTIMIZER, mb, 0, p, LIST_MAL_ALL);
- }
+ TRC_DEBUG(MAL_OPTIMIZER, "Candidate[%d] look at list[%d] =>
%d\n", i, h, hash[h]);
+ traceInstruction(MAL_OPTIMIZER, mb, 0, p, LIST_MAL_ALL);
if( h < 0){
pushInstruction(mb,p);
@@ -137,20 +133,17 @@ OPTcommonTermsImplementation(Client cntx
/* Look into the hash structure for matching instructions */
for (j = hash[h]; j > 0 && bailout-- > 0 ; j = list[j])
if ( (q= getInstrPtr(mb,j)) && getFunctionId(q) ==
getFunctionId(p) && getModuleId(q) == getModuleId(p) ){
- TRC_DEBUG_IF(MAL_OPTIMIZER)
- {
- TRC_DEBUG_ENDIF(MAL_OPTIMIZER,
"Candidate[%d->%d] %d %d :%d %d %d=%d %d %d %d\n",
- j, list[j],
- hasSameSignature(mb, p, q),
- hasSameArguments(mb, p, q),
- q->token != ASSIGNsymbol ,
- list[getArg(q,q->argc-1)],i,
- !hasCommonResults(p, q),
- !isUnsafeFunction(q),
- !isUpdateInstruction(q),
- isLinearFlow(q));
- traceInstruction(MAL_OPTIMIZER, mb, 0,
q, LIST_MAL_ALL);
- }
+ TRC_DEBUG(MAL_OPTIMIZER, "Candidate[%d->%d] %d
%d :%d %d %d=%d %d %d %d\n",
+ j, list[j],
+ hasSameSignature(mb, p, q),
+ hasSameArguments(mb, p, q),
+ q->token != ASSIGNsymbol ,
+ list[getArg(q,q->argc-1)],i,
+ !hasCommonResults(p, q),
+ !isUnsafeFunction(q),
+ !isUpdateInstruction(q),
+ isLinearFlow(q));
+ traceInstruction(MAL_OPTIMIZER, mb, 0, q,
LIST_MAL_ALL);
/*
* Simple assignments are not replaced either.
They should be
@@ -177,11 +170,8 @@ OPTcommonTermsImplementation(Client cntx
p= addArgument(mb,p,
getArg(q,k));
}
- TRC_DEBUG_IF(MAL_OPTIMIZER)
- {
- TRC_DEBUG_ENDIF(MAL_OPTIMIZER,
"Modified expression %d -> %d ", getArg(p,0), getArg(p,1));
- traceInstruction(MAL_OPTIMIZER,
mb, 0, p, LIST_MAL_ALL);
- }
+ TRC_DEBUG(MAL_OPTIMIZER, "Modified
expression %d -> %d ", getArg(p,0), getArg(p,1));
+ traceInstruction(MAL_OPTIMIZER, mb, 0,
p, LIST_MAL_ALL);
actions++;
break; /* end of search */
@@ -189,11 +179,8 @@ OPTcommonTermsImplementation(Client cntx
}
else if(isUpdateInstruction(p)){
- TRC_DEBUG_IF(MAL_OPTIMIZER)
- {
- TRC_DEBUG_ENDIF(MAL_OPTIMIZER,
"Skipped: %d %d\n", mayhaveSideEffects(cntxt, mb, q, TRUE) ,
isUpdateInstruction(p));
- traceInstruction(MAL_OPTIMIZER, mb, 0,
q, LIST_MAL_ALL);
- }
+ TRC_DEBUG_ENDIF(MAL_OPTIMIZER, "Skipped: %d
%d\n", mayhaveSideEffects(cntxt, mb, q, TRUE) , isUpdateInstruction(p));
+ traceInstruction(MAL_OPTIMIZER, mb, 0, q,
LIST_MAL_ALL);
}
if (duplicate){
@@ -201,12 +188,8 @@ OPTcommonTermsImplementation(Client cntx
continue;
}
/* update the hash structure with another candidate for re-use
*/
- TRC_DEBUG_IF(MAL_OPTIMIZER)
- {
- TRC_DEBUG_ENDIF(MAL_OPTIMIZER, "Update hash[%d] - look
at arg '%d' hash '%d' list '%d'\n",
-
i, getArg(p,p->argc-1), h, hash[h]);
- traceInstruction(MAL_OPTIMIZER, mb, 0, p, LIST_MAL_ALL);
- }
+ TRC_DEBUG(MAL_OPTIMIZER, "Update hash[%d] - look at arg '%d'
hash '%d' list '%d'\n", i, getArg(p,p->argc-1), h, hash[h]);
+ traceInstruction(MAL_OPTIMIZER, mb, 0, p, LIST_MAL_ALL);
if ( !mayhaveSideEffects(cntxt, mb, p, TRUE) && p->argc !=
p->retc && isLinearFlow(p) && !isUnsafeFunction(p) && !isUpdateInstruction(p)){
list[i] = hash[h];
diff --git a/monetdb5/optimizer/opt_dataflow.c
b/monetdb5/optimizer/opt_dataflow.c
--- a/monetdb5/optimizer/opt_dataflow.c
+++ b/monetdb5/optimizer/opt_dataflow.c
@@ -106,7 +106,6 @@ dataflowBreakpoint(Client cntxt, MalBlkP
*/
for(j=0; j<p->retc; j++)
if ( getState(states,p,j) & (VARWRITE | VARREAD | VARBLOCK)){
- TRC_DEBUG(MAL_OPTIMIZER, "Breakpoint on argument '%s'
state '%d'\n", getVarName(mb,getArg(p,j)), getState(states,p,j));
return 1;
}
@@ -119,31 +118,12 @@ dataflowBreakpoint(Client cntxt, MalBlkP
* program (see bugs.monetdb.org/6641) */
if (getModuleId(p) == sqlRef)
return 1;
-
- /* CHECK */
- // If is in DEBUG MAL_OPTIMIZER
- TRC_DEBUG_IF(MAL_OPTIMIZER)
- if( getState(states,p,1) & (VARREAD | VARBLOCK))
- TRC_DEBUG_ENDIF(MAL_OPTIMIZER, "Breakpoint on
update '%s' state '%d'\n", getVarName(mb,getArg(p,j)), getState(states,p,j));
return getState(states,p,p->retc) & (VARREAD | VARBLOCK);
}
-
- for(j=p->retc; j < p->argc; j++){
+ for(j=p->retc; j < p->argc; j++)
if ( getState(states,p,j) & VARBLOCK){
- /* CHECK */
- // If is in DEBUG MAL_OPTIMIZER
- TRC_DEBUG_IF(MAL_OPTIMIZER)
- if( getState(states,p,j) & VARREAD)
- TRC_DEBUG_ENDIF(MAL_OPTIMIZER,
"Breakpoint on blocked var '%s' state '%d'\n", getVarName(mb,getArg(p,j)),
getState(states,p,j));
return 1;
}
-
- /* CHECK */
- // If is in DEBUG MAL_OPTIMIZER
- TRC_DEBUG_IF(MAL_OPTIMIZER)
- if( hasSideEffects(mb,p,FALSE))
- TRC_DEBUG_ENDIF(MAL_OPTIMIZER, "Breakpoint on
side-effect var '%s' '%s.%s'\n", getVarName(mb,getArg(p,j)), getModuleId(p),
getFunctionId(p));
- }
return hasSideEffects(mb,p,FALSE);
}
@@ -222,8 +202,6 @@ OPTdataflowImplementation(Client cntxt,
/* close previous flow block */
simple = simpleFlow(old,start,i);
- TRC_DEBUG(MAL_OPTIMIZER, "Breakpoint pc: %d %s\n", i,
(simple?"simple":""));
-
if ( !simple){
flowblock = newTmpVariable(mb,TYPE_bit);
q= newFcnCall(mb,languageRef,dataflowRef);
diff --git a/monetdb5/scheduler/run_pipeline.c
b/monetdb5/scheduler/run_pipeline.c
--- a/monetdb5/scheduler/run_pipeline.c
+++ b/monetdb5/scheduler/run_pipeline.c
@@ -213,12 +213,6 @@ RUNsqlbind(Client cntxt, MalBlkPtr mb, M
}
}
- TRC_DEBUG_IF(MAL_SCHEDULER)
- {
- debugFunction(MAL_SCHEDULER, mb, stk, LIST_MAL_ALL);
- TRC_DEBUG_ENDIF(MAL_SCHEDULER, "Results from
scheduler.sqlbind");
- }
-
return msg;
}
#endif
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
