Add convenient debug function on conditions and use it in simix.

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

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 321e84d..953e021 100644 (file)
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -33,7 +33,6 @@ 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;
@@ -51,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;
@@ -88,35 +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);
 
-    start = xbt_os_time();  
-    parse_platform_file(file);
-    end = xbt_os_time();
-    DEBUG1("PARSE TIME: %lg", (end-start));
-    parsed = 1;        
-  }
 
+  } 
   surf_workstation_model_description[workstation_id].
-      model_init(file);
-
-  if  (!parsed)  {
-        double e ;
-    double s = 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();
-    e = xbt_os_time();
-    DEBUG1("PARSE TIME: %lg", (e-s));
-  }
+    model_init(file);
+
+  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 */