From 3fafdab4bb94b48cb16c80690408a18f472e202b Mon Sep 17 00:00:00 2001 From: mlaurent Date: Fri, 17 Feb 2023 10:33:36 +0100 Subject: [PATCH] Default is not to use sleep-set to agree with existing tests --- src/mc/explo/DFSExplorer.cpp | 2 +- src/mc/explo/DFSExplorer.hpp | 2 +- src/mc/mc_config.cpp | 8 ++------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/mc/explo/DFSExplorer.cpp b/src/mc/explo/DFSExplorer.cpp index fa834497a4..a3e0c38a51 100644 --- a/src/mc/explo/DFSExplorer.cpp +++ b/src/mc/explo/DFSExplorer.cpp @@ -160,7 +160,7 @@ void DFSExplorer::run() state->get_transition()->to_string().c_str(), stack_.size(), state->get_num(), state->count_todo()); /* Create the new expanded state (copy the state of MCed into our MCer data) */ - std::__detail::__unique_ptr_t next_state; + std::unique_ptr next_state; /* If we want sleep set reduction, pass the old state to the new state so it can * both copy the sleep set and eventually removes things from it locally */ diff --git a/src/mc/explo/DFSExplorer.hpp b/src/mc/explo/DFSExplorer.hpp index 924484270a..ad79c59ee6 100644 --- a/src/mc/explo/DFSExplorer.hpp +++ b/src/mc/explo/DFSExplorer.hpp @@ -83,7 +83,7 @@ public: private: void check_non_termination(const State* current_state); void backtrack(); - bool sleep_set_reduction_ = true; + bool sleep_set_reduction_; /** Stack representing the position in the exploration graph */ std::list> stack_; diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp index 8920c57564..6b6ea8b919 100644 --- a/src/mc/mc_config.cpp +++ b/src/mc/mc_config.cpp @@ -49,12 +49,8 @@ static simgrid::config::Flag cfg_mc_reduction{ }}; simgrid::config::Flag _sg_mc_sleep_set{ - "model-check/sleep-set", - "Whether to enable the use of sleep-set in the reduction algorithm", - true, - [](bool) { - _mc_cfg_cb_check("value to enable/disable the use of sleep-set in the reduction algorithm"); - }}; + "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 " -- 2.20.1