X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/30a925489c6e4d4a92042ef80de375c56ccb562b..d4f9d0cf42605d96b91088c02ddfbf2411f89de1:/src/mc/mc_config.cpp

diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp
index d7752f16f3..336f0114e5 100644
--- a/src/mc/mc_config.cpp
+++ b/src/mc/mc_config.cpp
@@ -13,21 +13,17 @@
 
 #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 */
@@ -36,7 +32,7 @@ simgrid::mc::ReductionMode reduction_mode = simgrid::mc::ReductionMode::unset;
 }
 #endif
 
-#ifndef HAVE_MC
+#if !HAVE_MC
 #define _sg_do_model_check 0
 #endif
 
@@ -45,13 +41,12 @@ int _sg_mc_timeout = 0;
 void _mc_cfg_cb_timeout(const char *name, int pos)
 {
   if (_sg_cfg_init_status && !(_sg_do_model_check || MC_record_path))
-    xbt_die
-        ("You are specifying a value to enable/disable timeout for wait requests after the initialization (through MSG_config?), 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.");
+    xbt_die("You are specifying a value to enable/disable timeout for wait requests after the initialization (through MSG_config?), 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_timeout = xbt_cfg_get_boolean(_sg_cfg_set, name);
+  _sg_mc_timeout = xbt_cfg_get_boolean(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;
@@ -65,8 +60,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;
 
@@ -76,7 +69,7 @@ void _mc_cfg_cb_reduce(const char *name, int pos)
     xbt_die
         ("You are specifying a reduction strategy after the initialization (through MSG_config?), 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.");
 
-  char *val = xbt_cfg_get_string(_sg_cfg_set, name);
+  char *val = xbt_cfg_get_string(name);
   if (!strcasecmp(val, "none"))
     simgrid::mc::reduction_mode = simgrid::mc::ReductionMode::none;
   else if (!strcasecmp(val, "dpor"))
@@ -92,14 +85,14 @@ void _mc_cfg_cb_checkpoint(const char *name, int pos)
     xbt_die
         ("You are specifying a checkpointing value after the initialization (through MSG_config?), 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_checkpoint = xbt_cfg_get_int(_sg_cfg_set, name);
+  _sg_mc_checkpoint = xbt_cfg_get_int(name);
 }
 
 void _mc_cfg_cb_sparse_checkpoint(const char *name, int pos) {
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die("You are specifying a checkpointing value after the initialization (through MSG_config?), 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_sparse_checkpoint = xbt_cfg_get_boolean(_sg_cfg_set, name);
+  _sg_mc_sparse_checkpoint = xbt_cfg_get_boolean(name);
 }
 
 void _mc_cfg_cb_soft_dirty(const char *name, int pos) {
@@ -109,7 +102,7 @@ void _mc_cfg_cb_soft_dirty(const char *name, int pos) {
             "at config time (through --cfg=model-check:1). "
             "This won't work, sorry.");
 
-  _sg_mc_soft_dirty = xbt_cfg_get_boolean(_sg_cfg_set, name);
+  _sg_mc_soft_dirty = xbt_cfg_get_boolean(name);
 }
 
 void _mc_cfg_cb_ksm(const char *name, int pos)
@@ -117,7 +110,7 @@ void _mc_cfg_cb_ksm(const char *name, int pos)
   if (_sg_cfg_init_status && !_sg_do_model_check)
     xbt_die("You are specifying a KSM value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
 
-  _sg_mc_ksm = xbt_cfg_get_boolean(_sg_cfg_set, name);
+  _sg_mc_ksm = xbt_cfg_get_boolean(name);
 }
 
 void _mc_cfg_cb_property(const char *name, int pos)
@@ -126,7 +119,7 @@ void _mc_cfg_cb_property(const char *name, int pos)
     xbt_die
         ("You are specifying a property after the initialization (through MSG_config?), 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_property_file = xbt_cfg_get_string(_sg_cfg_set, name);
+  _sg_mc_property_file = xbt_cfg_get_string(name);
 }
 
 void _mc_cfg_cb_hash(const char *name, int pos)
@@ -135,16 +128,16 @@ void _mc_cfg_cb_hash(const char *name, int pos)
     xbt_die
         ("You are specifying a value to enable/disable the use of global hash to speedup state comparaison, 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_hash = xbt_cfg_get_boolean(_sg_cfg_set, name);
+  _sg_mc_hash = xbt_cfg_get_boolean(name);
 }
 
 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);
+  _sg_mc_snapshot_fds = xbt_cfg_get_boolean(name);
 }
 
 void _mc_cfg_cb_max_depth(const char *name, int pos)
@@ -153,7 +146,7 @@ void _mc_cfg_cb_max_depth(const char *name, int pos)
     xbt_die
         ("You are specifying a max depth value after the initialization (through MSG_config?), 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_max_depth = xbt_cfg_get_int(_sg_cfg_set, name);
+  _sg_mc_max_depth = xbt_cfg_get_int(name);
 }
 
 void _mc_cfg_cb_visited(const char *name, int pos)
@@ -162,7 +155,7 @@ void _mc_cfg_cb_visited(const char *name, int pos)
     xbt_die
         ("You are specifying a number of stored visited states after the initialization (through MSG_config?), 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_visited = xbt_cfg_get_int(_sg_cfg_set, name);
+  _sg_mc_visited = xbt_cfg_get_int(name);
 }
 
 void _mc_cfg_cb_dot_output(const char *name, int pos)
@@ -171,7 +164,7 @@ void _mc_cfg_cb_dot_output(const char *name, int pos)
     xbt_die
         ("You are specifying a file name for a dot output of graph state after the initialization (through MSG_config?), 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_dot_output_file = xbt_cfg_get_string(_sg_cfg_set, name);
+  _sg_mc_dot_output_file = xbt_cfg_get_string(name);
 }
 
 void _mc_cfg_cb_comms_determinism(const char *name, int pos)
@@ -180,7 +173,7 @@ void _mc_cfg_cb_comms_determinism(const char *name, int pos)
     xbt_die
         ("You are specifying a value to enable/disable the detection of determinism in the communications schemes after the initialization (through MSG_config?), 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_comms_determinism = xbt_cfg_get_boolean(_sg_cfg_set, name);
+  _sg_mc_comms_determinism = xbt_cfg_get_boolean(name);
 }
 
 void _mc_cfg_cb_send_determinism(const char *name, int pos)
@@ -189,7 +182,7 @@ void _mc_cfg_cb_send_determinism(const char *name, int pos)
     xbt_die
         ("You are specifying a value to enable/disable the detection of send-determinism in the communications schemes after the initialization (through MSG_config?), 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_send_determinism = xbt_cfg_get_boolean(_sg_cfg_set, name);
+  _sg_mc_send_determinism = xbt_cfg_get_boolean(name);
 }
 
 void _mc_cfg_cb_termination(const char *name, int pos)
@@ -198,7 +191,7 @@ void _mc_cfg_cb_termination(const char *name, int pos)
     xbt_die
         ("You are specifying a value to enable/disable the detection of non progressive cycles after the initialization (through MSG_config?), 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_termination = xbt_cfg_get_boolean(_sg_cfg_set, name);
+  _sg_mc_termination = xbt_cfg_get_boolean(name);
 }
 
 #endif