find_model_description(surf_network_model_description, val);
}
-/* callback of the cpu_model variable */
-static void _surf_cfg_cb__tcp_gamma(const char *name, int pos)
-{
+/* callback of the tcp gamma variable */
+static void _surf_cfg_cb__tcp_gamma(const char *name, int pos) {
sg_tcp_gamma = xbt_cfg_get_double(_surf_cfg_set, name);
}
+static void _surf_cfg_cb__surf_path(const char *name, int pos) {
+ char *path = xbt_cfg_get_string_at(_surf_cfg_set, name,pos);
+ xbt_dynar_push(surf_path, &path);
+}
+
/* create the config set, register what should be and parse the command line*/
void surf_config_init(int *argc, char **argv) {
/* Create the configuration support */
- if (!_surf_cfg_set) { /* Only create stuff if not already inited */
- _surf_cfg_set = xbt_cfg_new();
+ if (_surf_init_status==0) { /* Only create stuff if not already inited */
_surf_init_status = 1;
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);
-
- xbt_cfg_register(_surf_cfg_set,
- "workstation_model", xbt_strdup(description), xbt_cfgelm_string, 1, 1,
+ 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: ");
while (*(++p) != '\0');
for (i=0;surf_cpu_model_description[i].name;i++)
p+=sprintf(p,"%s%s",(i==0?"":", "),surf_cpu_model_description[i].name);
- xbt_cfg_register(_surf_cfg_set,
- "cpu_model", xbt_strdup(description), xbt_cfgelm_string, 1, 1,
+ default_value = xbt_strdup("Cas01");
+ xbt_cfg_register(&_surf_cfg_set,
+ "cpu_model", description, xbt_cfgelm_string, &default_value, 1, 1,
&_surf_cfg_cb__cpu_model, NULL);
sprintf(description,"The model to use for the network. Possible values: ");
while (*(++p) != '\0');
for (i=0;surf_network_model_description[i].name;i++)
p+=sprintf(p,"%s%s",(i==0?"":", "),surf_network_model_description[i].name);
- xbt_cfg_register(_surf_cfg_set,
- "network_model", description, xbt_cfgelm_string, 1, 1,
+ default_value = xbt_strdup("CM02");
+ xbt_cfg_register(&_surf_cfg_set,
+ "network_model", description, xbt_cfgelm_string, &default_value, 1, 1,
&_surf_cfg_cb__network_model, NULL);
-
- xbt_cfg_set_string(_surf_cfg_set, "workstation_model", "CLM03");
- xbt_cfg_set_string(_surf_cfg_set, "cpu_model", "Cas01");
- xbt_cfg_set_string(_surf_cfg_set, "network_model", "CM02");
-
- xbt_cfg_register(_surf_cfg_set,"TCP_gamma","Size of the biggest TCP window",1,1,
- xbt_cfgelm_double,_surf_cfg_cb__tcp_gamma,NULL);
- xbt_cfg_set_double(_surf_cfg_set, "TCP_gamma", 20000.0);
+ xbt_free(description);
+
+ 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);
+ xbt_cfg_set_double(_surf_cfg_set,"TCP_gamma",20000.0);
+
+ xbt_cfg_register(&_surf_cfg_set,"path","Lookup path for inclusions in platform and deployment XML files",
+ xbt_cfgelm_string, NULL,0,0,_surf_cfg_cb__surf_path,NULL);
+ if (!surf_path) {
+ /* retrieves the current directory of the current process */
+ const char *initial_path = __surf_get_initial_path();
+ xbt_assert0((initial_path),
+ "__surf_get_initial_path() failed! Can't resolves current Windows directory");
+
+ surf_path = xbt_dynar_new(sizeof(char *), NULL);
+ xbt_cfg_set_string(_surf_cfg_set,"path", initial_path);
+ }
surf_config_cmd_line(argc,argv);
}
