Keeping up with the new surf model description.

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

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 0de1fbf..db9c81b 100644 (file)
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -11,19 +11,10 @@
 #include "xbt/log.h"
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
                                "Logging specific to SIMIX (environment)");
-/** \defgroup msg_easier_life      Platform and Application management
- *  \brief This section describes functions to manage the platform creation
- *  and the application deployment. You should also have a look at 
- *  \ref MSG_examples  to have an overview of their usage.
- *    \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Platforms and Applications" --> \endhtmlonly
- * 
- */
 
 /********************************* SIMIX **************************************/
 
-
-
-/** \ingroup msg_easier_life
+/** 
  * \brief A platform constructor.
  *
  * Creates a new platform, including hosts, links and the
@@ -37,7 +28,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
  *
  *     \include small_platform.xml
  *
- * Have a look in the directory examples/msg/ to have a big example.
  */
 void SIMIX_create_environment(const char *file) 
 {
@@ -45,23 +35,60 @@ void SIMIX_create_environment(const char *file)
   char *name = NULL;
   void *workstation = NULL;
   char *workstation_model_name;
+  int workstation_id = -1;
 
   simix_config_init(); /* make sure that our configuration set is created */
   surf_timer_resource_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_resource_description(surf_workstation_resource_description,
+                                            surf_workstation_resource_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_resource_description(surf_network_resource_description,
+                                          surf_network_resource_description_size,
+                                          network_model_name);
+    cpu_id = find_resource_description(surf_cpu_resource_description,
+                                      surf_cpu_resource_description_size,
+                                      cpu_model_name);
+
+    surf_cpu_resource_description[cpu_id].resource_init(file);
+    surf_network_resource_description[network_id].resource_init(file);
   }
+
+  surf_workstation_resource_description[workstation_id].resource_init(file);
+
   _simix_init_status = 2; /* inited; don't change settings now */
 
   xbt_dict_foreach(workstation_set, cursor, name, workstation) {