exit(0);
} else if (!strncmp(argv[i], "--help-models", strlen("--help-models") + 1)) {
model_help("workstation", surf_workstation_model_description);
+ printf("\n");
model_help("CPU", surf_cpu_model_description);
+ printf("\n");
model_help("network", surf_network_model_description);
+ printf("\nLong description of all optimization levels accepted by the models of this simulator:\n");
+ for (i = 0; surf_optimization_mode_description[i].name; i++)
+ printf(" %s: %s\n", surf_optimization_mode_description[i].name, surf_optimization_mode_description[i].description);
+ printf("Both network and CPU models have 'Lazy' as default optimization level\n");
exit(0);
#ifdef HAVE_TRACING
} else if (!strncmp(argv[i], "--help-tracing", strlen("--help-tracing") + 1)) {
sg_weight_S_parameter = xbt_cfg_get_double(_surf_cfg_set, name);
}
-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);
-}
-
/* callback of the inclusion path */
static void _surf_cfg_cb__surf_path(const char *name, int pos)
{
}
} else if (!strcmp(val, "no")) {
if (COORD_HOST_LEVEL)
- XBT_WARN("Setting of whether to use coordinate cannot be disabled once set.");
+ xbt_die("Setting of whether to use coordinate cannot be disabled once set.");
} else {
- XBT_WARN("Command line setting of whether to use coordinates must be either \"yes\" or \"no\"");
+ xbt_die("Command line setting of whether to use coordinates must be either \"yes\" or \"no\"");
}
}
-static void _surf_cfg_cb__surf_network_fullduplex(const char *name,
+static void _surf_cfg_cb__surf_network_crosstraffic(const char *name,
int pos)
{
- sg_network_fullduplex = xbt_cfg_get_int(_surf_cfg_set, name);
+ sg_network_crosstraffic = xbt_cfg_get_int(_surf_cfg_set, name);
}
#ifdef HAVE_GTNETS
surf_workstation_model_description[i].name);
sprintf(p,
".\n (use 'help' as a value to see the long description of each model)");
- default_value = xbt_strdup("CLM03");
+ default_value = xbt_strdup("current_default");
xbt_cfg_register(&_surf_cfg_set,
"workstation/model", description, xbt_cfgelm_string,
&default_value, 1, 1,
"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",
+ xbt_cfg_register(&_surf_cfg_set, "network/TCP_gamma",
"Size of the biggest TCP window (cat /proc/sys/net/ipv4/tcp_[rw]mem for recv/send window; Use the last given value, which is the max window size)",
xbt_cfgelm_double, NULL, 1, 1,
_surf_cfg_cb__tcp_gamma, NULL);
- xbt_cfg_setdefault_double(_surf_cfg_set, "TCP_gamma", 20000.0);
+ xbt_cfg_setdefault_double(_surf_cfg_set, "network/TCP_gamma", 20000.0);
xbt_cfg_register(&_surf_cfg_set, "maxmin/precision",
- "Minimum retained action value when updating simulation",
+ "Numerical precision used when updating simulation models (epsilon in double comparisons)",
xbt_cfgelm_double, NULL, 1, 1, _surf_cfg_cb__maxmin_precision, NULL);
xbt_cfg_setdefault_double(_surf_cfg_set, "maxmin/precision", 0.00001); // FIXME use setdefault everywhere here!
_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_cfg_register(&_surf_cfg_set, "cpu/maxmin_selective_update",
+ "Update the constraint set propagating recursively to others constraints (1 by default when optim is set to lazy)",
xbt_cfgelm_int, &default_value_int, 0, 1,
- _surf_cfg_cb__surf_maxmin_selective_update, NULL);
+ NULL, NULL);
+ default_value_int = 0;
+ xbt_cfg_register(&_surf_cfg_set, "network/maxmin_selective_update",
+ "Update the constraint set propagating recursively to others constraints (1 by default when optim is set to lazy)",
+ xbt_cfgelm_int, &default_value_int, 0, 1,
+ NULL, NULL);
/* do model-check */
default_value_int = 0;
xbt_cfg_set_int(_surf_cfg_set, "model-check", default_value_int); */
/* do verbose-exit */
- default_value_int = 0;
+ default_value_int = 1;
xbt_cfg_register(&_surf_cfg_set, "verbose-exit",
"Activate the \"do nothing\" mode in Ctrl-C",
xbt_cfgelm_int, &default_value_int, 0, 1,
_surf_cfg_cb_contexts_parallel_mode, NULL);
default_value = xbt_strdup("no");
- xbt_cfg_register(&_surf_cfg_set, "coordinates",
- "\"yes\" or \"no\" (FIXME: document)",
+ xbt_cfg_register(&_surf_cfg_set, "network/coordinates",
+ "\"yes\" or \"no\", specifying whether we use a coordinate-based routing (as Vivaldi)",
xbt_cfgelm_string, &default_value, 1, 1,
_surf_cfg_cb__surf_network_coordinates, NULL);
- xbt_cfg_setdefault_string(_surf_cfg_set, "coordinates", default_value);
+ xbt_cfg_setdefault_string(_surf_cfg_set, "network/coordinates", default_value);
default_value_int = 0;
- xbt_cfg_register(&_surf_cfg_set, "fullduplex",
+ xbt_cfg_register(&_surf_cfg_set, "network/crosstraffic",
"Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)",
xbt_cfgelm_int, &default_value_int, 0, 1,
- _surf_cfg_cb__surf_network_fullduplex, NULL);
- xbt_cfg_setdefault_int(_surf_cfg_set, "fullduplex", default_value_int);
+ _surf_cfg_cb__surf_network_crosstraffic, NULL);
+ xbt_cfg_setdefault_int(_surf_cfg_set, "network/crosstraffic", default_value_int);
#ifdef HAVE_GTNETS
xbt_cfg_register(&_surf_cfg_set, "gtnets_jitter",