Call surf_timer_model_init() from surf_config_models_setup() so that upper layer...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6516 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index c2817fc..c7de5e0 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -156,7 +156,6 @@ void SD_create_environment(const char *platform_file)
 
   DEBUG0("SD_create_environment");
 
-  surf_timer_model_init(platform_file);
   surf_config_models_setup(platform_file);
 
   parse_platform_file(platform_file);

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index a0b803b..5a40557 100644 (file)
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -40,7 +40,6 @@ void SIMIX_create_environment(const char *file)
 
   double start, end;
 
-  surf_timer_model_init(file);
   surf_config_models_setup(file);
   parse_platform_file(file);
   surf_config_models_create_elms();
@@ -53,6 +52,4 @@ void SIMIX_create_environment(const char *file)
                    name, workstation) {
     __SIMIX_host_create(name, workstation, NULL);
   }
-
-  return;
 }

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 7533ba2..9e60272 100644 (file)
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -209,6 +209,8 @@ void surf_config_models_setup(const char *platform_file)
   char *workstation_model_name;
   int workstation_id = -1;
 
+  surf_timer_model_init(file);
+
   workstation_model_name =
     xbt_cfg_get_string(_surf_cfg_set, "workstation_model");