Changeset: 145e47c9232e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=145e47c9232e
Modified Files:
monetdb5/scheduler/mut_transforms.c
Branch: mutation
Log Message:
platform type errors resolved
diffs (86 lines):
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
@@ -635,9 +635,9 @@ mutationLeftFetchJoin(Client cntxt, Muta
static void
mutateNonPartitionedOperators(Mutant m, int stmtLoop, int matPackRefInstr, int
matPackRefInstrArg, InstrPtr instrMatPack, int profiler)
{
- int j, k, l, limit, v1[MAX_PARTITIONS], z1[MAX_PARTITIONS];
+ int n, j, l, limit, v1[MAX_PARTITIONS], z1[MAX_PARTITIONS];
InstrPtr *old= m->src->stmt, q;
- int matpc = 0, mat_pack_partitions;
+ unsigned int matpc = 0, k, mat_pack_partitions;
limit= m->src->stop;
@@ -670,15 +670,15 @@ mutateNonPartitionedOperators(Mutant m,
q= old[j];
if ( getModuleId(q) == matRef &&
getFunctionId(q) == packRef)
{
- for( k= old[j]->retc; k < old[j]->argc;
k++)
+ for( n= old[j]->retc; n < old[j]->argc;
n++)
{
- if ( getArg(q,k) ==
getArg(getInstrPtr(m->src, matPackRefInstr),0))
+ if ( getArg(q,n) ==
getArg(getInstrPtr(m->src, matPackRefInstr),0))
{
// replace this
argument
matpc++;
- delArgument(old[j],k);
+ delArgument(old[j],n);
for(l=mat_pack_partitions-1; l>=0; l--)
- old[j] =
setArgument(m->src,old[j],k, v1[l]);
+ old[j] =
setArgument(m->src,old[j],n, v1[l]);
break;
}
}
@@ -689,16 +689,16 @@ mutateNonPartitionedOperators(Mutant m,
q= old[j];
if ( getModuleId(q) == matRef &&
getFunctionId(q) == packRef)
{
- for( k= old[j]->retc; k <
old[j]->argc; k++)
+ for( n= old[j]->retc; n <
old[j]->argc; n++)
{
- if ( getArg(q,k) ==
getArg(getInstrPtr(m->src,matPackRefInstr),1))
+ if ( getArg(q,n) ==
getArg(getInstrPtr(m->src,matPackRefInstr),1))
{
// replace this
argument
matpc++;
-
delArgument(old[j],k);
+
delArgument(old[j],n);
for(l=mat_pack_partitions-1; l>=0; l--)
- old[j]
= setArgument(m->src,old[j],k, z1[l]);
+ old[j]
= setArgument(m->src,old[j],n, z1[l]);
break;
}
}
@@ -707,8 +707,6 @@ mutateNonPartitionedOperators(Mutant m,
}
if (matpc == 0)
{
- for(k=0; k<mat_pack_partitions; k++)
- {
q= newStmt(m->src,matRef,packRef);
getArg(q,0)=
getArg(getInstrPtr(m->src,matPackRefInstr),0);
@@ -728,7 +726,6 @@ mutateNonPartitionedOperators(Mutant m,
// inherit profiling
m->src->profiler[m->src->stop-1].trace
= profiler;
- }
}
// mask the original algebra.join instruction
getInstrPtr(m->src,matPackRefInstr)->token =
NOOPsymbol;
@@ -743,9 +740,10 @@ static void
//mutatePartitionedOperators(Mutant m, int stmtLoop, int matPackRefInstr, int
matPackRefInstrArg, int batPartitionRefInstr, int batPartitionRefRefInstr, int
batPartitionRefInstrArg, InstrPtr instrMatPack, int profiler)
mutatePartitionedOperators(Mutant m, int batPartitionRefRefInstr, int
batPartitionRefInstrArg, InstrPtr instrMatPack, int profiler)
{
- int i, j, k;
+ int j, k;
InstrPtr q, depInstrMatPack;
- int mat_pack_partitions, dep_mat_pack_partitions, beginLifePC,
beginLifeBatPartition, mat_pack_to_combine;
+ int beginLifePC, beginLifeBatPartition, mat_pack_to_combine;
+ unsigned int i, mat_pack_partitions, dep_mat_pack_partitions;
Lifespan span;
span = setLifespan(m->src);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
