Ansi C declaration of the variables (at the beginning of the blocks)

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

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index fe57ebf..eb7782f 100644 (file)
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -9,6 +9,8 @@
 #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)");
 
@@ -29,30 +31,92 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
  *     \include small_platform.xml
  *
  */
-void SIMIX_create_environment(const char *file) 
+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_resource_init(file);
+  simix_config_init();         /* make sure that our configuration set is created */
+  surf_timer_model_init(file);
 
   /* which model do you want today? */
-  workstation_model_name = xbt_cfg_get_string (_simix_cfg_set, "surf_workstation_model");
+  workstation_model_name =
+      xbt_cfg_get_string(_simix_cfg_set, "workstation_model");
 
   DEBUG1("Model : %s", workstation_model_name);
-  if (!strcmp(workstation_model_name,"KCCFLN05")) {
-    surf_workstation_resource_init_KCCFLN05(file);
-  } else if (!strcmp(workstation_model_name,"KCCFLN05_proportionnal")) {
-    surf_workstation_resource_init_KCCFLN05_proportionnal(file);
-  } else if (!strcmp(workstation_model_name,"CLM03")) {
-    surf_workstation_resource_init_CLM03(file);
-  } else {
-    xbt_assert0(0,"The impossible happened (once again)");
+  workstation_id =
+      find_model_description(surf_workstation_model_description,
+                               surf_workstation_model_description_size,
+                               workstation_model_name);
+  if (!strcmp(workstation_model_name, "compound")) {
+    xbt_ex_t e;
+    char *network_model_name = NULL;
+    char *cpu_model_name = NULL;
+    int network_id = -1;
+    int cpu_id = -1;
+
+    TRY {
+      cpu_model_name = xbt_cfg_get_string(_simix_cfg_set, "cpu_model");
+    } CATCH(e) {
+      if (e.category == bound_error) {
+       xbt_assert0(0,
+                   "Set a cpu model to use with the 'compound' workstation model");
+       xbt_ex_free(e);
+      } else {
+       RETHROW;
+      }
+    }
+
+    TRY {
+      network_model_name =
+         xbt_cfg_get_string(_simix_cfg_set, "network_model");
+    }
+    CATCH(e) {
+      if (e.category == bound_error) {
+       xbt_assert0(0,
+                   "Set a network model to use with the 'compound' workstation model");
+       xbt_ex_free(e);
+      } else {
+       RETHROW;
+      }
+    }
+
+    network_id =
+       find_model_description(surf_network_model_description,
+                                 surf_network_model_description_size,
+                                 network_model_name);
+    cpu_id =
+       find_model_description(surf_cpu_model_description,
+                                 surf_cpu_model_description_size,
+                                 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;        
   }
-  _simix_init_status = 2; /* inited; don't change settings now */
+
+  surf_workstation_model_description[workstation_id].
+      model_init(file);
+
+  if  (!parsed)  {
+        double e ;
+    double s = xbt_os_time();  
+    parse_platform_file(file);
+    e = xbt_os_time();
+    DEBUG1("PARSE TIME: %lg", (e-s));
+  }
+
+  _simix_init_status = 2;      /* inited; don't change settings now */
 
   xbt_dict_foreach(workstation_set, cursor, name, workstation) {
     __SIMIX_host_create(name, workstation, NULL);
@@ -60,4 +124,3 @@ void SIMIX_create_environment(const char *file)
 
   return;
 }
-