"About the configuration of surf (and the rest of the simulation)");
xbt_cfg_t _surf_cfg_set = NULL;
-
+#ifdef HAVE_GTNETS
+extern double sg_gtnets_jitter;
+#endif
/* Parse the command line, looking for options */
static void surf_config_cmd_line(int *argc, char **argv)
xbt_dynar_push(surf_path, &path);
}
+static void _surf_cfg_cb__surf_maxmin_selective_update(const char *name, int pos)
+{
+ sg_maxmin_selective_update = xbt_cfg_get_int(_surf_cfg_set, name);
+}
+#ifdef HAVE_GTNETS
+static void _surf_cfg_cb__gtnets_jitter(const char *name, int pos){
+ sg_gtnets_jitter = xbt_cfg_get_double(_surf_cfg_set, name);
+}
+#endif
/* create the config set, register what should be and parse the command line*/
void surf_config_init(int *argc, char **argv)
char *description = xbt_malloc(1024), *p = description;
char *default_value;
+ int default_value_int;
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;
p +=
sprintf(p, "%s%s", (i == 0 ? "" : ", "),
surf_network_model_description[i].name);
- default_value = xbt_strdup("CM02");
+ default_value = xbt_strdup("LV08");
xbt_cfg_register(&_surf_cfg_set,
"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, 1, 1, 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);
"Lookup path for inclusions in platform and deployment XML files",
xbt_cfgelm_string, NULL, 0, 0, _surf_cfg_cb__surf_path,
NULL);
+
+ default_value_int = 0;
+ xbt_cfg_register(&_surf_cfg_set, "maxmin_selective_update",
+ "Update the constraint set propagating recursively to others constraints",
+ xbt_cfgelm_int, &default_value_int, 0, 1, _surf_cfg_cb__surf_maxmin_selective_update, NULL);
+
+#ifdef HAVE_GTNETS
+ xbt_cfg_register(&_surf_cfg_set, "gtnets_jitter",
+ "Double value to oscillate the link latency, uniformly in random interval [-latency*gtnets_jitter,latency*gtnets_jitter)", xbt_cfgelm_double,
+ NULL, 1, 1, _surf_cfg_cb__gtnets_jitter, NULL);
+ xbt_cfg_set_double(_surf_cfg_set, "gtnets_jitter", 1.0);
+#endif
+
if (!surf_path) {
/* retrieves the current directory of the current process */
const char *initial_path = __surf_get_initial_path();
xbt_cfg_set_string(_surf_cfg_set, "path", initial_path);
}
+
surf_config_cmd_line(argc, argv);
}
}
char *workstation_model_name;
int workstation_id = -1;
+ surf_timer_model_init(platform_file);
+
workstation_model_name =
xbt_cfg_get_string(_surf_cfg_set, "workstation_model");
+ char *network_model_name = xbt_cfg_get_string(_surf_cfg_set, "network_model");
+ char *cpu_model_name = xbt_cfg_get_string(_surf_cfg_set, "cpu_model");
+
+ if ((strcmp(network_model_name,"LV08") || strcmp(cpu_model_name,"Cas01"))
+ && !strcmp(workstation_model_name, "CLM03")){
+ const char *val = "compound";
+ INFO0("Switching workstation model to compound since you changed the network and/or cpu model(s)");
+ xbt_cfg_set_string(_surf_cfg_set,"workstation_model",val);
+ workstation_model_name = (char*)"compound";
+ }
- DEBUG1("Model : %s", workstation_model_name);
+ DEBUG1("Workstation model: %s", workstation_model_name);
workstation_id =
find_model_description(surf_workstation_model_description,
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(_surf_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;
- }
- }
+ xbt_assert0(cpu_model_name,
+ "Set a cpu model to use with the 'compound' workstation model");
- TRY {
- network_model_name = xbt_cfg_get_string(_surf_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;
- }
- }
+ xbt_assert0(network_model_name,
+ "Set a network model to use with the 'compound' workstation model");
network_id =
find_model_description(surf_network_model_description,
