X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/260f5b9677866b61cd6ada7c6516faefcfcd1989..5106c655985729664acca18774531958c9820076:/src/simix/smx_global.cpp

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index e7759b98f9..6192bde8fd 100644
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -190,7 +190,9 @@ void SIMIX_set_maestro(void (*code)(void*), void* data)
 void SIMIX_global_init(int *argc, char **argv)
 {
 #if HAVE_MC
-  _sg_do_model_check = getenv(MC_ENV_VARIABLE) != NULL;
+  // The communication initialization is done ASAP.
+  // We need to communicate  initialization of the different layers to the model-checker.
+  simgrid::mc::Client::initialize();
 #endif
 
   s_smx_process_t proc;
@@ -198,11 +200,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));
@@ -258,15 +255,9 @@ void SIMIX_global_init(int *argc, char **argv)
     simix_timers = xbt_heap_new(8, &free);
   }
 
-  if (xbt_cfg_get_boolean("clean_atexit"))
+  if (xbt_cfg_get_boolean("clean-atexit"))
     atexit(SIMIX_clean);
 
-#if HAVE_MC
-  // The communication initialization is done ASAP.
-  // We need to communicate  initialization of the different layers to the model-checker.
-  simgrid::mc::Client::initialize();
-#endif
-
   if (_sg_cfg_exit_asap)
     exit(0);
 }
@@ -327,15 +318,6 @@ void SIMIX_clean(void)
 
   surf_exit();
 
-#ifdef TIME_BENCH_AMDAHL
-  xbt_os_cputimer_stop(simix_global->timer_seq);
-  XBT_INFO("Amdahl timing informations. 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;
@@ -393,23 +375,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);