[mc] Use std::list instead of xbt_fifo for the stack in LivenessChecker

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

diff --git a/src/mc/LivenessChecker.hpp b/src/mc/LivenessChecker.hpp
index 918c855..962bf64 100644 (file)
--- a/src/mc/LivenessChecker.hpp
+++ b/src/mc/LivenessChecker.hpp
@@ -7,11 +7,13 @@
 #ifndef SIMGRID_MC_LIVENESS_CHECKER_HPP
 #define SIMGRID_MC_LIVENESS_CHECKER_HPP
 
-#include <stdint.h>
+#include <cstddef>
+
+#include <string>
+#include <list>
 
 #include <simgrid_config.h>
 #include <xbt/base.h>
-#include <xbt/fifo.h>
 #include <xbt/dynar.h>
 #include <xbt/automaton.h>
 #include <xbt/memory.hpp>
@@ -30,7 +32,7 @@ extern XBT_PRIVATE xbt_automaton_t property_automaton;
 struct XBT_PRIVATE Pair {
   int num = 0;
   int search_cycle = 0;
-  mc_state_t graph_state = nullptr; /* System state included */
+  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;
   int requests = 0;
@@ -49,15 +51,15 @@ struct XBT_PRIVATE VisitedPair {
   int num = 0;
   int other_num = 0; /* Dot output for */
   int acceptance_pair = 0;
-  mc_state_t graph_state = nullptr; /* System state included */
+  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;
-  size_t heap_bytes_used = 0;
+  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, mc_state_t graph_state);
+  VisitedPair(int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions, simgrid::mc::State* graph_state);
   ~VisitedPair();
 };
 
@@ -66,18 +68,21 @@ public:
   LivenessChecker(Session& session);
   ~LivenessChecker();
   int run() override;
+  RecordTrace getRecordTrace() override;
+  std::vector<std::string> getTextualTrace() override;
 private:
   int main();
   void prepare();
   int compare(simgrid::mc::VisitedPair* state1, simgrid::mc::VisitedPair* state2);
-  void dumpStack(xbt_fifo_t stack);
-  void showStack(xbt_fifo_t stack);
   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);
   void showAcceptanceCycle(std::size_t depth);
-  void replay(xbt_fifo_t stack);
+  void replay();
   void removeAcceptancePair(int pair_num);
+public: // (non-static wannabe) fields
+  static xbt_dynar_t acceptance_pairs;
+  static std::list<Pair*> liveness_stack;
 };
 
 }