Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / simix / smx_global.cpp

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index e7759b9..856ccc8 100644 (file)
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -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 {
@@ -190,7 +183,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 +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));
@@ -245,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);
   }
@@ -258,15 +249,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);
 }
@@ -280,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.");
@@ -327,15 +309,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 +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);