Keeping up with the new surf model description.

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

diff --git a/src/simix/smx_config.c b/src/simix/smx_config.c
index 569cea1..e6cc7be 100644 (file)
--- a/src/simix/smx_config.c
+++ b/src/simix/smx_config.c
@@ -15,8 +15,8 @@ int _simix_init_status = 0; /* 0: beginning of time;
                              2: inited (running) */
 xbt_cfg_t _simix_cfg_set = NULL;
 
-/* callback of the surf_workstation_model variable */
-static void _simix_cfg_cb__surf_workstation_model(const char *name, int pos) 
+/* callback of the workstation_model variable */
+static void _simix_cfg_cb__workstation_model(const char *name, int pos) 
 {
   char *val;
 
@@ -24,10 +24,37 @@ static void _simix_cfg_cb__surf_workstation_model(const char *name, int pos)
   
   val = xbt_cfg_get_string (_simix_cfg_set, name);
   /* New Module missing */
-  xbt_assert1(!strcmp(val, "CLM03") ||
-              !strcmp(val, "KCCFLN05") ||
-             !strcmp(val, "KCCFLN05_proportionnal"),
-              "Unknown workstation model: %s (either 'CLM03' or 'KCCFLN05'",val);
+  
+  find_resource_description(surf_workstation_resource_description,
+                           surf_workstation_resource_description_size,
+                           val);
+}
+
+/* callback of the cpu_model variable */
+static void _simix_cfg_cb__cpu_model(const char *name, int pos) 
+{
+  char *val;
+
+  xbt_assert0(_simix_init_status<2, "Cannot change the model after the initialization");
+  
+  val = xbt_cfg_get_string (_simix_cfg_set, name);
+  /* New Module missing */
+  find_resource_description(surf_cpu_resource_description,
+                           surf_cpu_resource_description_size,
+                           val);
+}
+/* callback of the workstation_model variable */
+static void _simix_cfg_cb__network_model(const char *name, int pos) 
+{
+  char *val;
+
+  xbt_assert0(_simix_init_status<2, "Cannot change the model after the initialization");
+  
+  val = xbt_cfg_get_string (_simix_cfg_set, name);
+  /* New Module missing */
+  find_resource_description(surf_network_resource_description,
+                           surf_network_resource_description_size,
+                           val);
 }
 
 /* create the config set and register what should be */
@@ -41,10 +68,17 @@ void simix_config_init(void)
   _simix_cfg_set = xbt_cfg_new();
   
   xbt_cfg_register (_simix_cfg_set, 
-                    "surf_workstation_model", xbt_cfgelm_string, 1,1,
-                    &_simix_cfg_cb__surf_workstation_model,NULL);
-                    
-  xbt_cfg_set_string(_simix_cfg_set,"surf_workstation_model", "KCCFLN05");
+                    "workstation_model", xbt_cfgelm_string, 1,1,
+                    &_simix_cfg_cb__workstation_model,NULL);
+
+  xbt_cfg_register (_simix_cfg_set, 
+                    "cpu_model", xbt_cfgelm_string, 1,1,
+                    &_simix_cfg_cb__cpu_model,NULL); 
+  xbt_cfg_register (_simix_cfg_set, 
+                    "network_model", xbt_cfgelm_string, 1,1,
+                    &_simix_cfg_cb__network_model,NULL);
+                   
+  xbt_cfg_set_string(_simix_cfg_set,"workstation_model", "KCCFLN05");
 }
 
 void simix_config_finalize(void) 
@@ -57,27 +91,23 @@ void simix_config_finalize(void)
   _simix_init_status = 0;
 }
 
-/** \brief set a configuration variable
+/** \brief Set a configuration variable
  * 
- * Currently existing configuation variable:
- *   - surf_workstation_model (string): Model of workstation to use.  
+ * FIXME
+
+ * Currently existing configuration variable:
+ *   - workstation_model (string): Model of workstation to use.  
  *     Possible values (defaults to "KCCFLN05"):
  *     - "CLM03": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + support for parallel tasks
  *     - "KCCFLN05": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + failure handling + interference between communications and computations if precised in the platform file.
- * 
- * Example:
- * MSG_config("surf_workstation_model","KCCFLN05");
+ *     - compound 
+ *     \param name Configuration variable name that will change.
+ *     \param pa A va_list with the others parameters
  */
-void SIMIX_config(const char *name, ...) 
+void SIMIX_config(const char *name, va_list pa) 
 {
-  va_list pa;
-    
   if (!_simix_init_status) {
     simix_config_init();
   }
-
-  va_start(pa,name);
   xbt_cfg_set_vargs(_simix_cfg_set,name,pa);
-  va_end(pa);
-
 }