Changeset: 1a327fe96554 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a327fe96554
Modified Files:
monetdb5/scheduler/mut_policy.c
Branch: mutation
Log Message:
Merge packs may be shuffled
and we need to check them then on the next iteration.
diffs (37 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
@@ -29,7 +29,6 @@
#include "mut_join.h"
#include "mut_leftjoin.h"
#include "mut_aggr.h"
-#include "mut_matpack.h"
#include "mut_pack.h"
#include "mal_profiler.h"
#include "opt_prelude.h"
@@ -91,7 +90,7 @@ MUTfindpack(Mutant m, int pc)
int i;
InstrPtr p;
- for ( i = pc; i < src->stop ; i++) {
+ for ( i = pc>=0?pc:0; i < src->stop ; i++) {
p = getInstrPtr(src,i);
if ( getModuleId(p) == matRef && (getFunctionId(p) == packRef
|| getFunctionId(p)== mergepackRef))
return i;
@@ -196,7 +195,7 @@ MUTpolicy(Client cntxt, Mutant m)
if ( r < 0 || m->src->errors)
throw(MAL,"run_multicore","Baseline error");
while( r > 0 && m->src->errors == 0){
- target = MUTfindpack(m, target);
+ target = MUTfindpack(m, target-1);
if ( target < 0 )
break;
m->target = target;
@@ -211,6 +210,7 @@ MUTpolicy(Client cntxt, Mutant m)
}
m->src->calls = 0;
OPTgarbageCollectorImplementation(cntxt,m->src,0,0);
+ OPTdataflowImplementation(cntxt,m->src,0,0);
DEBUG_MULTICORE{
mnstr_printf(cntxt->fdout,"Final plan to execute, errors
%d\n",m->src->errors);
//if( mb->errors)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
