/* 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();
+ }
}
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_parallel_contexts(const char *name, int pos)
+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_contexts_nthreads(const char *name, int pos)
{
- smx_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 */
/* context factory */
default_value = xbt_strdup("ucontext");
- xbt_cfg_register(&_surf_cfg_set, "simix/context",
+ 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);
- /* 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);
+ /* 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",
"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);
}