X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e2e0c7b210a6e58e5f73abd197c8accfd215a0d..824740eb0df1dedddb86035ff3730d87e037f356:/src/mc/mc_config.cpp diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp index e2a3b44fdb..35381d3cb3 100644 --- a/src/mc/mc_config.cpp +++ b/src/mc/mc_config.cpp @@ -1,37 +1,47 @@ -/* 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 +#if SIMGRID_HAVE_STATEFUL_MC #include - -#else -#define _sg_do_model_check 0 #endif +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_cfg); + +simgrid::mc::ModelCheckingMode simgrid::mc::model_checking_mode = simgrid::mc::ModelCheckingMode::NONE; + 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, - "Specifying a %s is only allowed within the model-checker. Please use simgrid-mc.", spec); + 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); } /* 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)", "", - [](std::string_view value) { MC_record_path() = value; }}; + [](std::string_view value) { + xbt_assert(simgrid::mc::model_checking_mode == simgrid::mc::ModelCheckingMode::NONE || + simgrid::mc::model_checking_mode == simgrid::mc::ModelCheckingMode::REPLAY, + "Specifying a MC replay path is not allowed when running the model-checker in mode %s. " + "Either remove the model-check/replay parameter, or execute your code out of simgrid-mc.", + to_c_str(simgrid::mc::model_checking_mode)); + simgrid::mc::model_checking_mode = simgrid::mc::ModelCheckingMode::REPLAY; + 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", 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{ @@ -41,11 +51,18 @@ static simgrid::config::Flag cfg_mc_reduction{ 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_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_strategy{ + "model-check/strategy", "Specify the the kind of heuristic to use for guided model-checking", "none", + [](std::string_view value) { + if (value != "none" && value != "nb_wait") + xbt_die("configuration option 'model-check/guided-mc' can only take 'none' or 'nb_wait' as a value"); + }}; + +#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 " @@ -78,6 +95,7 @@ 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", @@ -93,21 +111,25 @@ simgrid::config::Flag _sg_mc_max_depth{"model-check/max-depth", [](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"); }}; -#endif +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"; +}