Add a command-line option to choose the routing schema to use

[simgrid.git] / src / surf / surf_config.c

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 4f6524e..7533ba2 100644 (file)
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -122,18 +122,6 @@ void surf_config_init(int *argc, char **argv)
     char *description = xbt_malloc(1024), *p = description;
     char *default_value;
     int i;
-    sprintf(description,
-            "The model to use for the workstation. Possible values: ");
-    while (*(++p) != '\0');
-    for (i = 0; surf_workstation_model_description[i].name; i++)
-      p +=
-        sprintf(p, "%s%s", (i == 0 ? "" : ", "),
-                surf_workstation_model_description[i].name);
-    default_value = xbt_strdup("CLM03");
-    xbt_cfg_register(&_surf_cfg_set,
-                     "workstation_model", description, xbt_cfgelm_string,
-                     &default_value, 1, 1, &_surf_cfg_cb__workstation_model,
-                     NULL);
 
     sprintf(description, "The model to use for the CPU. Possible values: ");
     p = description;
@@ -160,8 +148,29 @@ void surf_config_init(int *argc, char **argv)
                      "network_model", description, xbt_cfgelm_string,
                      &default_value, 1, 1, &_surf_cfg_cb__network_model,
                      NULL);
+
+    sprintf(description,
+            "The model to use for the workstation. Possible values: ");
+    p = description;
+    while (*(++p) != '\0');
+    for (i = 0; surf_workstation_model_description[i].name; i++)
+      p +=
+        sprintf(p, "%s%s", (i == 0 ? "" : ", "),
+                surf_workstation_model_description[i].name);
+    default_value = xbt_strdup("CLM03");
+    xbt_cfg_register(&_surf_cfg_set,
+                     "workstation_model", description, xbt_cfgelm_string,
+                     &default_value, 1, 1, &_surf_cfg_cb__workstation_model,
+                     NULL);
+
     xbt_free(description);
 
+    default_value = xbt_strdup("Full");
+    xbt_cfg_register(&_surf_cfg_set, "routing",
+                     "Model to use to store the routing information",
+                     xbt_cfgelm_string, &default_value, 0, 0, NULL,
+                     NULL);
+
     xbt_cfg_register(&_surf_cfg_set, "TCP_gamma",
                      "Size of the biggest TCP window", xbt_cfgelm_double,
                      NULL, 1, 1, _surf_cfg_cb__tcp_gamma, NULL);
@@ -181,6 +190,7 @@ void surf_config_init(int *argc, char **argv)
       xbt_cfg_set_string(_surf_cfg_set, "path", initial_path);
     }
 
+
     surf_config_cmd_line(argc, argv);
   }
 }
@@ -244,12 +254,13 @@ void surf_config_models_setup(const char *platform_file)
     cpu_id =
       find_model_description(surf_cpu_model_description, cpu_model_name);
 
-    surf_cpu_model_description[cpu_id].model_init(platform_file);
-    surf_network_model_description[network_id].model_init(platform_file);
+    surf_cpu_model_description[cpu_id].model_init_preparse(platform_file);
+    surf_network_model_description[network_id].
+      model_init_preparse(platform_file);
   }
 
   DEBUG0("Call workstation_model_init");
-  surf_workstation_model_description[workstation_id].model_init
+  surf_workstation_model_description[workstation_id].model_init_preparse
     (platform_file);
 }
 
@@ -260,6 +271,7 @@ void surf_config_models_create_elms(void)
   int workstation_id =
     find_model_description(surf_workstation_model_description,
                            workstation_model_name);
-  if (surf_workstation_model_description[workstation_id].create_ws != NULL)
-    surf_workstation_model_description[workstation_id].create_ws();
+  if (surf_workstation_model_description[workstation_id].
+      model_init_postparse != NULL)
+    surf_workstation_model_description[workstation_id].model_init_postparse();
 }