Changeset: 2be295587de5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2be295587de5
Modified Files:
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_import.h
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_parser.h
monetdb5/modules/kernel/group.c
monetdb5/modules/kernel/group.h
monetdb5/modules/kernel/group.mal
monetdb5/optimizer/opt_wrapper.c
monetdb5/optimizer/optimizer.c
monetdb5/optimizer/optimizer.h
monetdb5/optimizer/optimizer.mal
monetdb5/scheduler/mut_policy.c
monetdb5/scheduler/mut_stopRuns.c
monetdb5/scheduler/run_multicore.c
Branch: mutation
Log Message:
after merge from last code cleanup and macro expansion for operators
diffs (171 lines):
diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -231,7 +231,7 @@ static int stick_this_thread_to_core(int
pthread_t current_thread;
cpu_set_t cpuset;
- int num_cores = MT_check_nr_cores();
+ int num_cores = MT_check_nr_cores();
if (core_id >= num_cores)
{
diff --git a/monetdb5/mal/mal_import.c b/monetdb5/mal/mal_import.c
--- a/monetdb5/mal/mal_import.c
+++ b/monetdb5/mal/mal_import.c
@@ -13,7 +13,7 @@
*
* The Initial Developer of the Original Code is CWI.
* Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2011 MonetDB B.V.
+ * Copyright August 2008-2013 MonetDB B.V.
* All Rights Reserved.
*/
diff --git a/monetdb5/mal/mal_import.h b/monetdb5/mal/mal_import.h
--- a/monetdb5/mal/mal_import.h
+++ b/monetdb5/mal/mal_import.h
@@ -13,7 +13,7 @@
*
* The Initial Developer of the Original Code is CWI.
* Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2011 MonetDB B.V.
+ * Copyright August 2008-2013 MonetDB B.V.
* All Rights Reserved.
*/
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -13,7 +13,7 @@
*
* The Initial Developer of the Original Code is CWI.
* Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2011 MonetDB B.V.
+ * Copyright August 2008-2013 MonetDB B.V.
* All Rights Reserved.
*/
diff --git a/monetdb5/mal/mal_parser.h b/monetdb5/mal/mal_parser.h
--- a/monetdb5/mal/mal_parser.h
+++ b/monetdb5/mal/mal_parser.h
@@ -13,7 +13,7 @@
*
* The Initial Developer of the Original Code is CWI.
* Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2011 MonetDB B.V.
+ * Copyright August 2008-2013 MonetDB B.V.
* All Rights Reserved.
*/
diff --git a/monetdb5/modules/kernel/group.c b/monetdb5/modules/kernel/group.c
--- a/monetdb5/modules/kernel/group.c
+++ b/monetdb5/modules/kernel/group.c
@@ -13,7 +13,7 @@
*
* The Initial Developer of the Original Code is CWI.
* Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2012 MonetDB B.V.
+ * Copyright August 2008-2013 MonetDB B.V.
* All Rights Reserved.
*/
diff --git a/monetdb5/modules/kernel/group.h b/monetdb5/modules/kernel/group.h
--- a/monetdb5/modules/kernel/group.h
+++ b/monetdb5/modules/kernel/group.h
@@ -13,7 +13,7 @@
*
* The Initial Developer of the Original Code is CWI.
* Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2012 MonetDB B.V.
+ * Copyright August 2008-2013 MonetDB B.V.
* All Rights Reserved.
*/
diff --git a/monetdb5/modules/kernel/group.mal
b/monetdb5/modules/kernel/group.mal
--- a/monetdb5/modules/kernel/group.mal
+++ b/monetdb5/modules/kernel/group.mal
@@ -12,7 +12,7 @@
#
# The Initial Developer of the Original Code is CWI.
# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-# Copyright August 2008-2012 MonetDB B.V.
+# Copyright August 2008-2013 MonetDB B.V.
# All Rights Reserved.
module group;
diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -13,7 +13,7 @@ The Original Code is the MonetDB Databas
The Initial Developer of the Original Code is CWI.
Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-Copyright August 2008-2011 MonetDB B.V.
+Copyright August 2008-2013 MonetDB B.V.
All Rights Reserved.
*/
diff --git a/monetdb5/optimizer/optimizer.c b/monetdb5/optimizer/optimizer.c
--- a/monetdb5/optimizer/optimizer.c
+++ b/monetdb5/optimizer/optimizer.c
@@ -13,7 +13,7 @@
*
* The Initial Developer of the Original Code is CWI.
* Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2011 MonetDB B.V.
+ * Copyright August 2008-2013 MonetDB B.V.
* All Rights Reserved.
*/
diff --git a/monetdb5/optimizer/optimizer.h b/monetdb5/optimizer/optimizer.h
--- a/monetdb5/optimizer/optimizer.h
+++ b/monetdb5/optimizer/optimizer.h
@@ -13,7 +13,7 @@
*
* The Initial Developer of the Original Code is CWI.
* Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2011 MonetDB B.V.
+ * Copyright August 2008-2013 MonetDB B.V.
* All Rights Reserved.
*/
diff --git a/monetdb5/optimizer/optimizer.mal b/monetdb5/optimizer/optimizer.mal
--- a/monetdb5/optimizer/optimizer.mal
+++ b/monetdb5/optimizer/optimizer.mal
@@ -12,7 +12,7 @@
#
# The Initial Developer of the Original Code is CWI.
# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-# Copyright August 2008-2011 MonetDB B.V.
+# Copyright August 2008-2013 MonetDB B.V.
# All Rights Reserved.
module optimizer;
diff --git a/monetdb5/scheduler/mut_stopRuns.c
b/monetdb5/scheduler/mut_stopRuns.c
--- a/monetdb5/scheduler/mut_stopRuns.c
+++ b/monetdb5/scheduler/mut_stopRuns.c
@@ -146,6 +146,23 @@ checkRateOfFall(Client cntxt, Mutant mut
else if(mutant->globalMinRun > ((NUM_OF_CORES *2)*2) &&
mutant->globalMinRun < (NUM_OF_CORES *2)*4)
mutant->debit = mutant->debit + mutant->baseDebit +
0.75;
}
+*/
+ if(mutant->currentRun > NUM_OF_CORES )
+ {
+ if(mutant->globalMinRun <= NUM_OF_CORES )
+ mutant->debit = mutant->debit + 0.25;
+
+ else if(mutant->globalMinRun > NUM_OF_CORES &&
mutant->globalMinRun <= (NUM_OF_CORES *2))
+ mutant->debit = mutant->debit + 0.5;
+
+ else if(mutant->globalMinRun > (NUM_OF_CORES *2) &&
mutant->globalMinRun <= (NUM_OF_CORES *2)*2)
+ mutant->debit = mutant->debit + 0.75;
+
+ else if(mutant->globalMinRun > ((NUM_OF_CORES *2)*2) &&
mutant->globalMinRun < (NUM_OF_CORES *2)*4)
+ mutant->debit = mutant->debit + 1.0;
+
+ }
+
DEBUG_MULTICORE_PRINT_BALANCE
mnstr_printf(cntxt->fdout,"#Run- %d Credit- %f Debit- %f
rateOfImprove- %f", mutant->currentRun, mutant->credit, mutant->debit,
rateOfImprove);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
