Update copyright lines for 2022.

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

diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp
index b66a228..c872f06 100644 (file)
--- a/src/mc/mc_config.cpp
+++ b/src/mc/mc_config.cpp
@@ -1,8 +1,9 @@
-/* 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. */
 
+#include "src/mc/mc_config.hpp"
 #include "src/mc/mc_replay.hpp"
 #include <simgrid/sg_config.hpp>
 #if SIMGRID_HAVE_MC
@@ -24,19 +25,21 @@ simgrid::mc::ReductionMode reduction_mode = simgrid::mc::ReductionMode::unset;
 
 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<std::string> _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<bool> _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;
@@ -69,6 +72,12 @@ simgrid::config::Flag<bool> _sg_mc_send_determinism{
       _mc_cfg_cb_check("value to enable/disable the detection of send-determinism in the communications schemes");
     }};
 
+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) {
+      _mc_cfg_cb_check("value to to enable/disable the unfolding-based dynamic partial order reduction to MPI programs");
+    }};
+
 simgrid::config::Flag<std::string> _sg_mc_buffering{
     "smpi/buffering",
     "Buffering semantic to use for MPI (only used in MC)",