Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
authorMartin Quinson <martin.quinson@loria.fr>
Mon, 2 May 2016 17:28:30 +0000 (19:28 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Mon, 2 May 2016 17:28:30 +0000 (19:28 +0200)
src/simix/RawContext.cpp
src/simix/smx_global.cpp
src/simix/smx_private.h
src/surf/sg_platf.cpp

index 94770ae..67ebc54 100644 (file)
@@ -89,30 +89,11 @@ static simgrid::simix::RawContext** raw_workers_context;    /* space to save the
 static uintptr_t 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
-static xbt_os_timer_t round_time;
-static double par_time,seq_time;
-static double par_ratio,seq_ratio;
-static 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*/
-static double prev_avg_par_proc=0,prev_avg_seq_proc=0;
-static double delta=0;
-static double s_par_proc=0,s_seq_proc=0; /*Standard deviation of number of processes computed in par/seq during the current simulation*/
-static double avg_par_proc=0,sd_par_proc=0;
-static double avg_seq_proc=0,sd_seq_proc=0;
-static 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 simgrid::simix::RawContext* raw_maestro_context;
 
 static bool raw_context_parallel = false;
-#ifdef ADAPTIVE_THRESHOLD
-static bool raw_context_adaptative = false;
-#endif
 
 // ***** Raw context routines
 
@@ -289,9 +270,6 @@ namespace simix {
 RawContextFactory::RawContextFactory()
   : ContextFactory("RawContextFactory")
 {
-#ifdef ADAPTIVE_THRESHOLD
-  raw_context_adaptative = (SIMIX_context_get_parallel_threshold() > 1);
-#endif
   raw_context_parallel = SIMIX_context_is_parallel();
   if (raw_context_parallel) {
 #if HAVE_THREAD_CONTEXTS
@@ -304,11 +282,6 @@ RawContextFactory::RawContextFactory()
 #endif
     // TODO, if(SIMIX_context_get_parallel_threshold() > 1) => choose dynamically
   }
-#ifdef ADAPTIVE_THRESHOLD
-  round_time = xbt_os_timer_new();
-  reached_seq_limit = 0;
-  reached_par_limit = 0;
-#endif
 }
 
 RawContextFactory::~RawContextFactory()
@@ -367,11 +340,6 @@ void RawContext::stop()
 
 void RawContextFactory::run_all()
 {
-#ifdef ADAPTIVE_THRESHOLD
-  if (raw_context_adaptative)
-    run_all_adaptative();
-  else
-#endif
   if (raw_context_parallel)
     run_all_parallel();
   else
@@ -490,88 +458,7 @@ void RawContext::resume_parallel()
 #endif
 }
 
-/**
- * \brief Resumes all processes ready to run.
- */
-#ifdef ADAPTIVE_THRESHOLD
-void RawContectFactory::run_all_adaptative()
-{
-  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);
-        }
-    }
-  }
-
-  if (nb_processes >= SIMIX_context_get_parallel_threshold()) {
-    simix_global->context_factory->suspend = smx_ctx_raw_suspend_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 {
-    simix_global->context_factory->suspend = smx_ctx_raw_suspend_serial;
-    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
-
-// TODO
+/** @brief Resumes all processes ready to run. */
 void RawContextFactory::run_all_adaptative()
 {
   unsigned long nb_processes = xbt_dynar_length(simix_global->process_to_run);
@@ -586,7 +473,6 @@ void RawContextFactory::run_all_adaptative()
         this->run_all_serial();
     }
 }
-#endif
 
 }
 }
index 06f6dc8..856ccc8 100644 (file)
@@ -4,6 +4,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 <signal.h> /* Signal handling */
 #include <stdlib.h>
 #include "src/internal_config.h"
 
@@ -52,8 +53,6 @@ static void* SIMIX_synchro_mallocator_new_f(void);
 static void SIMIX_synchro_mallocator_free_f(void* synchro);
 static void SIMIX_synchro_mallocator_reset_f(void* synchro);
 
-/* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
-#include <signal.h>
 
 int _sg_do_verbose_exit = 1;
 static void inthandler(int ignored)
@@ -144,8 +143,8 @@ static void install_segvhandler(void)
 }
 
 #endif /* _WIN32 */
-/********************************* SIMIX **************************************/
 
+/********************************* SIMIX **************************************/
 double SIMIX_timer_next(void)
 {
   return xbt_heap_size(simix_timers) > 0 ? xbt_heap_maxkey(simix_timers) : -1.0;
@@ -156,12 +155,6 @@ static void kill_process(smx_process_t process)
   SIMIX_process_kill(process, NULL);
 }
 
-static void SIMIX_storage_create_(smx_storage_t storage)
-{
-  const char* key = xbt_dict_get_elm_key(storage);
-  SIMIX_storage_create(key, storage, NULL);
-}
-
 static std::function<void()> maestro_code;
 
 namespace simgrid {
@@ -200,11 +193,6 @@ void SIMIX_global_init(int *argc, char **argv)
   if (!simix_global) {
     simix_global = xbt_new0(s_smx_global_t, 1);
 
-#ifdef TIME_BENCH_AMDAHL
-    simix_global->timer_seq = xbt_os_timer_new();
-    simix_global->timer_par = xbt_os_timer_new();
-    xbt_os_cputimer_start(simix_global->timer_seq);
-#endif
     simix_global->process_to_run = xbt_dynar_new(sizeof(smx_process_t), NULL);
     simix_global->process_that_ran = xbt_dynar_new(sizeof(smx_process_t), NULL);
     simix_global->process_list = xbt_swag_new(xbt_swag_offset(proc, process_hookup));
@@ -247,12 +235,13 @@ void SIMIX_global_init(int *argc, char **argv)
     SIMIX_HOST_LEVEL = simgrid::s4u::Host::extension_create(SIMIX_host_destroy);
 
     simgrid::surf::storageCreatedCallbacks.connect([](simgrid::surf::Storage* storage) {
-      const char* id = storage->getName();
-        // TODO, create sg_storage_by_name
-        sg_storage_t s = xbt_lib_get_elm_or_null(storage_lib, id);
-        xbt_assert(s != NULL, "Storage not found for name %s", id);
-        SIMIX_storage_create_(s);
-      });
+      const char* name = storage->getName();
+      // TODO, create sg_storage_by_name
+      sg_storage_t s = xbt_lib_get_elm_or_null(storage_lib, name);
+      xbt_assert(s != NULL, "Storage not found for name %s", name);
+
+      SIMIX_storage_create(name, s, NULL);
+    });
 
     SIMIX_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, SIMIX_storage_destroy);
   }
@@ -276,9 +265,6 @@ int smx_cleaned = 0;
  */
 void SIMIX_clean(void)
 {
-#ifdef TIME_BENCH_PER_SR
-  smx_ctx_raw_new_sr();
-#endif
   if (smx_cleaned) return; // to avoid double cleaning by java and C
   smx_cleaned = 1;
   XBT_DEBUG("SIMIX_clean called. Simulation's over.");
@@ -323,15 +309,6 @@ void SIMIX_clean(void)
 
   surf_exit();
 
-#ifdef TIME_BENCH_AMDAHL
-  xbt_os_cputimer_stop(simix_global->timer_seq);
-  XBT_INFO("Amdahl timings. Sequential time: %f; Parallel time: %f",
-           xbt_os_timer_elapsed(simix_global->timer_seq),
-           xbt_os_timer_elapsed(simix_global->timer_par));
-  xbt_os_timer_free(simix_global->timer_seq);
-  xbt_os_timer_free(simix_global->timer_par);
-#endif
-
   xbt_mallocator_free(simix_global->synchro_mallocator);
   xbt_free(simix_global);
   simix_global = NULL;
@@ -389,23 +366,12 @@ void SIMIX_run(void)
   do {
     XBT_DEBUG("New Schedule Round; size(queue)=%lu",
         xbt_dynar_length(simix_global->process_to_run));
-#ifdef TIME_BENCH_PER_SR
-    smx_ctx_raw_new_sr();
-#endif
     while (!xbt_dynar_is_empty(simix_global->process_to_run)) {
       XBT_DEBUG("New Sub-Schedule Round; size(queue)=%lu",
               xbt_dynar_length(simix_global->process_to_run));
 
       /* Run all processes that are ready to run, possibly in parallel */
-#ifdef TIME_BENCH_AMDAHL
-      xbt_os_cputimer_stop(simix_global->timer_seq);
-      xbt_os_cputimer_resume(simix_global->timer_par);
-#endif
       SIMIX_process_runall();
-#ifdef TIME_BENCH_AMDAHL
-      xbt_os_cputimer_stop(simix_global->timer_par);
-      xbt_os_cputimer_resume(simix_global->timer_seq);
-#endif
 
       /* Move all killer processes to the end of the list, because killing a process that have an ongoing simcall is a bad idea */
       xbt_dynar_three_way_partition(simix_global->process_that_ran, process_syscall_color);
index fa5ffdd..0f1c7bf 100644 (file)
@@ -56,16 +56,6 @@ typedef struct s_smx_context_factory *smx_context_factory_t;
 
 SG_BEGIN_DECL()
 
-/* Define only for SimGrid benchmarking purposes */
-//#define TIME_BENCH_PER_SR     /* this aims at measuring the time spent in each scheduling round per each thread. The code is thus run in sequential to bench separately each SSR */
-//#define TIME_BENCH_AMDAHL     /* this aims at measuring the porting of time that could be parallelized at maximum (to get the optimal speedup by applying the amdahl law). */
-//#define ADAPTIVE_THRESHOLD    /* this is to enable the adaptive threshold algorithm in raw contexts*/
-//#define TIME_BENCH_ENTIRE_SRS /* more general benchmark than TIME_BENCH_PER_SR. It aims to measure the total time spent in a whole scheduling round (including synchro costs)*/
-
-#ifdef TIME_BENCH_PER_SR
-XBT_PRIVATE void smx_ctx_raw_new_sr(void);
-#endif
-
 /********************************** Simix Global ******************************/
 typedef struct s_smx_global {
   smx_context_factory_t context_factory;
@@ -81,11 +71,6 @@ typedef struct s_smx_global {
   void_pfn_smxprocess_t cleanup_process_function;
   xbt_mallocator_t synchro_mallocator;
 
-#ifdef TIME_BENCH_AMDAHL
-  xbt_os_timer_t timer_seq; /* used to bench the sequential and parallel parts of the simulation, if requested to */
-  xbt_os_timer_t timer_par;
-#endif
-
   xbt_os_mutex_t mutex;
 } s_smx_global_t, *smx_global_t;
 
index 1f6a856..a073a63 100644 (file)
@@ -543,8 +543,6 @@ void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute)
 
 void sg_platf_new_process(sg_platf_process_cbarg_t process)
 {
-  xbt_assert(simix_global,"Cannot create process without SIMIX.");
-
   sg_host_t host = sg_host_by_name(process->host);
   if (!host) {
     // The requested host does not exist. Do a nice message to the user
@@ -589,9 +587,9 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
   arg->name = xbt_strdup(arg->argv[0]);
   arg->kill_time = kill_time;
   arg->properties = current_property_set;
-  if (!sg_host_simix(host)->boot_processes) {
+  if (!sg_host_simix(host)->boot_processes)
     sg_host_simix(host)->boot_processes = xbt_dynar_new(sizeof(smx_process_arg_t), _SIMIX_host_free_process_arg);
-  }
+
   xbt_dynar_push_as(sg_host_simix(host)->boot_processes,smx_process_arg_t,arg);
 
   if (start_time > SIMIX_get_clock()) {
@@ -605,8 +603,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
     arg->kill_time = kill_time;
     arg->properties = current_property_set;
 
-    XBT_DEBUG("Process %s(%s) will be started at time %f", arg->name,
-           arg->hostname, start_time);
+    XBT_DEBUG("Process %s(%s) will be started at time %f", arg->name, arg->hostname, start_time);
     SIMIX_timer_set(start_time, [](void* arg) {
       SIMIX_process_create_from_wrapper((smx_process_arg_t) arg);
     }, arg);