#include "xbt/config.h"
#include "xbt/str.h"
#include "surf/surf_private.h"
+#include "simix/context.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
"About the configuration of surf (and the rest of the simulation)");
xbt_cfg_t _surf_cfg_set = NULL;
-
/* Parse the command line, looking for options */
static void surf_config_cmd_line(int *argc, char **argv)
{
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)) {
sg_maxmin_precision = xbt_cfg_get_double(_surf_cfg_set, name);
}
+static void _surf_cfg_cb__sender_gap(const char* name, int pos)
+{
+ sg_sender_gap = xbt_cfg_get_double(_surf_cfg_set, name);
+}
+
static void _surf_cfg_cb__latency_factor(const char *name, int pos)
{
sg_latency_factor = xbt_cfg_get_double(_surf_cfg_set, name);
/* callback to decide if we want to use the model-checking */
#include "xbt_modinter.h"
-int _surf_do_model_check = 0; /* this variable is used accros the lib */
+extern int _surf_do_model_check; /* this variable lives in xbt_main until I find a right location for it */
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();
+ }
}
-int _surf_parallel_contexts = 0;
+static void _surf_cfg_cb_context_factory(const char *name, int pos)
+{
+ smx_context_factory_name = xbt_cfg_get_string(_surf_cfg_set, name);
+}
+
+static void _surf_cfg_cb_context_stack_size(const char *name, int pos)
+{
+ smx_context_stack_size = xbt_cfg_get_int(_surf_cfg_set, name) * 1024;
+}
-static void _surf_cfg_cb_parallel_contexts(const char *name, int pos)
+static void _surf_cfg_cb_contexts_nthreads(const char *name, int pos)
{
- _surf_parallel_contexts = 1;
+ SIMIX_context_set_nthreads(xbt_cfg_get_int(_surf_cfg_set, name));
+}
+
+static void _surf_cfg_cb_contexts_parallel_threshold(const char *name, int pos)
+{
+ SIMIX_context_set_parallel_threshold(xbt_cfg_get_int(_surf_cfg_set, name));
}
static void _surf_cfg_cb__surf_network_fullduplex(const char *name,
"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_set_double(_surf_cfg_set, "TCP_gamma", 20000.0);
+ xbt_cfg_setdefault_double(_surf_cfg_set, "TCP_gamma", 20000.0);
xbt_cfg_register(&_surf_cfg_set, "maxmin/precision",
"Minimum retained action value when updating simulation",
xbt_cfgelm_double, NULL, 1, 1, _surf_cfg_cb__maxmin_precision, NULL);
- xbt_cfg_set_double(_surf_cfg_set, "maxmin/precision", 0.00001);
+ xbt_cfg_setdefault_double(_surf_cfg_set, "maxmin/precision", 0.00001); // FIXME use setdefault everywhere here!
/* The parameters of network models */
+
+ double_default_value = 0.0;
+ xbt_cfg_register(&_surf_cfg_set, "network/sender_gap",
+ "Minimum gap between two overlapping sends",
+ xbt_cfgelm_double, &double_default_value, 1, 1,
+ _surf_cfg_cb__sender_gap, NULL);
+
double_default_value = 1.0;
xbt_cfg_register(&_surf_cfg_set, "network/latency_factor",
"Correction factor to apply to the provided latency (default value set by network model)",
_surf_cfg_cb_model_check which sets it's value to 1 (instead of the defalut value 0)
xbt_cfg_set_int(_surf_cfg_set, "model-check", default_value_int); */
- /* parallel contexts */
- default_value_int = 0;
- xbt_cfg_register(&_surf_cfg_set, "parallel-contexts",
- "Activate the parallel execution of user contexts (EXPERIMENTAL -- pthreads only)",
- xbt_cfgelm_int, &default_value_int, 0, 1,
- _surf_cfg_cb_parallel_contexts, NULL);
+ /* context factory */
+ default_value = xbt_strdup("ucontext");
+ xbt_cfg_register(&_surf_cfg_set, "contexts/factory",
+ "Context factory to use in SIMIX (ucontext, thread or raw)",
+ xbt_cfgelm_string, &default_value, 1, 1, _surf_cfg_cb_context_factory, NULL);
+
+ /* stack size of contexts in Ko */
+ default_value_int = 128;
+ xbt_cfg_register(&_surf_cfg_set, "contexts/stack_size",
+ "Stack size of contexts in Ko (ucontext or raw only)",
+ xbt_cfgelm_int, &default_value_int, 1, 1,
+ _surf_cfg_cb_context_stack_size, NULL);
+
+ /* number of parallel threads for user processes */
+ default_value_int = 1;
+ xbt_cfg_register(&_surf_cfg_set, "contexts/nthreads",
+ "Number of parallel threads for user contexts (EXPERIMENTAL)",
+ xbt_cfgelm_int, &default_value_int, 1, 1,
+ _surf_cfg_cb_contexts_nthreads, NULL);
+
+ /* 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",
+ xbt_cfgelm_int, &default_value_int, 1, 1,
+ _surf_cfg_cb_contexts_parallel_threshold, NULL);
default_value_int = 0;
xbt_cfg_register(&_surf_cfg_set, "fullduplex",
- "Update the constraint set propagating recursively to others constraints",
+ "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM03)",
xbt_cfgelm_int, &default_value_int, 0, 1,
_surf_cfg_cb__surf_network_fullduplex, NULL);
- xbt_cfg_set_int(_surf_cfg_set, "fullduplex", default_value_int);
+ xbt_cfg_setdefault_int(_surf_cfg_set, "fullduplex", default_value_int);
#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", 0.0);
+ xbt_cfg_setdefault_double(_surf_cfg_set, "gtnets_jitter", 0.0);
default_value_int = 10;
xbt_cfg_register(&_surf_cfg_set, "gtnets_jitter_seed",
"__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);
+ xbt_cfg_setdefault_string(_surf_cfg_set, "path", initial_path);
}
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");
}
}
|| strcmp(cpu_model_name, "Cas01"))
&& !strcmp(workstation_model_name, "CLM03")) {
const char *val = "compound";
- INFO0
+ 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);
(platform_file);
}
- DEBUG0("Call workstation_model_init");
+ XBT_DEBUG("Call workstation_model_init");
surf_workstation_model_description[workstation_id].model_init_preparse
(platform_file);
}