modified atoi to strtol when getting route ends in all models

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

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index eed850b..6a02bec 100644 (file)
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -9,6 +9,7 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/xbt_os_time.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
                                "Logging specific to SIMIX (environment)");
@@ -32,6 +33,7 @@ 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;
@@ -95,13 +97,22 @@ 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);
 
-  /* Parse the platform file */
-  parse_platform_file(file);
+  if  (!parsed)  {
+    double s = xbt_os_time();  
+    parse_platform_file(file);
+    double e = xbt_os_time();
+    DEBUG1("PARSE TIME: %lg", (e-s));
+  }
 
   _simix_init_status = 2;      /* inited; don't change settings now */