X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e049faf8cdd41c59c2e97f8c46fd6052b23b8a3..305fbc7b720f845588b22de910245576971a5f97:/src/simix/smx_environment.c

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 6a02bec412..953e02161b 100644
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -33,12 +33,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
  */
 void SIMIX_create_environment(const char *file)
 {
-  int parsed = 0;
   xbt_dict_cursor_t cursor = NULL;
   char *name = NULL;
   void *workstation = NULL;
   char *workstation_model_name;
   int workstation_id = -1;
+  double start, end;
 
   simix_config_init();		/* make sure that our configuration set is created */
   surf_timer_model_init(file);
@@ -50,8 +50,7 @@ void SIMIX_create_environment(const char *file)
   DEBUG1("Model : %s", workstation_model_name);
   workstation_id =
       find_model_description(surf_workstation_model_description,
-				surf_workstation_model_description_size,
-				workstation_model_name);
+			     workstation_model_name);
   if (!strcmp(workstation_model_name, "compound")) {
     xbt_ex_t e;
     char *network_model_name = NULL;
@@ -87,32 +86,26 @@ void SIMIX_create_environment(const char *file)
 
     network_id =
 	find_model_description(surf_network_model_description,
-				  surf_network_model_description_size,
-				  network_model_name);
+			       network_model_name);
     cpu_id =
 	find_model_description(surf_cpu_model_description,
-				  surf_cpu_model_description_size,
-				  cpu_model_name);
+			       cpu_model_name);
 
     surf_cpu_model_description[cpu_id].model_init(file);
     surf_network_model_description[network_id].model_init(file);
 
-    double start = xbt_os_time();  
-    parse_platform_file(file);
-    double end = xbt_os_time();
-    DEBUG1("PARSE TIME: %lg", (end-start));
-    parsed = 1;	
-  }
 
+  } 
   surf_workstation_model_description[workstation_id].
-      model_init(file);
+    model_init(file);
 
-  if  (!parsed)  {
-    double s = xbt_os_time();  
-    parse_platform_file(file);
-    double e = xbt_os_time();
-    DEBUG1("PARSE TIME: %lg", (e-s));
-  }
+  start = xbt_os_time();
+  parse_platform_file(file);
+
+  if (surf_workstation_model_description[workstation_id].create_ws != NULL)
+    surf_workstation_model_description[workstation_id].create_ws();
+  end = xbt_os_time();
+  DEBUG1("PARSE TIME: %lg", (end-start));
 
   _simix_init_status = 2;	/* inited; don't change settings now */