From e3e4e9d98d222c213ba9d82efd048e0fddb4ad80 Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 16 Jul 2009 18:51:17 +0000
Subject: [PATCH] Call surf_timer_model_init() from surf_config_models_setup()
 so that upper layer don't have to do it manually

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6516 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 src/simdag/sd_global.c      | 1 -
 src/simix/smx_environment.c | 3 ---
 src/surf/surf_config.c      | 2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index c2817fceef..c7de5e04ae 100644
--- 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 a0b803b209..5a40557caa 100644
--- 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 7533ba294f..9e60272189 100644
--- 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");
 
-- 
2.20.1