X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f82324570da0d9e5ada9db953e969b760e9b7016..3ad787c9b8d4f22d7281c8fd6a75434ad00bb98b:/src/simix/smx_context_raw.c diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c index 4ba87fc706..3b0a76be09 100644 --- a/src/simix/smx_context_raw.c +++ b/src/simix/smx_context_raw.c @@ -5,6 +5,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include #include "smx_private.h" #include "xbt/parmap.h" #include "xbt/dynar.h" @@ -27,12 +28,27 @@ static xbt_parmap_t raw_parmap; static smx_ctx_raw_t* raw_workers_context; /* space to save the worker context in each thread */ static unsigned long raw_threads_working; /* number of threads that have started their work */ static xbt_os_thread_key_t raw_worker_id_key; /* thread-specific storage for the thread id */ +#endif +#ifdef ADAPTIVE_THRESHOLD +#define SCHED_ROUND_LIMIT 5 +xbt_os_timer_t round_time; +double par_time,seq_time; +double par_ratio,seq_ratio; +int reached_seq_limit, reached_par_limit; +static unsigned int par_proc_that_ran = 0,seq_proc_that_ran = 0; /* Counters of processes that have run in SCHED_ROUND_LIMIT scheduling rounds */ +static unsigned int seq_sched_round=0, par_sched_round=0; /* Amount of SR that ran serial/parallel*/ +/*Varables used to calculate running variance and mean*/ +double prev_avg_par_proc=0,prev_avg_seq_proc=0; +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; +long long par_window=(long long)HUGE_VAL,seq_window=0; #endif static unsigned long raw_process_index = 0; /* index of the next process to run in the * list of runnable processes */ static smx_ctx_raw_t raw_maestro_context; - extern raw_stack_t raw_makecontext(char* malloced_stack, int stack_size, rawctx_entry_point_t entry_point, void* arg); extern void raw_swapcontext(raw_stack_t* old, raw_stack_t new); @@ -202,6 +218,11 @@ static unsigned int ssr_count = 0; static char new_sr = 0; #endif +#ifdef TIME_BENCH_ENTIRE_SRS +static unsigned int sr_count = 0; +static xbt_os_timer_t timer; +#endif + static void smx_ctx_raw_wrapper(smx_ctx_raw_t context); static int smx_ctx_raw_factory_finalize(smx_context_factory_t *factory); static smx_context_t smx_ctx_raw_create_context(xbt_main_func_t code, int argc, @@ -264,6 +285,18 @@ void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory) (*factory)->runall = smx_ctx_raw_runall_serial; (*factory)->suspend = smx_ctx_raw_suspend_serial; } +#ifdef TIME_BENCH_ENTIRE_SRS + (*factory)->runall = smx_ctx_raw_runall; + (*factory)->suspend = NULL; + timer = xbt_os_timer_new(); +#endif + +#ifdef ADAPTIVE_THRESHOLD + round_time = xbt_os_timer_new(); + reached_seq_limit = 0; + reached_par_limit = 0; +#endif + #ifdef TIME_BENCH_PER_SR timer = xbt_os_timer_new(); #endif @@ -472,12 +505,12 @@ void smx_ctx_raw_new_sr(void) } for(i=0; i < NUM_THREADS; i++){ - XBT_VERB("Time SR thread %u = %f (max %f)", i, time_thread_sr[i], tmax); + XBT_CRITICAL("Time SR thread %u = %f (max %f)", i, time_thread_sr[i], tmax); time_wasted_sr += tmax - time_thread_sr[i]; } - XBT_VERB("Total time SR %u = %f, %d", sr_count, tmax, xbt_dynar_length(simix_global->process_that_ran)); - XBT_VERB("New scheduling round"); + XBT_CRITICAL("Total time SR %u = %f, %d", sr_count, tmax, xbt_dynar_length(simix_global->process_that_ran)); + XBT_CRITICAL("New scheduling round"); } #else /** @@ -570,20 +603,130 @@ static void smx_ctx_raw_runall_parallel(void) /** * \brief Resumes all processes ready to run. */ +#ifdef ADAPTIVE_THRESHOLD static void smx_ctx_raw_runall(void) { unsigned long nb_processes = xbt_dynar_length(simix_global->process_to_run); + unsigned long threshold = SIMIX_context_get_parallel_threshold(); + reached_seq_limit = (seq_sched_round % SCHED_ROUND_LIMIT == 0); + reached_par_limit = (par_sched_round % SCHED_ROUND_LIMIT == 0); + + if(reached_seq_limit && reached_par_limit){ + 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) { + threshold = (threshold>2) ? threshold - 1 : threshold ; + SIMIX_context_set_parallel_threshold(threshold); + } + } else { + if(nb_processes > avg_seq_proc){ + SIMIX_context_set_parallel_threshold(threshold+1); + } + } + } + + //XBT_CRITICAL("Thresh: %d", SIMIX_context_get_parallel_threshold()); if (nb_processes >= SIMIX_context_get_parallel_threshold()) { - XBT_DEBUG("Runall // %lu", nb_processes); simix_global->context_factory->suspend = smx_ctx_raw_suspend_parallel; - smx_ctx_raw_runall_parallel(); + if(nb_processes < par_window){ + par_sched_round++; + xbt_os_walltimer_start(round_time); + smx_ctx_raw_runall_parallel(); + xbt_os_walltimer_stop(round_time); + par_time += xbt_os_timer_elapsed(round_time); + + prev_avg_par_proc = 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 = 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; + } + + par_proc_that_ran += nb_processes; + } else{ + smx_ctx_raw_runall_parallel(); + } } else { - XBT_DEBUG("Runall serial %lu", nb_processes); simix_global->context_factory->suspend = smx_ctx_raw_suspend_serial; - #ifdef TIME_BENCH_PER_SR - smx_ctx_raw_runall_serial(simix_global->process_to_run); - #else - smx_ctx_raw_runall_serial(); - #endif + if(nb_processes > seq_window){ + seq_sched_round++; + xbt_os_walltimer_start(round_time); + smx_ctx_raw_runall_serial(); + xbt_os_walltimer_stop(round_time); + seq_time += xbt_os_timer_elapsed(round_time); + + prev_avg_seq_proc = avg_seq_proc; + delta = (nb_processes-avg_seq_proc); + 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 = 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; + } + + seq_proc_that_ran += nb_processes; + } else { + smx_ctx_raw_runall_serial(); + } } } + +#else + +static void smx_ctx_raw_runall(void) +{ +#ifdef TIME_BENCH_ENTIRE_SRS + sr_count++; + timer = xbt_os_timer_new(); + double elapsed = 0; +#endif + unsigned long nb_processes = xbt_dynar_length(simix_global->process_to_run); + if (SIMIX_context_is_parallel() && SIMIX_context_get_parallel_threshold()context_factory->suspend = smx_ctx_raw_suspend_parallel; + + #ifdef TIME_BENCH_ENTIRE_SRS + xbt_os_walltimer_start(timer); + #endif + + smx_ctx_raw_runall_parallel(); + + #ifdef TIME_BENCH_ENTIRE_SRS + xbt_os_walltimer_stop(timer); + elapsed = xbt_os_timer_elapsed(timer); + #endif + } else { + XBT_DEBUG("Runall serial %lu", nb_processes); + simix_global->context_factory->suspend = smx_ctx_raw_suspend_serial; + + #ifdef TIME_BENCH_PER_SR + smx_ctx_raw_runall_serial(simix_global->process_to_run); + #else + + #ifdef TIME_BENCH_ENTIRE_SRS + xbt_os_walltimer_start(timer); + #endif + + smx_ctx_raw_runall_serial(); + + #ifdef TIME_BENCH_ENTIRE_SRS + xbt_os_walltimer_stop(timer); + elapsed = xbt_os_timer_elapsed(timer); + #endif + #endif + } + +#ifdef TIME_BENCH_ENTIRE_SRS + XBT_CRITICAL("Total time SR %u = %f, %d", sr_count, elapsed, nb_processes); +#endif +} +#endif