#include "xbt/config.h"
#include "xbt/str.h"
#include "surf/surf_private.h"
+#include "surf/surf_routing.h" /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */
#include "simix/context.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
opt++;
xbt_cfg_set_parse(_surf_cfg_set, opt);
- DEBUG1("Did apply '%s' as config setting", opt);
+ XBT_DEBUG("Did apply '%s' as config setting", opt);
remove_it = 1;
} else if (!strncmp(argv[i], "--cfg-help", strlen("--cfg-help") + 1) ||
!strncmp(argv[i], "--help", strlen("--help") + 1)) {
{
char *val;
- xbt_assert0(_surf_init_status < 2,
+ xbt_assert(_surf_init_status < 2,
"Cannot change the model after the initialization");
val = xbt_cfg_get_string(_surf_cfg_set, name);
{
char *val;
- xbt_assert0(_surf_init_status < 2,
+ xbt_assert(_surf_init_status < 2,
"Cannot change the model after the initialization");
val = xbt_cfg_get_string(_surf_cfg_set, name);
{
char *val;
- xbt_assert0(_surf_init_status < 2,
+ xbt_assert(_surf_init_status < 2,
"Cannot change the model after the initialization");
val = xbt_cfg_get_string(_surf_cfg_set, name);
static void _surf_cfg_cb_model_check(const char *name, int pos)
{
- _surf_do_model_check = 1;
- /* Tell modules using mallocators that they shouldn't. MC don't like them */
- xbt_fifo_preinit();
- xbt_dict_preinit();
+ _surf_do_model_check = xbt_cfg_get_int(_surf_cfg_set, name);
+
+ if (_surf_do_model_check) {
+ /* Tell modules using mallocators that they shouldn't. MC don't like them */
+ xbt_fifo_preinit();
+ xbt_dict_preinit();
+ }
+}
+
+extern int _surf_do_verbose_exit;
+
+static void _surf_cfg_cb_verbose_exit(const char *name, int pos)
+{
+ _surf_do_verbose_exit = xbt_cfg_get_int(_surf_cfg_set, name);
}
+
static void _surf_cfg_cb_context_factory(const char *name, int pos)
{
smx_context_factory_name = xbt_cfg_get_string(_surf_cfg_set, name);
SIMIX_context_set_parallel_threshold(xbt_cfg_get_int(_surf_cfg_set, name));
}
+static void _surf_cfg_cb__surf_network_coordinates(const char *name,
+ int pos)
+{
+ char *val = xbt_cfg_get_string(_surf_cfg_set, name);
+ if (!strcmp(val, "yes")) {
+ if (!COORD_HOST_LEVEL) {
+ COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp);
+ COORD_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp);
+ }
+ } else if (!strcmp(val, "no")) {
+ if (COORD_HOST_LEVEL)
+ XBT_WARN("Cannot disable CMD prop coordinates, once set.");
+ } else {
+ XBT_WARN("Setting CMD prop coordinates must be \"yes\" or \"no\"");
+ }
+}
+
static void _surf_cfg_cb__surf_network_fullduplex(const char *name,
int pos)
{
"Activate the model-checking of the \"simulated\" system (EXPERIMENTAL -- msg only for now)",
xbt_cfgelm_int, &default_value_int, 0, 1,
_surf_cfg_cb_model_check, NULL);
+
/*
FIXME: this function is not setting model-check to it's default value because
internally it calls to variable->cb_set that in this case is the function
- _surf_cfg_cb_model_check which sets it's value to 1 (instead of the defalut value 0)
+ _surf_cfg_cb_model_check which sets it's value to 1 (instead of the default value 0)
xbt_cfg_set_int(_surf_cfg_set, "model-check", default_value_int); */
+ /* do verbose-exit */
+ default_value_int = 0;
+ 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_verbose_exit, NULL);
+
+
/* context factory */
default_value = xbt_strdup("ucontext");
xbt_cfg_register(&_surf_cfg_set, "contexts/factory",
/* minimal number of user contexts to be run in parallel */
default_value_int = 1;
xbt_cfg_register(&_surf_cfg_set, "contexts/parallel_threshold",
- "Minimal number of user contexts to be run in parallel",
+ "Minimal number of user contexts to be run in parallel (raw contexts only)",
xbt_cfgelm_int, &default_value_int, 1, 1,
_surf_cfg_cb_contexts_parallel_threshold, NULL);
+ default_value = xbt_strdup("no");
+ xbt_cfg_register(&_surf_cfg_set, "coordinates",
+ "\"yes\" or \"no\" (FIXME: document)",
+ xbt_cfgelm_string, &default_value, 1, 1,
+ _surf_cfg_cb__surf_network_coordinates, NULL);
+ xbt_cfg_setdefault_string(_surf_cfg_set, "coordinates", default_value);
+
default_value_int = 0;
xbt_cfg_register(&_surf_cfg_set, "fullduplex",
- "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM03)",
+ "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);
xbt_cfgelm_int, &default_value_int, 0, 1,
_surf_cfg_cb__gtnets_jitter_seed, NULL);
#endif
-
+#ifdef HAVE_NS3
+ xbt_cfg_register(&_surf_cfg_set, "ns3/TcpModel",
+ "The ns3 tcp model can be : NewReno or Reno or Tahoe",
+ xbt_cfgelm_string, NULL, 1, 1,
+ NULL, NULL);
+ xbt_cfg_setdefault_string(_surf_cfg_set, "ns3/TcpModel", "default");
+#endif
if (!surf_path) {
/* retrieves the current directory of the current process */
const char *initial_path = __surf_get_initial_path();
- xbt_assert0((initial_path),
+ xbt_assert((initial_path),
"__surf_get_initial_path() failed! Can't resolves current Windows directory");
surf_path = xbt_dynar_new(sizeof(char *), NULL);
surf_config_cmd_line(argc, argv);
} else {
- WARN0("Call to surf_config_init() after initialization ignored");
+ XBT_WARN("Call to surf_config_init() after initialization ignored");
}
}
* we should switch to the "compound" workstation model to correctly dispatch stuff to
* the right net/cpu models.
*/
- 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";
+
+ if((!xbt_cfg_is_default_value(_surf_cfg_set, "network/model") ||
+ !xbt_cfg_is_default_value(_surf_cfg_set, "cpu/model")) &&
+ xbt_cfg_is_default_value(_surf_cfg_set, "workstation/model"))
+ {
+ const char *val = "compound";
+ XBT_INFO
+ ("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("Workstation model: %s", workstation_model_name);
+ XBT_DEBUG("Workstation model: %s", workstation_model_name);
workstation_id =
find_model_description(surf_workstation_model_description,
workstation_model_name);
int network_id = -1;
int cpu_id = -1;
- xbt_assert0(cpu_model_name,
+ xbt_assert(cpu_model_name,
"Set a cpu model to use with the 'compound' workstation model");
- xbt_assert0(network_model_name,
+ xbt_assert(network_model_name,
"Set a network model to use with the 'compound' workstation model");
network_id =
(platform_file);
}
- DEBUG0("Call workstation_model_init");
+ XBT_DEBUG("Call workstation_model_init");
surf_workstation_model_description[workstation_id].model_init_preparse
(platform_file);
}
