X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/520b0f15d0e4c1a831be0041652f7ae8e60850a4..517f86be9ef7be0099cc50dfd103786fc80552d1:/src/mc/LivenessChecker.hpp

diff --git a/src/mc/LivenessChecker.hpp b/src/mc/LivenessChecker.hpp
index 355e33f13a..72bec38aec 100644
--- a/src/mc/LivenessChecker.hpp
+++ b/src/mc/LivenessChecker.hpp
@@ -12,6 +12,7 @@
 #include <string>
 #include <list>
 #include <memory>
+#include <vector>
 
 #include <simgrid_config.h>
 #include <xbt/base.h>
@@ -35,7 +36,7 @@ struct XBT_PRIVATE Pair {
   int search_cycle = 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;
   int requests = 0;
   int depth = 0;
   int exploration_started = 0;
@@ -53,18 +54,18 @@ struct XBT_PRIVATE VisitedPair {
   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;
 
   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();
@@ -75,16 +76,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();
+  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<std::shared_ptr<VisitedPair>> acceptance_pairs;
-  static std::list<Pair*> liveness_stack;
-  static std::list<std::shared_ptr<VisitedPair>> visited_pairs;
+public:
+  std::list<std::shared_ptr<VisitedPair>> acceptancePairs_;
+  std::list<Pair*> livenessStack_;
+  std::list<std::shared_ptr<VisitedPair>> visitedPairs_;
 };
 
 }