X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3b7e5f4b4d7c87ee3e8827313ec966ea8fc8387..4e2e0c7b210a6e58e5f73abd197c8accfd215a0d:/src/mc/mc_config.cpp?ds=sidebyside diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp index fbb7f7c7b8..e2a3b44fdb 100644 --- a/src/mc/mc_config.cpp +++ b/src/mc/mc_config.cpp @@ -1,47 +1,51 @@ -/* Copyright (c) 2008-2020. 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 "src/mc/mc_config.hpp" #include "src/mc/mc_replay.hpp" #include -#if SIMGRID_HAVE_MC -#include "src/mc/mc_safety.hpp" -#endif - -#include #if SIMGRID_HAVE_MC -namespace simgrid { -namespace mc { -/* Configuration support */ -simgrid::mc::ReductionMode reduction_mode = simgrid::mc::ReductionMode::unset; -} -} +#include + #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, + "Specifying a %s is only allowed within the model-checker. Please use simgrid-mc.", 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)", "", + [](std::string_view 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; 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"); + }}; + +bool simgrid::mc::cfg_use_DPOR() +{ + return cfg_mc_reduction.get() == "dpor"; +} + 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 " @@ -55,7 +59,6 @@ simgrid::config::Flag _sg_mc_property_file{ 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) { @@ -64,36 +67,27 @@ 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) { - _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"); - }}; + [](std::string_view) { _mc_cfg_cb_check("buffering mode"); }}; 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"); }}; @@ -108,7 +102,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"); }};