X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/72d32c4e88a57f4786f62fec48a1bfa454adbff9..2c5bc1925ed8daa3274f4c6ddefbbe0e7ecf6a06:/src/mc/mc_config.cpp diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp index f33a8959a1..ad0fe22f90 100644 --- a/src/mc/mc_config.cpp +++ b/src/mc/mc_config.cpp @@ -1,32 +1,31 @@ -/* Copyright (c) 2008-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2023. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/mc/mc_config.hpp" #include "src/mc/mc_replay.hpp" -#include +#include "src/simgrid/sg_config.hpp" +#include #if SIMGRID_HAVE_MC -#include "src/mc/mc_safety.hpp" #include #endif -#if SIMGRID_HAVE_MC -namespace simgrid::mc { -/* Configuration support */ -simgrid::mc::ReductionMode reduction_mode = simgrid::mc::ReductionMode::unset; -} // namespace simgrid::mc -#else -#define _sg_do_model_check 0 -#endif +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_cfg); + +bool simgrid::mc::cfg_do_model_check = false; static void _mc_cfg_cb_check(const char* spec, bool more_check = true) { - xbt_assert(_sg_cfg_init_status == 0 || _sg_do_model_check || not more_check, - "You are specifying a %s after the initialization (through MSG_config?), but the program was not run " - "under the model-checker (with simgrid-mc)). This won't work, sorry.", +#if SIMGRID_HAVE_MC + xbt_assert(_sg_cfg_init_status == 0 || MC_is_active() || MC_record_replay_is_active() || not more_check, + "Specifying a %s is only allowed within the model-checker. Please use simgrid-mc, or specify this option " + "after the replay path.", spec); +#else + xbt_die("Specifying a %s is only allowed within the model-checker. Please enable it before the compilation.", spec); +#endif } /* Replay (this part is enabled even if MC it disabled) */ @@ -34,15 +33,25 @@ simgrid::config::Flag _sg_mc_record_path{ "model-check/replay", "Model-check path to replay (as reported by SimGrid when a violation is reported)", "", [](std::string_view value) { MC_record_path() = value; }}; +#if SIMGRID_HAVE_MC simgrid::config::Flag _sg_mc_timeout{ "model-check/timeout", "Whether to enable timeouts for wait requests", false, [](bool) { _mc_cfg_cb_check("value to enable/disable timeout for wait requests", not MC_record_replay_is_active()); }}; -#if SIMGRID_HAVE_MC -int _sg_do_model_check = 0; 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) { + if (value != "none" && value != "dpor") + xbt_die("configuration option 'model-check/reduction' can only take 'none' or 'dpor' as a value"); + }}; + +simgrid::config::Flag _sg_mc_sleep_set{ + "model-check/sleep-set", "Whether to enable the use of sleep-set in the reduction algorithm", false, + [](bool) { _mc_cfg_cb_check("value to enable/disable the use of sleep-set in the reduction algorithm"); }}; + 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 " @@ -84,40 +93,33 @@ simgrid::config::Flag _sg_mc_buffering{ {"infty", "Infinite system buffering: MPI_Send returns immediately"}}, [](std::string_view) { _mc_cfg_cb_check("buffering mode"); }}; -static simgrid::config::Flag _sg_mc_reduce{ - "model-check/reduction", "Specify the kind of exploration reduction (either none or DPOR)", "dpor", - [](std::string_view value) { - _mc_cfg_cb_check("reduction strategy"); - - if (value == "none") - simgrid::mc::reduction_mode = simgrid::mc::ReductionMode::none; - else if (value == "dpor") - simgrid::mc::reduction_mode = simgrid::mc::ReductionMode::dpor; - else - xbt_die("configuration option model-check/reduction can only take 'none' or 'dpor' as a value"); - }}; - simgrid::config::Flag _sg_mc_max_depth{"model-check/max-depth", "Maximal exploration depth (default: 1000)", 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. If value=5, the " - "last 5 visited states are stored. If value=0 (the default), all states are stored.", + "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_dot_output_file{ - "model-check/dot-output", - "Name of dot output file corresponding to graph state", - "", - [](const std::string&) { _mc_cfg_cb_check("file name for a dot output of graph state"); }}; - 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"); }}; +bool simgrid::mc::cfg_use_DPOR() +{ + if (cfg_mc_reduction.get() == "dpor" && _sg_mc_max_visited_states__ > 0) { + XBT_INFO("Disabling DPOR since state-equality reduction is activated with 'model-check/visited'"); + return false; + } + return cfg_mc_reduction.get() == "dpor"; +} + #endif