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_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)
+{
+ 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)
{
- smx_parallel_contexts = 1;
+ SIMIX_context_set_parallel_threshold(xbt_cfg_get_int(_surf_cfg_set, name));
}
static void _surf_cfg_cb__surf_network_fullduplex(const char *name,
xbt_cfgelm_int, &default_value_int, 1, 1,
_surf_cfg_cb_context_stack_size, NULL);
- /* parallel contexts */
- default_value_int = 0;
- xbt_cfg_register(&_surf_cfg_set, "contexts/parallel",
- "Activate the parallel execution of user contexts (EXPERIMENTAL -- pthreads only)",
- xbt_cfgelm_int, &default_value_int, 0, 1,
- _surf_cfg_cb_parallel_contexts, 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",