X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9a4ec91cc24a9a54ff3a060cc2828ac54d0c0c26..5f5a10db6fc4552782638abb4817041223e17775:/src/mc/mc_config.cpp diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp index 9253c04f0e..25f3090c76 100644 --- a/src/mc/mc_config.cpp +++ b/src/mc/mc_config.cpp @@ -8,10 +8,6 @@ #include "src/simgrid/sg_config.hpp" #include -#if SIMGRID_HAVE_STATEFUL_MC -#include -#endif - XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_cfg); static simgrid::mc::ModelCheckingMode model_checking_mode = simgrid::mc::ModelCheckingMode::NONE; @@ -52,8 +48,6 @@ simgrid::config::Flag _sg_mc_timeout{ _mc_cfg_cb_check("value to enable/disable timeout for wait requests", not MC_record_replay_is_active()); }}; -int _sg_mc_max_visited_states = 0; - static simgrid::config::Flag cfg_mc_reduction{ "model-check/reduction", "Specify the kind of exploration reduction (either none or DPOR)", "dpor", [](std::string_view value) { @@ -76,26 +70,11 @@ simgrid::config::Flag _sg_mc_random_seed{"model-check/rand-seed", "give a specific random seed to initialize the uniform distribution", 0, [](int) { _mc_cfg_cb_check("Random seed"); }}; -#if SIMGRID_HAVE_STATEFUL_MC -simgrid::config::Flag _sg_mc_checkpoint{ - "model-check/checkpoint", "Specify the amount of steps between checkpoints during stateful model-checking " - "(default: 0 => stateless verification). If value=1, one checkpoint is saved for each " - "step => faster verification, but huge memory consumption; higher values are good " - "compromises between speed and memory consumption.", - 0, [](int) { _mc_cfg_cb_check("checkpointing value"); }}; - -simgrid::config::Flag _sg_mc_property_file{ - "model-check/property", "Name of the file containing the property, as formatted by the ltl2ba program.", "", - [](const std::string&) { _mc_cfg_cb_check("property"); }}; - simgrid::config::Flag _sg_mc_comms_determinism{ - "model-check/communications-determinism", - "Whether to enable the detection of communication determinism", - false, + "model-check/communications-determinism", "Whether to enable the detection of communication determinism", false, [](bool) { _mc_cfg_cb_check("value to enable/disable the detection of determinism in the communications schemes"); }}; - simgrid::config::Flag _sg_mc_send_determinism{ "model-check/send-determinism", "Enable/disable the detection of send-determinism in the communications schemes", @@ -109,7 +88,6 @@ simgrid::config::Flag _sg_mc_unfolding_checker{ "Whether to enable the unfolding-based dynamic partial order reduction to MPI programs", false, [](bool) { _mc_cfg_cb_check("value to to enable/disable the unfolding-based dynamic partial order reduction to MPI programs"); }}; -#endif simgrid::config::Flag _sg_mc_buffering{ "smpi/buffering", @@ -124,29 +102,8 @@ simgrid::config::Flag _sg_mc_max_depth{"model-check/max-depth", 1000, [](int) { _mc_cfg_cb_check("max depth value"); }}; -static simgrid::config::Flag _sg_mc_max_visited_states__{ - "model-check/visited", - "Specify the number of visited state stored for state comparison reduction: any branch leading to a state that is " - "already stored is cut.\n" - "If value=5, the last 5 visited states are stored. If value=0 (the default), no state is stored and this reduction " - "technique is disabled.", - 0, [](int value) { - _mc_cfg_cb_check("number of stored visited states"); - _sg_mc_max_visited_states = value; - }}; - -simgrid::config::Flag _sg_mc_termination{ - "model-check/termination", "Whether to enable non progressive cycle detection", false, - [](bool) { _mc_cfg_cb_check("value to enable/disable the detection of non progressive cycles"); }}; - simgrid::mc::ReductionMode simgrid::mc::get_model_checking_reduction() { - if ((cfg_mc_reduction.get() == "dpor" || cfg_mc_reduction.get() == "sdpor" || cfg_mc_reduction.get() == "odpor") && - _sg_mc_max_visited_states__ > 0) { - XBT_INFO("Disabling DPOR since state-equality reduction is activated with 'model-check/visited'"); - return simgrid::mc::ReductionMode::none; - } - if (cfg_mc_reduction.get() == "none") { return ReductionMode::none; } else if (cfg_mc_reduction.get() == "dpor") {