Changeset: cc97120378b0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc97120378b0
Modified Files:
monetdb5/scheduler/mut_policy.c
monetdb5/scheduler/mut_transforms.c
monetdb5/scheduler/run_multicore.c
monetdb5/scheduler/run_multicore.h
Branch: mutation
Log Message:
join mutation operation added
diffs (91 lines):
diff --git a/monetdb5/scheduler/mut_policy.c b/monetdb5/scheduler/mut_policy.c
--- a/monetdb5/scheduler/mut_policy.c
+++ b/monetdb5/scheduler/mut_policy.c
@@ -75,7 +75,6 @@ MUTpolicy(Client cntxt, Mutant m)
continue;
DEBUG_MULTICORE
mnstr_printf(cntxt->fdout,"#mutation candidate %d cost
"LLFMT"\n", i, src->profiler[i].ticks/src->calls);
-// mnstr_printf(GDKstdout,"#mutation candidate %d cost
"LLFMT"\n", i, src->profiler[i].ticks/src->calls);
if ( m->target == 0)
m->target = i;
@@ -86,12 +85,9 @@ MUTpolicy(Client cntxt, Mutant m)
DEBUG_MULTICORE
if ( src->profiler && m->target) {
mnstr_printf(cntxt->fdout,"#mutation calls %d cost "LLFMT"\n",
src->calls, src->runtime/src->calls);
-// mnstr_printf(GDKstdout,"#mutation calls %d cost "LLFMT"\n",
src->calls, src->runtime/src->calls);
mnstr_printf(cntxt->fdout,"#mutation target instruction %d cost
"LLFMT"\n", m->target, src->profiler[m->target].ticks/src->calls);
-// mnstr_printf(GDKstdout,"#mutation target instruction %d cost
"LLFMT"\n", m->target, src->profiler[m->target].ticks/src->calls);
printInstruction(cntxt->fdout,src,0,getInstrPtr(src,m->target),LIST_MAL_ALL);
-//
printInstruction(GDKstdout,src,0,getInstrPtr(src,m->target),LIST_MAL_ALL);
}
/* At this point we have a target instruction to be replaced */
/* safe the previous version in the history list */
@@ -124,7 +120,6 @@ MUTpolicy(Client cntxt, Mutant m)
chkFlow(cntxt->fdout,src);
DEBUG_MULTICORE
printFunction(cntxt->fdout, src,0,LIST_MAL_ALL);
-// printFunction(GDKstdout, src,0,LIST_MAL_ALL);
if ( src->errors)
throw(MAL,"run_mutation","Internal error");
}
diff --git a/monetdb5/scheduler/mut_transforms.c
b/monetdb5/scheduler/mut_transforms.c
--- a/monetdb5/scheduler/mut_transforms.c
+++ b/monetdb5/scheduler/mut_transforms.c
@@ -36,7 +36,7 @@
void
mutationJoin(Client cntxt, Mutant m){
- int pc = m->target, i, j, k, limit, b1,b2, v1,v2, z1,z2, mp;
+ int pc = m->target, i, j, k, limit, b1,b2, v1,v2, z1,z2;
InstrPtr p=0, *old= m->src->stmt, q;
int matpc = 0;
@@ -116,21 +116,10 @@ mutationJoin(Client cntxt, Mutant m){
if ( matpc == 0){
q= newStmt(m->src,matRef,packRef);
- mp= getArg(q,0)= getArg(p,0);
+ getArg(q,0)= getArg(p,0);
q= pushArgument(m->src,q,v1);
q= pushArgument(m->src,q,v2);
- (void)mp;
-
- // getBatSize to verify the size of the join
bat result
- // k1 := bat.getSize(s1);
- // io.print(k1);
-// q= newStmt(m->src, batRef,getSizeRef);
-// k1= getArg(q, 0)= newTmpVariable(m->src,
TYPE_any);
-// q= pushArgument(m->src, q, mp);
-
-// q= newStmt(m->src, ioRef, printRef);
-// pushArgument(m->src, q, k1);
}
//pushInstruction(m->src,p);
diff --git a/monetdb5/scheduler/run_multicore.c
b/monetdb5/scheduler/run_multicore.c
--- a/monetdb5/scheduler/run_multicore.c
+++ b/monetdb5/scheduler/run_multicore.c
@@ -51,7 +51,7 @@ RUNmulticore(Client cntxt, MalBlkPtr mb,
(void) cntxt;
// if called the first time, just execute the call
- if ( mb->calls == 0) { // || mb->runtime == 0){
+ if ( mb->calls == 0) {
initProfiler(mb);
setFilterAll();
mutant = (Mutant) GDKzalloc(sizeof(struct MUTANT));
diff --git a/monetdb5/scheduler/run_multicore.h
b/monetdb5/scheduler/run_multicore.h
--- a/monetdb5/scheduler/run_multicore.h
+++ b/monetdb5/scheduler/run_multicore.h
@@ -48,7 +48,7 @@ typedef struct MUTANT{
int target; // operation changed from previous
struct MUTANT *next;
} *Mutant;
-#define DEBUG_MULTICORE if(1)
+#define DEBUG_MULTICORE if(0)
run_multicore_export str RUNmulticore(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr p);
run_multicore_export void multicorePrint(Client cntxt, Mutant m);
#endif /* MAL_RUN_MULTICORE */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
