From a907a1b31d4f6089a349b67fbdaf762d8cbd2374 Mon Sep 17 00:00:00 2001 From: etortilopez Date: Mon, 13 Oct 2014 16:10:22 +0200 Subject: [PATCH] better estimate of window for adaptive algorithm --- src/simix/smx_context_raw.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c index df53bd976b..942dc839a4 100644 --- a/src/simix/smx_context_raw.c +++ b/src/simix/smx_context_raw.c @@ -44,7 +44,7 @@ double delta=0; double s_par_proc=0,s_seq_proc=0; /*Standard deviation of number of processes computed in par/seq during the current simulation*/ double avg_par_proc=0,sd_par_proc=0; double avg_seq_proc=0,sd_seq_proc=0; -double par_window=4294967296,seq_window=0; /*par_window is initially 1<<32*/ +double par_window=HUGE_VAL,seq_window=0; /*par_window is initially 1<<32*/ #endif static unsigned long raw_process_index = 0; /* index of the next process to run in the @@ -617,7 +617,7 @@ static void smx_ctx_raw_runall(void) par_ratio = (par_proc_that_ran != 0) ? (par_time / (double)par_proc_that_ran) : 0; seq_ratio = (seq_proc_that_ran != 0) ? (seq_time / (double)seq_proc_that_ran) : 0; if(seq_ratio > par_ratio){ - if(nb_processes < avg_par_proc) { + if(nb_processes < avg_par_proc) { threshold = (threshold>2) ? threshold - 1 : threshold ; SIMIX_context_set_parallel_threshold(threshold); } @@ -628,8 +628,6 @@ static void smx_ctx_raw_runall(void) } } - //XBT_CRITICAL("Thres: %d.", SIMIX_context_get_parallel_threshold()); - if (nb_processes >= SIMIX_context_get_parallel_threshold()) { simix_global->context_factory->suspend = smx_ctx_raw_suspend_parallel; if(nb_processes < par_window){ @@ -640,13 +638,13 @@ static void smx_ctx_raw_runall(void) par_time += xbt_os_timer_elapsed(round_time); prev_avg_par_proc = avg_par_proc; - delta = (nb_processes-avg_par_proc); + delta = nb_processes - avg_par_proc; avg_par_proc = (par_sched_round==1) ? nb_processes : avg_par_proc + delta / (double) par_sched_round; if(par_sched_round>=2){ - s_par_proc = sd_par_proc + (nb_processes - prev_avg_par_proc)*delta; - sd_par_proc = sqrt(s_par_proc/(par_sched_round-1)); - par_window = avg_par_proc + sd_par_proc; + s_par_proc = s_par_proc + (nb_processes - prev_avg_par_proc) * delta; + sd_par_proc = sqrt(s_par_proc / (par_sched_round-1)); + par_window = (int) (avg_par_proc + sd_par_proc); }else{ sd_par_proc = 0; } @@ -669,9 +667,9 @@ static void smx_ctx_raw_runall(void) avg_seq_proc = (seq_sched_round==1) ? nb_processes : avg_seq_proc + delta / (double) seq_sched_round; if(seq_sched_round>=2){ - s_seq_proc = sd_seq_proc + (nb_processes - prev_avg_seq_proc)*delta; - sd_seq_proc = sqrt(s_seq_proc/(seq_sched_round-1)); - seq_window = avg_seq_proc - sd_seq_proc; + s_seq_proc = s_seq_proc + (nb_processes - prev_avg_seq_proc)*delta; + sd_seq_proc = sqrt(s_seq_proc / (seq_sched_round-1)); + seq_window = (int) (avg_seq_proc - sd_seq_proc); } else { sd_seq_proc = 0; } -- 2.20.1