X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0d5351be580847fc5bed5dac18aaa391871ec725..36fa571a13985879dc627c70ecc2340af606aa42:/src/mc/mc_config.cpp diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp index 336f0114e5..67bebd4e6b 100644 --- a/src/mc/mc_config.cpp +++ b/src/mc/mc_config.cpp @@ -38,7 +38,7 @@ simgrid::mc::ReductionMode reduction_mode = simgrid::mc::ReductionMode::unset; int _sg_mc_timeout = 0; -void _mc_cfg_cb_timeout(const char *name, int pos) +void _mc_cfg_cb_timeout(const char *name) { if (_sg_cfg_init_status && !(_sg_do_model_check || MC_record_path)) 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 bu the program was not runned under the model-checker (with simgrid-mc)). This won't work, sorry."); @@ -51,19 +51,18 @@ int _sg_do_model_check = 0; int _sg_do_model_check_record = 0; int _sg_mc_checkpoint = 0; int _sg_mc_sparse_checkpoint = 0; -int _sg_mc_soft_dirty = 0; int _sg_mc_ksm = 0; char *_sg_mc_property_file = nullptr; int _sg_mc_hash = 0; int _sg_mc_max_depth = 1000; -int _sg_mc_visited = 0; +int _sg_mc_max_visited_states = 0; char *_sg_mc_dot_output_file = nullptr; int _sg_mc_comms_determinism = 0; int _sg_mc_send_determinism = 0; int _sg_mc_snapshot_fds = 0; int _sg_mc_termination = 0; -void _mc_cfg_cb_reduce(const char *name, int pos) +void _mc_cfg_cb_reduce(const char *name) { if (_sg_cfg_init_status && !_sg_do_model_check) xbt_die @@ -79,7 +78,7 @@ void _mc_cfg_cb_reduce(const char *name, int pos) name); } -void _mc_cfg_cb_checkpoint(const char *name, int pos) +void _mc_cfg_cb_checkpoint(const char *name) { if (_sg_cfg_init_status && !_sg_do_model_check) xbt_die @@ -88,24 +87,14 @@ void _mc_cfg_cb_checkpoint(const char *name, int pos) _sg_mc_checkpoint = xbt_cfg_get_int(name); } -void _mc_cfg_cb_sparse_checkpoint(const char *name, int pos) { +void _mc_cfg_cb_sparse_checkpoint(const char *name) { if (_sg_cfg_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 bu the program was not runned under the model-checker (with simgrid-mc)). This won't work, sorry."); _sg_mc_sparse_checkpoint = xbt_cfg_get_boolean(name); } -void _mc_cfg_cb_soft_dirty(const char *name, int pos) { - if (_sg_cfg_init_status && !_sg_do_model_check) - xbt_die("You are specifying a soft dirty 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."); - - _sg_mc_soft_dirty = xbt_cfg_get_boolean(name); -} - -void _mc_cfg_cb_ksm(const char *name, int pos) +void _mc_cfg_cb_ksm(const char *name) { if (_sg_cfg_init_status && !_sg_do_model_check) xbt_die("You are specifying a KSM 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."); @@ -113,7 +102,7 @@ void _mc_cfg_cb_ksm(const char *name, int pos) _sg_mc_ksm = xbt_cfg_get_boolean(name); } -void _mc_cfg_cb_property(const char *name, int pos) +void _mc_cfg_cb_property(const char *name) { if (_sg_cfg_init_status && !_sg_do_model_check) xbt_die @@ -122,7 +111,7 @@ void _mc_cfg_cb_property(const char *name, int pos) _sg_mc_property_file = xbt_cfg_get_string(name); } -void _mc_cfg_cb_hash(const char *name, int pos) +void _mc_cfg_cb_hash(const char *name) { if (_sg_cfg_init_status && !_sg_do_model_check) xbt_die @@ -131,7 +120,7 @@ void _mc_cfg_cb_hash(const char *name, int pos) _sg_mc_hash = xbt_cfg_get_boolean(name); } -void _mc_cfg_cb_snapshot_fds(const char *name, int pos) +void _mc_cfg_cb_snapshot_fds(const char *name) { if (_sg_cfg_init_status && !_sg_do_model_check) xbt_die @@ -140,7 +129,7 @@ void _mc_cfg_cb_snapshot_fds(const char *name, int pos) _sg_mc_snapshot_fds = xbt_cfg_get_boolean(name); } -void _mc_cfg_cb_max_depth(const char *name, int pos) +void _mc_cfg_cb_max_depth(const char *name) { if (_sg_cfg_init_status && !_sg_do_model_check) xbt_die @@ -149,16 +138,16 @@ void _mc_cfg_cb_max_depth(const char *name, int pos) _sg_mc_max_depth = xbt_cfg_get_int(name); } -void _mc_cfg_cb_visited(const char *name, int pos) +void _mc_cfg_cb_visited(const char *name) { if (_sg_cfg_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 bu the program was not runned under the model-checker (with simgrid-mc)). This won't work, sorry."); - _sg_mc_visited = xbt_cfg_get_int(name); + _sg_mc_max_visited_states = xbt_cfg_get_int(name); } -void _mc_cfg_cb_dot_output(const char *name, int pos) +void _mc_cfg_cb_dot_output(const char *name) { if (_sg_cfg_init_status && !_sg_do_model_check) xbt_die @@ -167,7 +156,7 @@ void _mc_cfg_cb_dot_output(const char *name, int pos) _sg_mc_dot_output_file = xbt_cfg_get_string(name); } -void _mc_cfg_cb_comms_determinism(const char *name, int pos) +void _mc_cfg_cb_comms_determinism(const char *name) { if (_sg_cfg_init_status && !_sg_do_model_check) xbt_die @@ -176,7 +165,7 @@ void _mc_cfg_cb_comms_determinism(const char *name, int pos) _sg_mc_comms_determinism = xbt_cfg_get_boolean(name); } -void _mc_cfg_cb_send_determinism(const char *name, int pos) +void _mc_cfg_cb_send_determinism(const char *name) { if (_sg_cfg_init_status && !_sg_do_model_check) xbt_die @@ -185,7 +174,7 @@ void _mc_cfg_cb_send_determinism(const char *name, int pos) _sg_mc_send_determinism = xbt_cfg_get_boolean(name); } -void _mc_cfg_cb_termination(const char *name, int pos) +void _mc_cfg_cb_termination(const char *name) { if (_sg_cfg_init_status && !_sg_do_model_check) xbt_die