[mc] Remove some globals from is_visted_state()

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

diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp
index 244b4a0..eadc370 100644 (file)
--- a/src/mc/mc_config.cpp
+++ b/src/mc/mc_config.cpp
@@ -13,24 +13,26 @@
 
 #include <simgrid/sg_config.h>
 
-#ifdef HAVE_MC
+#if HAVE_MC
 #include "src/mc/mc_safety.h"
 #include "src/mc/mc_private.h"
 #endif
 
 #include "src/mc/mc_record.h"
 
-extern "C" {
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_config, mc,
                                 "Configuration of MC");
 
-#ifdef HAVE_MC
+#if HAVE_MC
+namespace simgrid {
+namespace mc {
 /* Configuration support */
-e_mc_reduce_t mc_reduce_kind = e_mc_reduce_unset;
+simgrid::mc::ReductionMode reduction_mode = simgrid::mc::ReductionMode::unset;
+}
+}
 #endif
 
-#ifndef HAVE_MC
+#if !HAVE_MC
 #define _sg_do_model_check 0
 #endif
 
@@ -45,7 +47,7 @@ void _mc_cfg_cb_timeout(const char *name, int pos)
   _sg_mc_timeout = xbt_cfg_get_boolean(_sg_cfg_set, name);
 }
 
-#ifdef HAVE_MC
+#if HAVE_MC
 int _sg_do_model_check = 0;
 int _sg_do_model_check_record = 0;
 int _sg_mc_checkpoint = 0;
@@ -59,7 +61,6 @@ int _sg_mc_visited = 0;
 char *_sg_mc_dot_output_file = nullptr;
 int _sg_mc_comms_determinism = 0;
 int _sg_mc_send_determinism = 0;
-int _sg_mc_safety = 0;
 int _sg_mc_liveness = 0;
 int _sg_mc_snapshot_fds = 0;
 int _sg_mc_termination = 0;
@@ -72,9 +73,9 @@ void _mc_cfg_cb_reduce(const char *name, int pos)
 
   char *val = xbt_cfg_get_string(_sg_cfg_set, name);
   if (!strcasecmp(val, "none"))
-    mc_reduce_kind = e_mc_reduce_none;
+    simgrid::mc::reduction_mode = simgrid::mc::ReductionMode::none;
   else if (!strcasecmp(val, "dpor"))
-    mc_reduce_kind = e_mc_reduce_dpor;
+    simgrid::mc::reduction_mode = simgrid::mc::ReductionMode::dpor;
   else
     xbt_die("configuration option %s can only take 'none' or 'dpor' as a value",
             name);
@@ -136,7 +137,7 @@ void _mc_cfg_cb_snapshot_fds(const char *name, int pos)
 {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die
-        ("You are specifying a value to enable/disable the use of FD snapshoting, but model-checking was not activated at config time (through bu the program was not runned under the model-checker (with simgrid-mc)). This won't work, sorry.");
+        ("You are specifying a value to enable/disable the use of FD snapshotting, but model-checking was not activated at config time (through bu the program was not runned under the model-checker (with simgrid-mc)). This won't work, sorry.");
 
   _sg_mc_snapshot_fds = xbt_cfg_get_boolean(_sg_cfg_set, name);
 }
@@ -196,5 +197,3 @@ void _mc_cfg_cb_termination(const char *name, int pos)
 }
 
 #endif
-
-}