Cosmetics

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

diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp
index b6dc36908b2469a7a8029cd1ba0e3441ea22dcb9..681137ef336335045e2e2a294194521afc3301fd 100644 (file)
--- a/src/mc/mc_config.cpp
+++ b/src/mc/mc_config.cpp
@@ -1,25 +1,31 @@
-/* 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 <simgrid/sg_config.hpp>
-
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_cfg);
+#include "src/simgrid/sg_config.hpp"
+#include <simgrid/modelchecker.h>
 
 #if SIMGRID_HAVE_MC
 #include <string_view>
-
-#else
-#define _sg_do_model_check 0
 #endif
 
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_cfg);
+
+bool simgrid::mc::cfg_do_model_check = false;
+
 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);
+#if SIMGRID_HAVE_MC
+  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);
+#else
+  xbt_die("Specifying a %s is only allowed within the model-checker. Please enable it before the compilation.", spec);
+#endif
 }
 
 /* Replay (this part is enabled even if MC it disabled) */
@@ -27,13 +33,12 @@ 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)", "",
     [](std::string_view value) { MC_record_path() = value; }};
 
+#if SIMGRID_HAVE_MC
 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", 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<std::string> cfg_mc_reduction{