X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eca91eda2136d8994ffb75dae1282bb790716fa8..02305db551e2a0804a3fd7b24622be6b12285572:/src/msg/environment.c

diff --git a/src/msg/environment.c b/src/msg/environment.c
index 312ce57586..9d6bbd8c37 100644
--- a/src/msg/environment.c
+++ b/src/msg/environment.c
@@ -60,12 +60,22 @@ void MSG_create_environment(const char *file) {
   xbt_dict_cursor_t cursor = NULL;
   char *name = NULL;
   void *workstation = NULL;
+  char *workstation_model_name;
 
-#ifdef ALVIN_SURF_SPECIAL
-  surf_workstation_resource_init_KCCFLN05(file);
-#else
-  surf_workstation_resource_init_CLM03(file);
-#endif
+  msg_config_init(); /* make sure that our configuration set is created */
+  surf_timer_resource_init(file);
+
+  /* which model do you want today? */
+  xbt_cfg_get_string (_msg_cfg_set, "surf_workstation_model",
+		      &workstation_model_name);
+  if (!strcmp(workstation_model_name,"KCCFLN05")) {
+    surf_workstation_resource_init_KCCFLN05(file);
+  } else if (!strcmp(workstation_model_name,"CLM03")) {
+    surf_workstation_resource_init_CLM03(file);
+  } else {
+    xbt_assert0(0,"The impossible happened (once again)");
+  }
+  _msg_init_status = 2; /* inited; don't change settings now */
 
   xbt_dict_foreach(workstation_set, cursor, name, workstation) {
     __MSG_host_create(name, workstation, NULL);