Merge mc_safety.hpp into DFSExplorer class

[simgrid.git] / src / mc / mc_config.cpp

diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp
index 78c86b6..e2a3b44 100644 (file)
--- a/src/mc/mc_config.cpp
+++ b/src/mc/mc_config.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2021. 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. */
@@ -6,19 +6,10 @@
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_replay.hpp"
 #include <simgrid/sg_config.hpp>
-#if SIMGRID_HAVE_MC
-#include "src/mc/mc_safety.hpp"
-#endif
-
-#include <climits>
 
 #if SIMGRID_HAVE_MC
-namespace simgrid {
-namespace mc {
-/* Configuration support */
-simgrid::mc::ReductionMode reduction_mode = simgrid::mc::ReductionMode::unset;
-}
-}
+#include <string_view>
+
 #else
 #define _sg_do_model_check 0
 #endif
@@ -26,15 +17,13 @@ simgrid::mc::ReductionMode reduction_mode = simgrid::mc::ReductionMode::unset;
 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.",
-             spec);
+             "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<std::string> _sg_mc_record_path{
     "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; }};
+    [](std::string_view value) { MC_record_path() = value; }};
 
 simgrid::config::Flag<bool> _sg_mc_timeout{
     "model-check/timeout", "Whether to enable timeouts for wait requests", false, [](bool) {
@@ -45,6 +34,18 @@ simgrid::config::Flag<bool> _sg_mc_timeout{
 int _sg_do_model_check = 0;
 int _sg_mc_max_visited_states = 0;
 
+static simgrid::config::Flag<std::string> 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<int> _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 "
@@ -73,9 +74,8 @@ simgrid::config::Flag<bool> _sg_mc_send_determinism{
     }};
 
 simgrid::config::Flag<bool> _sg_mc_unfolding_checker{
-    "model-check/unfolding-checker", "Whether to enable the unfolding-based dynamic partial order reduction to MPI programs",     
-    false,
-    [](bool) {
+    "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");
     }};
 
@@ -85,20 +85,7 @@ simgrid::config::Flag<std::string> _sg_mc_buffering{
     "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<std::string> _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<int> _sg_mc_max_depth{"model-check/max-depth",
                                             "Maximal exploration depth (default: 1000)",