[mc] Remove VisitedPair::acceptance_pair

[simgrid.git] / src / mc / LivenessChecker.hpp

diff --git a/src/mc/LivenessChecker.hpp b/src/mc/LivenessChecker.hpp
index 6b2fcbb..6988690 100644 (file)
--- a/src/mc/LivenessChecker.hpp
+++ b/src/mc/LivenessChecker.hpp
@@ -11,6 +11,8 @@
 
 #include <string>
 #include <list>
+#include <memory>
+#include <vector>
 
 #include <simgrid_config.h>
 #include <xbt/base.h>
@@ -31,13 +33,13 @@ extern XBT_PRIVATE xbt_automaton_t property_automaton;
 
 struct XBT_PRIVATE Pair {
   int num = 0;
-  int search_cycle = 0;
+  bool search_cycle = false;
   std::shared_ptr<simgrid::mc::State> graph_state = nullptr; /* System state included */
   xbt_automaton_state_t automaton_state = nullptr;
-  simgrid::xbt::unique_ptr<s_xbt_dynar_t> atomic_propositions;
+  std::vector<int> atomic_propositions;
   int requests = 0;
   int depth = 0;
-  int exploration_started = 0;
+  bool exploration_started = false;
 
   Pair();
   ~Pair();
@@ -49,23 +51,20 @@ struct XBT_PRIVATE Pair {
 struct XBT_PRIVATE VisitedPair {
   int num = 0;
   int other_num = 0; /* Dot output for */
-  int acceptance_pair = 0;
   std::shared_ptr<simgrid::mc::State> graph_state = nullptr; /* System state included */
   xbt_automaton_state_t automaton_state = nullptr;
-  simgrid::xbt::unique_ptr<s_xbt_dynar_t> atomic_propositions;
+  std::vector<int> atomic_propositions;
   std::size_t heap_bytes_used = 0;
   int nb_processes = 0;
-  int acceptance_removed = 0;
-  int visited_removed = 0;
 
   VisitedPair(
     int pair_num, xbt_automaton_state_t automaton_state,
-    xbt_dynar_t atomic_propositions,
+    std::vector<int> const& atomic_propositions,
     std::shared_ptr<simgrid::mc::State> graph_state);
   ~VisitedPair();
 };
 
-class LivenessChecker : public Checker {
+class XBT_PRIVATE LivenessChecker : public Checker {
 public:
   LivenessChecker(Session& session);
   ~LivenessChecker();
@@ -76,15 +75,16 @@ private:
   int main();
   void prepare();
   int compare(simgrid::mc::VisitedPair* state1, simgrid::mc::VisitedPair* state2);
-  simgrid::xbt::unique_ptr<s_xbt_dynar_t> getPropositionValues();
-  simgrid::mc::VisitedPair* insertAcceptancePair(simgrid::mc::Pair* pair);
-  int insertVisitedPair(simgrid::mc::VisitedPair* visited_pair, simgrid::mc::Pair* pair);
+  std::vector<int> getPropositionValues();
+  std::shared_ptr<VisitedPair> insertAcceptancePair(simgrid::mc::Pair* pair);
+  int insertVisitedPair(std::shared_ptr<VisitedPair> visited_pair, simgrid::mc::Pair* pair);
   void showAcceptanceCycle(std::size_t depth);
   void replay();
   void removeAcceptancePair(int pair_num);
-public: // (non-static wannabe) fields
-  static std::list<VisitedPair*> acceptance_pairs;
-  static std::list<Pair*> liveness_stack;
+public:
+  std::list<std::shared_ptr<VisitedPair>> acceptancePairs_;
+  std::list<Pair*> livenessStack_;
+  std::list<std::shared_ptr<VisitedPair>> visitedPairs_;
 };
 
 }