[mc] Get rid of the global simgrid::mc::visited_states, use a class instead

diff --git a/src/mc/CommunicationDeterminismChecker.cpp b/src/mc/CommunicationDeterminismChecker.cpp
index 6eedc7e..541a001 100644 (file)
--- a/src/mc/CommunicationDeterminismChecker.cpp
+++ b/src/mc/CommunicationDeterminismChecker.cpp
@@ -349,8 +349,6 @@ void CommunicationDeterminismChecker::prepare()
   int i;
   const int maxpid = MC_smx_get_maxpid();
 
-  simgrid::mc::visited_states.clear();
-
   // Create initial_communications_pattern elements:
   initial_communications_pattern = xbt_dynar_new(sizeof(mc_list_comm_pattern_t), MC_list_comm_pattern_free_voidp);
   for (i=0; i < maxpid; i++){
@@ -458,7 +456,7 @@ int CommunicationDeterminismChecker::main(void)
       bool compare_snapshots = all_communications_are_finished()
         && initial_global_state->initial_communications_pattern_done;
 
-      if (_sg_mc_visited == 0 || (visited_state = simgrid::mc::is_visited_state(next_state, compare_snapshots)) == nullptr) {
+      if (_sg_mc_visited == 0 || (visited_state = visitedStates_.addVisitedState(next_state, compare_snapshots)) == nullptr) {
 
         /* Get enabled processes and insert them in the interleave set of the next state */
         for (auto& p : mc_model_checker->process().simix_processes())

diff --git a/src/mc/CommunicationDeterminismChecker.hpp b/src/mc/CommunicationDeterminismChecker.hpp
index 5fe0011..c345af7 100644 (file)
--- a/src/mc/CommunicationDeterminismChecker.hpp
+++ b/src/mc/CommunicationDeterminismChecker.hpp
@@ -8,6 +8,7 @@
 
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/Checker.hpp"
+#include "src/mc/VisitedState.hpp"
 
 #ifndef SIMGRID_MC_COMMUNICATION_DETERMINISM_CHECKER_HPP
 #define SIMGRID_MC_COMMUNICATION_DETERMINISM_CHECKER_HPP
@@ -28,6 +29,7 @@ private:
 private:
   /** Stack representing the position in the exploration graph */
   std::list<simgrid::mc::State*> stack_;
+  simgrid::mc::VisitedStates visitedStates_;
 };
 
 #endif

diff --git a/src/mc/SafetyChecker.cpp b/src/mc/SafetyChecker.cpp
index 4269891..58e9a16 100644 (file)
--- a/src/mc/SafetyChecker.cpp
+++ b/src/mc/SafetyChecker.cpp
@@ -150,7 +150,8 @@ int SafetyChecker::run()
           return SIMGRID_MC_EXIT_NON_TERMINATION;
       }
 
-      if (_sg_mc_visited == 0 || (visited_state = simgrid::mc::is_visited_state(next_state, true)) == nullptr) {
+      if (_sg_mc_visited == 0
+          || (visited_state = visitedStates_.addVisitedState(next_state, true)) == nullptr) {
 
         /* Get an enabled process and insert it in the interleave set of the next state */
         for (auto& p : mc_model_checker->process().simix_processes())
@@ -301,8 +302,6 @@ void SafetyChecker::init()
 
   XBT_DEBUG("Starting the safety algorithm");
 
-  simgrid::mc::visited_states.clear();
-
   simgrid::mc::State* initial_state = MC_state_new();
 
   XBT_DEBUG("**************************************************");

diff --git a/src/mc/SafetyChecker.hpp b/src/mc/SafetyChecker.hpp
index 0bc502d..1435182 100644 (file)
--- a/src/mc/SafetyChecker.hpp
+++ b/src/mc/SafetyChecker.hpp
@@ -11,6 +11,7 @@
 
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/Checker.hpp"
+#include "src/mc/VisitedState.hpp"
 
 namespace simgrid {
 namespace mc {
@@ -30,6 +31,7 @@ private:
 private:
   /** Stack representing the position in the exploration graph */
   std::list<simgrid::mc::State*> stack_;
+  simgrid::mc::VisitedStates visitedStates_;
 };
 
 }

diff --git a/src/mc/VisitedState.cpp b/src/mc/VisitedState.cpp
index 3745922..4399f82 100644 (file)
--- a/src/mc/VisitedState.cpp
+++ b/src/mc/VisitedState.cpp
@@ -29,7 +29,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_VisitedState, mc,
 namespace simgrid {
 namespace mc {
 
-std::vector<std::unique_ptr<simgrid::mc::VisitedState>> visited_states;
+static int snapshot_compare(simgrid::mc::VisitedState* state1, simgrid::mc::VisitedState* state2)
+{
+  simgrid::mc::Snapshot* s1 = state1->system_state.get();
+  simgrid::mc::Snapshot* s2 = state2->system_state.get();
+  int num1 = state1->num;
+  int num2 = state2->num;
+  return snapshot_compare(num1, s1, num2, s2);
+}
 
 /**
  * \brief Save the current state
@@ -54,34 +61,25 @@ VisitedState::~VisitedState()
 {
 }
 
-static void prune_visited_states()
+void VisitedStates::prune()
 {
-  while (visited_states.size() > (std::size_t) _sg_mc_visited) {
+  while (states_.size() > (std::size_t) _sg_mc_visited) {
     XBT_DEBUG("Try to remove visited state (maximum number of stored states reached)");
-    auto min_element = std::min_element(visited_states.begin(), visited_states.end(),
+    auto min_element = std::min_element(states_.begin(), states_.end(),
       [](std::unique_ptr<simgrid::mc::VisitedState>& a, std::unique_ptr<simgrid::mc::VisitedState>& b) {
         return a->num < b->num;
       });
-    xbt_assert(min_element != visited_states.end());
+    xbt_assert(min_element != states_.end());
     // and drop it:
-    visited_states.erase(min_element);
+    states_.erase(min_element);
     XBT_DEBUG("Remove visited state (maximum number of stored states reached)");
   }
 }
 
-static int snapshot_compare(simgrid::mc::VisitedState* state1, simgrid::mc::VisitedState* state2)
-{
-  simgrid::mc::Snapshot* s1 = state1->system_state.get();
-  simgrid::mc::Snapshot* s2 = state2->system_state.get();
-  int num1 = state1->num;
-  int num2 = state2->num;
-  return snapshot_compare(num1, s1, num2, s2);
-}
-
 /**
  * \brief Checks whether a given state has already been visited by the algorithm.
  */
-std::unique_ptr<simgrid::mc::VisitedState> is_visited_state(simgrid::mc::State* graph_state, bool compare_snpashots)
+std::unique_ptr<simgrid::mc::VisitedState> VisitedStates::addVisitedState(simgrid::mc::State* graph_state, bool compare_snpashots)
 {
   std::unique_ptr<simgrid::mc::VisitedState> new_state =
     std::unique_ptr<simgrid::mc::VisitedState>(new VisitedState());
@@ -90,7 +88,7 @@ std::unique_ptr<simgrid::mc::VisitedState> is_visited_state(simgrid::mc::State*
   XBT_DEBUG("Snapshot %p of visited state %d (exploration stack state %d)",
     new_state->system_state.get(), new_state->num, graph_state->num);
 
-  auto range = std::equal_range(visited_states.begin(), visited_states.end(),
+  auto range = std::equal_range(states_.begin(), states_.end(),
     new_state.get(), simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap());
 
   if (compare_snpashots)
@@ -126,9 +124,9 @@ std::unique_ptr<simgrid::mc::VisitedState> is_visited_state(simgrid::mc::State*
       }
     }
 
-  XBT_DEBUG("Insert new visited state %d (total : %lu)", new_state->num, (unsigned long) visited_states.size());
-  visited_states.insert(range.first, std::move(new_state));
-  prune_visited_states();
+  XBT_DEBUG("Insert new visited state %d (total : %lu)", new_state->num, (unsigned long) states_.size());
+  states_.insert(range.first, std::move(new_state));
+  this->prune();
   return nullptr;
 }
 

diff --git a/src/mc/VisitedState.hpp b/src/mc/VisitedState.hpp
index 4e0c4fb..3e06ecc 100644 (file)
--- a/src/mc/VisitedState.hpp
+++ b/src/mc/VisitedState.hpp
@@ -27,8 +27,14 @@ struct XBT_PRIVATE VisitedState {
   ~VisitedState();
 };
 
-extern XBT_PRIVATE std::vector<std::unique_ptr<simgrid::mc::VisitedState>> visited_states;
-XBT_PRIVATE std::unique_ptr<simgrid::mc::VisitedState> is_visited_state(simgrid::mc::State* graph_state, bool compare_snpashots);
+class VisitedStates {
+  std::vector<std::unique_ptr<simgrid::mc::VisitedState>> states_;
+public:
+  void clear() { states_.clear(); }
+  std::unique_ptr<simgrid::mc::VisitedState> addVisitedState(simgrid::mc::State* graph_state, bool compare_snpashots);
+private:
+  void prune();
+};
 
 }
 }