Make GTNETS compatible with new parsing and variable name convention.

[simgrid.git] / src / simix / smx_environment.c

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 0973135..1198f5a 100644 (file)
--- 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);
@@ -97,22 +97,18 @@ void SIMIX_create_environment(const char *file)
     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);
+
+  start = xbt_os_time();
+  parse_platform_file(file);
 
-  double s = xbt_os_time();  
-  if  (!parsed) parse_platform_file(file);
-  double e = xbt_os_time();
-  DEBUG1("PARSE TIME: %lg", (e-s));
+  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 */