X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fbcf6ab31cae1988be858f9f894dafe529c575d7..157b17ef4d7aa7d34625418c27861f3f139010bd:/src/mc/mc_config.cpp diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp index b8de285de0..c872f06922 100644 --- a/src/mc/mc_config.cpp +++ b/src/mc/mc_config.cpp @@ -1,25 +1,16 @@ -/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2022. 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 "xbt/config.hpp" -#include "xbt/log.h" -#include - +#include "src/mc/mc_config.hpp" #include "src/mc/mc_replay.hpp" -#include - #include - #if SIMGRID_HAVE_MC -#include "src/mc/mc_private.hpp" #include "src/mc/mc_safety.hpp" #endif -#include "src/mc/mc_record.hpp" - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_config, mc, "Configuration of the Model Checker"); +#include #if SIMGRID_HAVE_MC namespace simgrid { @@ -28,27 +19,27 @@ namespace mc { simgrid::mc::ReductionMode reduction_mode = simgrid::mc::ReductionMode::unset; } } -#endif - -#if !SIMGRID_HAVE_MC +#else #define _sg_do_model_check 0 #endif static void _mc_cfg_cb_check(const char* spec, bool more_check = true) { - if (_sg_cfg_init_status && not _sg_do_model_check && more_check) - xbt_die("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.", - spec); + 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.", + spec); } /* Replay (this part is enabled even if MC it disabled) */ simgrid::config::Flag _sg_mc_record_path{ - "model-check/replay", "Model-check path to replay (as reported by SimGrid when a violation is reported)", ""}; + "model-check/replay", "Model-check path to replay (as reported by SimGrid when a violation is reported)", "", + [](const std::string& value) { MC_record_path() = value; }}; 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", MC_record_path.empty()); }}; + "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; @@ -61,16 +52,12 @@ simgrid::config::Flag _sg_mc_checkpoint{ "compromises between speed and memory consumption.", 0, [](int) { _mc_cfg_cb_check("checkpointing value"); }}; -simgrid::config::Flag _sg_mc_sparse_checkpoint{"model-check/sparse-checkpoint", "Use sparse per-page snapshots.", - false, [](bool) { _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", - {"model-check/communications_determinism"}, "Whether to enable the detection of communication determinism", false, [](bool) { @@ -79,13 +66,26 @@ simgrid::config::Flag _sg_mc_comms_determinism{ simgrid::config::Flag _sg_mc_send_determinism{ "model-check/send-determinism", - {"model-check/send_determinism"}, "Enable/disable the detection of send-determinism in the communications schemes", false, [](bool) { _mc_cfg_cb_check("value to enable/disable the detection of send-determinism in the communications schemes"); }}; +simgrid::config::Flag _sg_mc_unfolding_checker{ + "model-check/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"); + }}; + +simgrid::config::Flag _sg_mc_buffering{ + "smpi/buffering", + "Buffering semantic to use for MPI (only used in MC)", + "infty", + {{"zero", "No system buffering: MPI_Send is blocking"}, + {"infty", "Infinite system buffering: MPI_Send returns immediately"}}, + [](const std::string&) { _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", [](const std::string& value) { @@ -99,12 +99,7 @@ static simgrid::config::Flag _sg_mc_reduce{ xbt_die("configuration option model-check/reduction can only take 'none' or 'dpor' as a value"); }}; -simgrid::config::Flag _sg_mc_hash{ - "model-check/hash", "Whether to enable state hash for state comparison (experimental)", false, - [](bool) { _mc_cfg_cb_check("value to enable/disable the use of global hash to speedup state comparaison"); }}; - simgrid::config::Flag _sg_mc_max_depth{"model-check/max-depth", - {"model-check/max_depth"}, "Maximal exploration depth (default: 1000)", 1000, [](int) { _mc_cfg_cb_check("max depth value"); }}; @@ -119,7 +114,6 @@ static simgrid::config::Flag _sg_mc_max_visited_states__{ simgrid::config::Flag _sg_mc_dot_output_file{ "model-check/dot-output", - {"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"); }};