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)) {
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)
_surf_cfg_cb_contexts_nthreads, NULL);
/* minimal number of user contexts to be run in parallel */
- default_value_int = 20;
+ 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_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);
}