X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9bd4d55089fbbd3a06ca5fe9741d19a639bff4da..b068fb07209cff63d16db86b8c5f90067b67a194:/src/simix/smx_config.c

diff --git a/src/simix/smx_config.c b/src/simix/smx_config.c
index aab10e1b8d..6043e65538 100644
--- a/src/simix/smx_config.c
+++ b/src/simix/smx_config.c
@@ -26,11 +26,41 @@ static void _simix_cfg_cb__workstation_model(const char *name, int pos)
   /* New Module missing */
   xbt_assert1(!strcmp(val, "CLM03") ||
               !strcmp(val, "KCCFLN05") ||
-	      !strcmp(val, "KCCFLN05_proportional") ||
-	      !strcmp(val, "KCCFLN05_Vegas") ||
-	      !strcmp(val, "KCCFLN05_Reno") ||
-              !strcmp(val, "GTNETS"),
-              "Unknown workstation model: %s (choices are: 'CLM03', 'KCCFLN05', 'KCCFLN05_proportional', 'KCCFLN05_Vegas', 'KCCFLN05_Reno' and 'GTNETS'",val);
+	      !strcmp(val, "SDP") ||
+	      !strcmp(val, "Vegas") ||
+	      !strcmp(val, "Reno") ||
+	      !strcmp(val, "GTNets") ||
+	      !strcmp(val, "compound"),
+              "Unknown workstation model: %s (choices are: 'CLM03', 'KCCFLN05', 'SDP', 'Vegas', 'Reno', 'GTNets' and 'Compound'",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 */
+  xbt_assert1(!strcmp(val, "Cas01"),
+              "Unknown CPU model: %s (choices are: 'Cas01'",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 */
+  xbt_assert1(!strcmp(val, "CM02") ||
+              !strcmp(val, "GTNets") ||
+	      !strcmp(val, "SDP") ||
+	      !strcmp(val, "Vegas") ||
+	      !strcmp(val, "Reno"),
+              "Unknown workstation model: %s (choices are: 'CM02', 'GTNets', 'SDP', 'Vegas' and 'Reno'",val);
 }
 
 /* create the config set and register what should be */
@@ -46,7 +76,14 @@ void simix_config_init(void)
   xbt_cfg_register (_simix_cfg_set, 
                     "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");
 }