Changeset: 04ab1f6cfb54 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=04ab1f6cfb54
Modified Files:
monetdb5/scheduler/mut_policy.c
monetdb5/scheduler/mut_util.c
monetdb5/scheduler/run_multicore.h
Branch: mutation
Log Message:
Merge with previous
diffs (36 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
@@ -56,7 +56,7 @@ mutationCandidate(InstrPtr p){
* in a parallel MAL block
*/
static int
-MUTfindtarget(Client cntxt, Mutant m, int threshold, int upperbound)
+MUTfindtarget(Client cntxt, Mutant m, lng threshold, lng upperbound)
{
MalBlkPtr src = m->src;
int i,target = -1;
diff --git a/monetdb5/scheduler/mut_util.c b/monetdb5/scheduler/mut_util.c
--- a/monetdb5/scheduler/mut_util.c
+++ b/monetdb5/scheduler/mut_util.c
@@ -82,7 +82,7 @@ MUTupdateRateOfFall(Client cntxt, Mutant
}
queryTotalTime = mutant->totalQueryTime;
prevQueryTotalTime = mutant->next->totalQueryTime;
- diffTime = abs(queryTotalTime - prevQueryTotalTime);
+ diffTime = llabs(queryTotalTime - prevQueryTotalTime);
if(queryTotalTime >= prevQueryTotalTime)
baseTime = queryTotalTime;
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
@@ -59,7 +59,7 @@ typedef struct MUTANT{
dbl debit; // increase in execution time with respect to
previous mutation, addss debit points to current mutation
// The decision to whether the current run
should be executed or not is taken based on "credit - debit".
// If "credit - debit" is atleast 1 current run
is executed.
- flt baseDebit; // The dynamic debit rate calculated when first
threshold of NUM_OF_CORES is calculated
+ dbl baseDebit; // The dynamic debit rate calculated when first
threshold of NUM_OF_CORES is calculated
} *Mutant;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
