Clean up duplicated declarations for mc_config variables.

diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index adb52a9..1d19d06 100644 (file)
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -34,7 +34,6 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker");
 
 ::simgrid::mc::ModelChecker* mc_model_checker = nullptr;
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ModelChecker, mc, "ModelChecker");
 
 ::simgrid::mc::ModelChecker* mc_model_checker = nullptr;

-extern std::string _sg_mc_dot_output_file;

 
 using simgrid::mc::remote;
 
 
 using simgrid::mc::remote;
 

diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp
index dcff662..0553d89 100644 (file)
--- a/src/mc/Session.cpp
+++ b/src/mc/Session.cpp
@@ -23,7 +23,6 @@
 #include "src/smpi/include/private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session");
 #include "src/smpi/include/private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session");

-extern std::string _sg_mc_dot_output_file;

 
 namespace simgrid {
 namespace mc {
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/checker/LivenessChecker.cpp b/src/mc/checker/LivenessChecker.cpp
index 8d87f5b..c1afd7a 100644 (file)
--- a/src/mc/checker/LivenessChecker.cpp
+++ b/src/mc/checker/LivenessChecker.cpp
@@ -31,7 +31,6 @@
 #include "src/mc/remote/Client.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, "Logging specific to algorithms for liveness properties verification");
 #include "src/mc/remote/Client.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, "Logging specific to algorithms for liveness properties verification");

-extern std::string _sg_mc_property_file;

 
 /********* Static functions *********/
 
 
 /********* Static functions *********/
 

diff --git a/src/mc/checker/simgrid_mc.cpp b/src/mc/checker/simgrid_mc.cpp
index 7f3d39a..13431d3 100644 (file)
--- a/src/mc/checker/simgrid_mc.cpp
+++ b/src/mc/checker/simgrid_mc.cpp
@@ -29,7 +29,6 @@
 #include "src/mc/remote/mc_protocol.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
 #include "src/mc/remote/mc_protocol.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");

-extern std::string _sg_mc_property_file;

 
 static inline
 char** argvdup(int argc, char** argv)
 
 static inline
 char** argvdup(int argc, char** argv)

diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp
index 018a0db..11ef27c 100644 (file)
--- a/src/mc/mc_checkpoint.cpp
+++ b/src/mc/mc_checkpoint.cpp
@@ -52,8 +52,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, "Logging specific to mc_check
 #define PROT_RWX (PROT_READ | PROT_WRITE | PROT_EXEC)
 #define PROT_RW (PROT_READ | PROT_WRITE)
 #define PROT_RX (PROT_READ | PROT_EXEC)
 #define PROT_RWX (PROT_READ | PROT_WRITE | PROT_EXEC)
 #define PROT_RW (PROT_READ | PROT_WRITE)
 #define PROT_RX (PROT_READ | PROT_EXEC)

-extern std::string _sg_mc_property_file;
-extern std::string _sg_mc_dot_output_file;

 
 namespace simgrid {
 namespace mc {
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/mc_config.hpp b/src/mc/mc_config.hpp
index 343c93a..8f88805 100644 (file)
--- a/src/mc/mc_config.hpp
+++ b/src/mc/mc_config.hpp
@@ -6,16 +6,20 @@
 #ifndef MC_CONFIG_HPP
 #define MC_CONFIG_HPP
 
 #ifndef MC_CONFIG_HPP
 #define MC_CONFIG_HPP
 

+#include <string>
+

 /********************************** Configuration of MC **************************************/
 extern "C" XBT_PUBLIC int _sg_do_model_check;
 extern XBT_PRIVATE int _sg_do_model_check_record;
 extern XBT_PRIVATE int _sg_mc_checkpoint;
 extern XBT_PUBLIC int _sg_mc_sparse_checkpoint;
 extern XBT_PUBLIC int _sg_mc_ksm;
 /********************************** Configuration of MC **************************************/
 extern "C" XBT_PUBLIC int _sg_do_model_check;
 extern XBT_PRIVATE int _sg_do_model_check_record;
 extern XBT_PRIVATE int _sg_mc_checkpoint;
 extern XBT_PUBLIC int _sg_mc_sparse_checkpoint;
 extern XBT_PUBLIC int _sg_mc_ksm;

+extern XBT_PUBLIC std::string _sg_mc_property_file;

 extern XBT_PRIVATE int _sg_mc_timeout;
 extern XBT_PRIVATE int _sg_mc_hash;
 extern XBT_PRIVATE int _sg_mc_max_depth;
 extern "C" XBT_PUBLIC int _sg_mc_max_visited_states;
 extern XBT_PRIVATE int _sg_mc_timeout;
 extern XBT_PRIVATE int _sg_mc_hash;
 extern XBT_PRIVATE int _sg_mc_max_depth;
 extern "C" XBT_PUBLIC int _sg_mc_max_visited_states;

+extern XBT_PRIVATE std::string _sg_mc_dot_output_file;

 extern XBT_PUBLIC int _sg_mc_comms_determinism;
 extern XBT_PUBLIC int _sg_mc_send_determinism;
 extern XBT_PRIVATE int _sg_mc_snapshot_fds;
 extern XBT_PUBLIC int _sg_mc_comms_determinism;
 extern XBT_PUBLIC int _sg_mc_send_determinism;
 extern XBT_PRIVATE int _sg_mc_snapshot_fds;

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 80cfa94..c0fbaa3 100644 (file)
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -47,8 +47,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)");
 

-extern std::string _sg_mc_dot_output_file;
-

 namespace simgrid {
 namespace mc {
 
 namespace simgrid {
 namespace mc {
 

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index e5bd9af..5999898 100644 (file)
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -188,7 +188,6 @@ static void _sg_cfg_cb__network_model(const std::string& value)
 }
 
 #if SIMGRID_HAVE_MC
 }
 
 #if SIMGRID_HAVE_MC

-extern int _sg_do_model_check_record;

 static void _sg_cfg_cb_model_check_record(const char *name) {
   _sg_do_model_check_record = xbt_cfg_get_boolean(name);
 }
 static void _sg_cfg_cb_model_check_record(const char *name) {
   _sg_do_model_check_record = xbt_cfg_get_boolean(name);
 }