X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3ee5e2ac47abb878c628539714f57dbb4898032b..7d9a2608433e246294b7c4b339371fd4d3530ba6:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index 8289f35484..f3555063f0 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -24,12 +24,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, e_mc_reduce_t mc_reduce_kind=e_mc_reduce_unset; -extern int _surf_init_status; +extern int _sg_init_status; void _mc_cfg_cb_reduce(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { + if (_sg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a reduction strategy after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - char *val= xbt_cfg_get_string(_surf_cfg_set, name); + char *val= xbt_cfg_get_string(_sg_cfg_set, name); if (!strcasecmp(val,"none")) { mc_reduce_kind = e_mc_reduce_none; } else if (!strcasecmp(val,"dpor")) { @@ -40,37 +40,37 @@ void _mc_cfg_cb_reduce(const char *name, int pos) { } void _mc_cfg_cb_checkpoint(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { + if (_sg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a checkpointing value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - _surf_mc_checkpoint = xbt_cfg_get_int(_surf_cfg_set, name); + _surf_mc_checkpoint = xbt_cfg_get_int(_sg_cfg_set, name); } void _mc_cfg_cb_property(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { + if (_sg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a property after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - _surf_mc_property_file= xbt_cfg_get_string(_surf_cfg_set, name); + _surf_mc_property_file= xbt_cfg_get_string(_sg_cfg_set, name); } void _mc_cfg_cb_timeout(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { + if (_sg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a value to enable/disable timeout for wait requests after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - _surf_mc_timeout= xbt_cfg_get_int(_surf_cfg_set, name); + _surf_mc_timeout= xbt_cfg_get_int(_sg_cfg_set, name); } void _mc_cfg_cb_max_depth(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { + if (_sg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a max depth value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - _surf_mc_max_depth= xbt_cfg_get_int(_surf_cfg_set, name); + _surf_mc_max_depth= xbt_cfg_get_int(_sg_cfg_set, name); } void _mc_cfg_cb_visited(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { + if (_sg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a number of stored visited states after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - _surf_mc_visited= xbt_cfg_get_int(_surf_cfg_set, name); + _surf_mc_visited= xbt_cfg_get_int(_sg_cfg_set, name); }