[mc] Let the Checker give us the current trace

Now we don't have any dependency on mc_stack outside of the Checkers
and we can make it a member of Checker and a C++ container.

diff --git a/src/mc/Checker.cpp b/src/mc/Checker.cpp
index 89065a1..1fefd9d 100644 (file)
--- a/src/mc/Checker.cpp
+++ b/src/mc/Checker.cpp
@@ -25,10 +25,17 @@ Checker::~Checker()
 {
 }
 
+// virtual
 RecordTrace Checker::getRecordTrace()
 {
   return {};
 }
 
+// virtual
+std::vector<std::string> Checker::getTextualTrace()
+{
+  return {};
+}
+
 }
 }

diff --git a/src/mc/Checker.hpp b/src/mc/Checker.hpp
index db9c2ae..21e6ecc 100644 (file)
--- a/src/mc/Checker.hpp
+++ b/src/mc/Checker.hpp
@@ -46,6 +46,7 @@ public:
    *  Could this be handled in the Session/ModelChecker instead?
    */
   virtual RecordTrace getRecordTrace();
+  virtual std::vector<std::string> getTextualTrace();
 
 protected:
   Session& getSession() { return *session_; }

diff --git a/src/mc/CommunicationDeterminismChecker.cpp b/src/mc/CommunicationDeterminismChecker.cpp
index 968d60a..935568d 100644 (file)
--- a/src/mc/CommunicationDeterminismChecker.cpp
+++ b/src/mc/CommunicationDeterminismChecker.cpp
@@ -330,6 +330,25 @@ RecordTrace CommunicationDeterminismChecker::getRecordTrace() // override
   return std::move(res);
 }
 
+// TODO, deduplicate with SafetyChecker
+std::vector<std::string> CommunicationDeterminismChecker::getTextualTrace() // override
+{
+  std::vector<std::string> res;
+  for (xbt_fifo_item_t item = xbt_fifo_get_last_item(mc_stack);
+       item; item = xbt_fifo_get_prev_item(item)) {
+    mc_state_t state = (mc_state_t)xbt_fifo_get_item_content(item);
+    int value;
+    smx_simcall_t req = MC_state_get_executed_request(state, &value);
+    if (req) {
+      char* req_str = simgrid::mc::request_to_string(
+        req, value, simgrid::mc::RequestType::executed);
+      res.push_back(req_str);
+      xbt_free(req_str);
+    }
+  }
+  return std::move(res);
+}
+
 void CommunicationDeterminismChecker::prepare()
 {
   mc_state_t initial_state = nullptr;

diff --git a/src/mc/CommunicationDeterminismChecker.hpp b/src/mc/CommunicationDeterminismChecker.hpp
index 062348d..e04657c 100644 (file)
--- a/src/mc/CommunicationDeterminismChecker.hpp
+++ b/src/mc/CommunicationDeterminismChecker.hpp
@@ -19,6 +19,7 @@ public:
   ~CommunicationDeterminismChecker();
   int run() override;
   RecordTrace getRecordTrace() override;
+  std::vector<std::string> getTextualTrace() override;
 private:
   void prepare();
   int main();

diff --git a/src/mc/LivenessChecker.cpp b/src/mc/LivenessChecker.cpp
index 6a0a1c7..1668518 100644 (file)
--- a/src/mc/LivenessChecker.cpp
+++ b/src/mc/LivenessChecker.cpp
@@ -135,33 +135,6 @@ Pair::~Pair() {
     MC_state_delete(this->graph_state, 1);
 }
 
-void LivenessChecker::showStack(xbt_fifo_t stack)
-{
-  int value;
-  simgrid::mc::Pair* pair;
-  xbt_fifo_item_t item;
-  smx_simcall_t req;
-  char *req_str = nullptr;
-
-  for (item = xbt_fifo_get_last_item(stack);
-       item; item = xbt_fifo_get_prev_item(item)) {
-    pair = (simgrid::mc::Pair*) xbt_fifo_get_item_content(item);
-    req = MC_state_get_executed_request(pair->graph_state, &value);
-    if (req && req->call != SIMCALL_NONE) {
-      req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::executed);
-      XBT_INFO("%s", req_str);
-      xbt_free(req_str);
-    }
-  }
-}
-
-void LivenessChecker::dumpStack(xbt_fifo_t stack)
-{
-  simgrid::mc::Pair* pair;
-  while ((pair = (simgrid::mc::Pair*) xbt_fifo_pop(stack)) != nullptr)
-    delete pair;
-}
-
 simgrid::xbt::unique_ptr<s_xbt_dynar_t> LivenessChecker::getPropositionValues()
 {
   unsigned int cursor = 0;
@@ -454,12 +427,29 @@ void LivenessChecker::showAcceptanceCycle(std::size_t depth)
   XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
   XBT_INFO("Counter-example that violates formula :");
   simgrid::mc::dumpRecordPath();
-  this->showStack(mc_stack);
-  this->dumpStack(mc_stack);
+  for (auto& s : this->getTextualTrace())
+    XBT_INFO("%s", s.c_str());
   MC_print_statistics(mc_stats);
   XBT_INFO("Counter-example depth : %zd", depth);
 }
 
+std::vector<std::string> LivenessChecker::getTextualTrace() // override
+{
+  std::vector<std::string> trace;
+  for (xbt_fifo_item_t item = xbt_fifo_get_last_item(mc_stack);
+       item; item = xbt_fifo_get_prev_item(item)) {
+    simgrid::mc::Pair* pair = (simgrid::mc::Pair*) xbt_fifo_get_item_content(item);
+    int value;
+    smx_simcall_t req = MC_state_get_executed_request(pair->graph_state, &value);
+    if (req && req->call != SIMCALL_NONE) {
+      char* req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::executed);
+      trace.push_back(std::string(req_str));
+      xbt_free(req_str);
+    }
+  }
+  return std::move(trace);
+}
+
 int LivenessChecker::main(void)
 {
   simgrid::mc::Pair* current_pair = nullptr;

diff --git a/src/mc/LivenessChecker.hpp b/src/mc/LivenessChecker.hpp
index 2811f93..263bde4 100644 (file)
--- a/src/mc/LivenessChecker.hpp
+++ b/src/mc/LivenessChecker.hpp
@@ -67,12 +67,11 @@ public:
   ~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);

diff --git a/src/mc/SafetyChecker.cpp b/src/mc/SafetyChecker.cpp
index c8caba1..2c9ca22 100644 (file)
--- a/src/mc/SafetyChecker.cpp
+++ b/src/mc/SafetyChecker.cpp
@@ -39,7 +39,8 @@ static void MC_show_non_termination(void)
   XBT_INFO("*** NON-PROGRESSIVE CYCLE DETECTED ***");
   XBT_INFO("******************************************");
   XBT_INFO("Counter-example execution trace:");
-  MC_dump_stack_safety(mc_stack);
+  for (auto& s : mc_model_checker->getChecker()->getTextualTrace())
+    XBT_INFO("%s", s.c_str());
   MC_print_statistics(mc_stats);
 }
 
@@ -86,6 +87,24 @@ RecordTrace SafetyChecker::getRecordTrace() // override
   return std::move(res);
 }
 
+std::vector<std::string> SafetyChecker::getTextualTrace() // override
+{
+  std::vector<std::string> trace;
+  for (xbt_fifo_item_t item = xbt_fifo_get_last_item(mc_stack);
+       item; item = xbt_fifo_get_prev_item(item)) {
+    mc_state_t state = (mc_state_t)xbt_fifo_get_item_content(item);
+    int value;
+    smx_simcall_t req = MC_state_get_executed_request(state, &value);
+    if (req) {
+      char* req_str = simgrid::mc::request_to_string(
+        req, value, simgrid::mc::RequestType::executed);
+      trace.push_back(req_str);
+      xbt_free(req_str);
+    }
+  }
+  return std::move(trace);
+}
+
 int SafetyChecker::run()
 {
   this->init();

diff --git a/src/mc/SafetyChecker.hpp b/src/mc/SafetyChecker.hpp
index 084ce89..48edb7b 100644 (file)
--- a/src/mc/SafetyChecker.hpp
+++ b/src/mc/SafetyChecker.hpp
@@ -20,6 +20,7 @@ public:
   ~SafetyChecker();
   int run() override;
   RecordTrace getRecordTrace() override;
+  std::vector<std::string> getTextualTrace() override;
 private:
   // Temp
   void init();

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 9f8e1a1..4885373 100644 (file)
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -201,49 +201,14 @@ void MC_replay(xbt_fifo_t stack)
   XBT_DEBUG("**** End Replay ****");
 }
 
-/**
- * \brief Dumps the contents of a model-checker's stack and shows the actual
- *        execution trace
- * \param stack The stack to dump
- */
-void MC_dump_stack_safety(xbt_fifo_t stack)
-{
-  MC_show_stack_safety(stack);
-  
-  mc_state_t state;
-
-  while ((state = (mc_state_t) xbt_fifo_pop(stack)) != nullptr)
-    MC_state_delete(state, !state->in_visited_states ? 1 : 0);
-}
-
-
-void MC_show_stack_safety(xbt_fifo_t stack)
-{
-  int value;
-  mc_state_t state;
-  xbt_fifo_item_t item;
-  smx_simcall_t req;
-  char *req_str = nullptr;
-
-  for (item = xbt_fifo_get_last_item(stack);
-       item; item = xbt_fifo_get_prev_item(item)) {
-    state = (mc_state_t)xbt_fifo_get_item_content(item);
-    req = MC_state_get_executed_request(state, &value);
-    if (req) {
-      req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::executed);
-      XBT_INFO("%s", req_str);
-      xbt_free(req_str);
-    }
-  }
-}
-
 void MC_show_deadlock(void)
 {
   XBT_INFO("**************************");
   XBT_INFO("*** DEAD-LOCK DETECTED ***");
   XBT_INFO("**************************");
   XBT_INFO("Counter-example execution trace:");
-  MC_dump_stack_safety(mc_stack);
+  for (auto& s : mc_model_checker->getChecker()->getTextualTrace())
+    XBT_INFO("%s", s.c_str());
   MC_print_statistics(mc_stats);
 }
 
@@ -355,7 +320,8 @@ void MC_report_assertion_error(void)
   XBT_INFO("**************************");
   XBT_INFO("Counter-example execution trace:");
   simgrid::mc::dumpRecordPath();
-  MC_dump_stack_safety(mc_stack);
+  for (auto& s : mc_model_checker->getChecker()->getTextualTrace())
+    XBT_INFO("%s", s.c_str());
   MC_print_statistics(mc_stats);
 }
 
@@ -374,7 +340,8 @@ void MC_report_crash(int status)
     XBT_INFO("No core dump was generated by the system.");
   XBT_INFO("Counter-example execution trace:");
   simgrid::mc::dumpRecordPath();
-  MC_dump_stack_safety(mc_stack);
+  for (auto& s : mc_model_checker->getChecker()->getTextualTrace())
+    XBT_INFO("%s", s.c_str());
   MC_print_statistics(mc_stats);
 }
 

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index 3696409..28f7dfb 100644 (file)
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -66,8 +66,6 @@ XBT_PRIVATE extern int user_max_depth_reached;
 
 XBT_PRIVATE void MC_replay(xbt_fifo_t stack);
 XBT_PRIVATE void MC_show_deadlock(void);
-XBT_PRIVATE void MC_show_stack_safety(xbt_fifo_t stack);
-XBT_PRIVATE void MC_dump_stack_safety(xbt_fifo_t stack);
 
 /** Stack (of `mc_state_t`) representing the current position of the
  *  the MC in the exploration graph