X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a1b70d4280a783c2fb1e3ae43911d8bd44f0bc49..0433449947b08247ca57c84e32f547c35e351145:/src/mc/LivenessChecker.cpp

diff --git a/src/mc/LivenessChecker.cpp b/src/mc/LivenessChecker.cpp
index a99d5e50ff..537dd9bf74 100644
--- a/src/mc/LivenessChecker.cpp
+++ b/src/mc/LivenessChecker.cpp
@@ -29,6 +29,8 @@
 #include "src/mc/mc_replay.h"
 #include "src/mc/mc_safety.h"
 #include "src/mc/mc_exit.h"
+#include "src/mc/Transition.hpp"
+#include "src/mc/Session.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc,
                                 "Logging specific to algorithms for liveness properties verification");
@@ -40,7 +42,8 @@ namespace mc {
 
 VisitedPair::VisitedPair(
   int pair_num, xbt_automaton_state_t automaton_state,
-  std::vector<int> const& atomic_propositions, std::shared_ptr<simgrid::mc::State> graph_state)
+  std::shared_ptr<const std::vector<int>> atomic_propositions,
+  std::shared_ptr<simgrid::mc::State> graph_state)
 {
   simgrid::mc::Process* process = &(mc_model_checker->process());
 
@@ -51,13 +54,12 @@ VisitedPair::VisitedPair(
     process->get_heap()->heaplimit,
     process->get_malloc_info());
 
-  this->nb_processes =
-    mc_model_checker->process().simix_processes().size();
+  this->nb_processes = mc_model_checker->process().simix_processes().size();
 
   this->automaton_state = automaton_state;
   this->num = pair_num;
   this->other_num = -1;
-  this->atomic_propositions = atomic_propositions;
+  this->atomic_propositions = std::move(atomic_propositions);
 }
 
 VisitedPair::~VisitedPair()
@@ -97,14 +99,14 @@ Pair::Pair() : num(++mc_stats->expanded_pairs)
 
 Pair::~Pair() {}
 
-std::vector<int> LivenessChecker::getPropositionValues()
+std::shared_ptr<const std::vector<int>> LivenessChecker::getPropositionValues()
 {
   std::vector<int> values;
   unsigned int cursor = 0;
   xbt_automaton_propositional_symbol_t ps = nullptr;
   xbt_dynar_foreach(simgrid::mc::property_automaton->propositional_symbols, cursor, ps)
     values.push_back(xbt_automaton_propositional_symbol_evaluate(ps));
-  return values;
+  return std::make_shared<const std::vector<int>>(std::move(values));
 }
 
 int LivenessChecker::compare(simgrid::mc::VisitedPair* state1, simgrid::mc::VisitedPair* state2)
@@ -129,16 +131,16 @@ std::shared_ptr<VisitedPair> LivenessChecker::insertAcceptancePair(simgrid::mc::
     std::shared_ptr<simgrid::mc::VisitedPair> const& pair_test = *i;
     if (xbt_automaton_state_compare(
           pair_test->automaton_state, new_pair->automaton_state) != 0
-        || pair_test->atomic_propositions != new_pair->atomic_propositions
+        || *(pair_test->atomic_propositions) != *(new_pair->atomic_propositions)
         || this->compare(pair_test.get(), new_pair.get()) != 0)
       continue;
     XBT_INFO("Pair %d already reached (equal to pair %d) !",
       new_pair->num, pair_test->num);
-    livenessStack_.pop_back();
+    explorationStack_.pop_back();
     if (dot_output != nullptr)
       fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
         initial_global_state->prev_pair, pair_test->num,
-        initial_global_state->prev_req);
+        initial_global_state->prev_req.c_str());
     return nullptr;
   }
 
@@ -157,34 +159,18 @@ void LivenessChecker::removeAcceptancePair(int pair_num)
 
 void LivenessChecker::prepare(void)
 {
-  mc_model_checker->wait_for_requests();
-
   initial_global_state->snapshot = simgrid::mc::take_snapshot(0);
   initial_global_state->prev_pair = 0;
 
+  std::shared_ptr<const std::vector<int>> propos = this->getPropositionValues();
+
+  // For each initial state of the property automaton, push a
+  // (application_state, automaton_state) pair to the exploration stack:
   unsigned int cursor = 0;
   xbt_automaton_state_t automaton_state;
-
-  xbt_dynar_foreach(simgrid::mc::property_automaton->states, cursor, automaton_state) {
-    if (automaton_state->type == -1) {  /* Initial automaton state */
-
-      std::shared_ptr<Pair> initial_pair = std::make_shared<Pair>();
-      initial_pair->automaton_state = automaton_state;
-      initial_pair->graph_state = std::shared_ptr<simgrid::mc::State>(MC_state_new());
-      initial_pair->atomic_propositions = this->getPropositionValues();
-      initial_pair->depth = 1;
-
-      /* Get enabled processes and insert them in the interleave set of the graph_state */
-      for (auto& p : mc_model_checker->process().simix_processes())
-        if (simgrid::mc::process_is_enabled(&p.copy))
-          MC_state_interleave_process(initial_pair->graph_state.get(), &p.copy);
-
-      initial_pair->requests = MC_state_interleave_size(initial_pair->graph_state.get());
-      initial_pair->search_cycle = false;
-
-      livenessStack_.push_back(std::move(initial_pair));
-    }
-  }
+  xbt_dynar_foreach(simgrid::mc::property_automaton->states, cursor, automaton_state)
+    if (automaton_state->type == -1)
+      explorationStack_.push_back(this->newPair(nullptr, automaton_state, propos));
 }
 
 
@@ -194,7 +180,7 @@ void LivenessChecker::replay()
 
   /* Intermediate backtracking */
   if(_sg_mc_checkpoint > 0) {
-    simgrid::mc::Pair* pair = livenessStack_.back().get();
+    simgrid::mc::Pair* pair = explorationStack_.back().get();
     if(pair->graph_state->system_state){
       simgrid::mc::restore_snapshot(pair->graph_state->system_state);
       return;
@@ -206,43 +192,41 @@ void LivenessChecker::replay()
 
   /* Traverse the stack from the initial state and re-execute the transitions */
   int depth = 1;
-  for (std::shared_ptr<Pair> const& pair : livenessStack_) {
-    if (pair == livenessStack_.back())
+  for (std::shared_ptr<Pair> const& pair : explorationStack_) {
+    if (pair == explorationStack_.back())
       break;
 
-      std::shared_ptr<State> state = pair->graph_state;
+    std::shared_ptr<State> state = pair->graph_state;
 
-      if (pair->exploration_started) {
+    if (pair->exploration_started) {
 
-        int value;
-        smx_simcall_t saved_req = MC_state_get_executed_request(state.get(), &value);
+      int req_num = state->transition.argument;
+      smx_simcall_t saved_req = &state->executed_req;
 
-        smx_simcall_t req = nullptr;
+      smx_simcall_t req = nullptr;
 
-        if (saved_req != nullptr) {
-          /* because we got a copy of the executed request, we have to fetch the
+      if (saved_req != nullptr) {
+        /* because we got a copy of the executed request, we have to fetch the
              real one, pointed by the request field of the issuer process */
-          const smx_process_t issuer = MC_smx_simcall_get_issuer(saved_req);
-          req = &issuer->simcall;
-
-          /* Debug information */
-          if (XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)) {
-            char* req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix);
-            XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state.get());
-            xbt_free(req_str);
-          }
-
-        }
-
-        simgrid::mc::handle_simcall(req, value);
-        mc_model_checker->wait_for_requests();
+        const smx_process_t issuer = MC_smx_simcall_get_issuer(saved_req);
+        req = &issuer->simcall;
+
+        /* Debug information */
+        XBT_DEBUG("Replay (depth = %d) : %s (%p)",
+          depth,
+          simgrid::mc::request_to_string(
+            req, req_num, simgrid::mc::RequestType::simix).c_str(),
+          state.get());
       }
 
-      /* Update statistics */
-      mc_stats->visited_pairs++;
-      mc_stats->executed_transitions++;
+      this->getSession().execute(state->transition);
+    }
+
+    /* Update statistics */
+    mc_stats->visited_pairs++;
+    mc_stats->executed_transitions++;
 
-      depth++;
+    depth++;
 
   }
 
@@ -269,7 +253,7 @@ int LivenessChecker::insertVisitedPair(std::shared_ptr<VisitedPair> visited_pair
     VisitedPair* pair_test = i->get();
     if (xbt_automaton_state_compare(
           pair_test->automaton_state, visited_pair->automaton_state) != 0
-        || pair_test->atomic_propositions != visited_pair->atomic_propositions
+        || *(pair_test->atomic_propositions) != *(visited_pair->atomic_propositions)
         || this->compare(pair_test, visited_pair.get()) != 0)
         continue;
     if (pair_test->other_num == -1)
@@ -277,8 +261,7 @@ int LivenessChecker::insertVisitedPair(std::shared_ptr<VisitedPair> visited_pair
     else
       visited_pair->other_num = pair_test->other_num;
     if (dot_output == nullptr)
-      XBT_DEBUG("Pair %d already visited ! (equal to pair %d)",
-      visited_pair->num, pair_test->num);
+      XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", visited_pair->num, pair_test->num);
     else
       XBT_DEBUG("Pair %d already visited ! (equal to pair %d (pair %d in dot_output))",
         visited_pair->num, pair_test->num, visited_pair->other_num);
@@ -313,15 +296,8 @@ LivenessChecker::~LivenessChecker()
 RecordTrace LivenessChecker::getRecordTrace() // override
 {
   RecordTrace res;
-  for (std::shared_ptr<Pair> const& pair : livenessStack_) {
-    int value;
-    smx_simcall_t req = MC_state_get_executed_request(pair->graph_state.get(), &value);
-    if (req && req->call != SIMCALL_NONE) {
-      smx_process_t issuer = MC_smx_simcall_get_issuer(req);
-      const int pid = issuer->pid;
-      res.push_back(RecordTraceElement(pid, value));
-    }
-  }
+  for (std::shared_ptr<Pair> const& pair : explorationStack_)
+    res.push_back(pair->graph_state->getTransition());
   return res;
 }
 
@@ -341,155 +317,107 @@ void LivenessChecker::showAcceptanceCycle(std::size_t depth)
 std::vector<std::string> LivenessChecker::getTextualTrace() // override
 {
   std::vector<std::string> trace;
-  for (std::shared_ptr<Pair> const& pair : livenessStack_) {
-    int value;
-    smx_simcall_t req = MC_state_get_executed_request(pair->graph_state.get(), &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);
-    }
+  for (std::shared_ptr<Pair> const& pair : explorationStack_) {
+    int req_num = pair->graph_state->transition.argument;
+    smx_simcall_t req = &pair->graph_state->executed_req;
+    if (req && req->call != SIMCALL_NONE)
+      trace.push_back(simgrid::mc::request_to_string(
+        req, req_num, simgrid::mc::RequestType::executed));
   }
   return trace;
 }
 
 int LivenessChecker::main(void)
 {
-  int visited_num = -1;
-
-  while (!livenessStack_.empty()){
-
-    /* Get current pair */
-    std::shared_ptr<Pair> current_pair = livenessStack_.back();
+  while (!explorationStack_.empty()){
+    std::shared_ptr<Pair> current_pair = explorationStack_.back();
 
     /* Update current state in buchi automaton */
     simgrid::mc::property_automaton->current_state = current_pair->automaton_state;
 
-    XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d, interleave size = %d, pair_num = %d, requests = %d)",
+    XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d, interleave size = %zd, pair_num = %d, requests = %d)",
        current_pair->depth, current_pair->search_cycle,
-       MC_state_interleave_size(current_pair->graph_state.get()), current_pair->num,
+       current_pair->graph_state->interleaveSize(),
+       current_pair->num,
        current_pair->requests);
 
-    if (current_pair->requests > 0) {
+    if (current_pair->requests == 0) {
+      this->backtrack();
+      continue;
+    }
 
-      std::shared_ptr<VisitedPair> reached_pair;
-      if (current_pair->automaton_state->type == 1 && !current_pair->exploration_started
-          && (reached_pair = this->insertAcceptancePair(current_pair.get())) == nullptr) {
-        this->showAcceptanceCycle(current_pair->depth);
-        return SIMGRID_MC_EXIT_LIVENESS;
-      }
+    std::shared_ptr<VisitedPair> reached_pair;
+    if (current_pair->automaton_state->type == 1 && !current_pair->exploration_started
+        && (reached_pair = this->insertAcceptancePair(current_pair.get())) == nullptr) {
+      this->showAcceptanceCycle(current_pair->depth);
+      return SIMGRID_MC_EXIT_LIVENESS;
+    }
 
-      /* Pair already visited ? stop the exploration on the current path */
-      if ((!current_pair->exploration_started)
-        && (visited_num = this->insertVisitedPair(
-          reached_pair, current_pair.get())) != -1) {
-
-        if (dot_output != nullptr){
-          fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, visited_num, initial_global_state->prev_req);
-          fflush(dot_output);
-        }
-
-        XBT_DEBUG("Pair already visited (equal to pair %d), exploration on the current path stopped.", visited_num);
-        current_pair->requests = 0;
-        goto backtracking;
-
-      }else{
-
-        int value;
-        smx_simcall_t req = MC_state_get_request(current_pair->graph_state.get(), &value);
-
-         if (dot_output != nullptr) {
-           if (initial_global_state->prev_pair != 0 && initial_global_state->prev_pair != current_pair->num) {
-             fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, current_pair->num, initial_global_state->prev_req);
-             xbt_free(initial_global_state->prev_req);
-           }
-           initial_global_state->prev_pair = current_pair->num;
-           initial_global_state->prev_req = simgrid::mc::request_get_dot_output(req, value);
-           if (current_pair->search_cycle)
-             fprintf(dot_output, "%d [shape=doublecircle];\n", current_pair->num);
-           fflush(dot_output);
-         }
-
-         char* req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix);
-         XBT_DEBUG("Execute: %s", req_str);
-         xbt_free(req_str);
-
-         /* Set request as executed */
-         MC_state_set_executed_request(current_pair->graph_state.get(), req, value);
-
-         /* Update mc_stats */
-         mc_stats->executed_transitions++;
-         if (!current_pair->exploration_started)
-           mc_stats->visited_pairs++;
-
-         /* Answer the request */
-         simgrid::mc::handle_simcall(req, value);
-
-         /* Wait for requests (schedules processes) */
-         mc_model_checker->wait_for_requests();
-
-         current_pair->requests--;
-         current_pair->exploration_started = true;
-
-         /* Get values of atomic propositions (variables used in the property formula) */
-         std::vector<int> prop_values = this->getPropositionValues();
-
-         /* Evaluate enabled/true transitions in automaton according to atomic propositions values and create new pairs */
-         int cursor = xbt_dynar_length(current_pair->automaton_state->out) - 1;
-         while (cursor >= 0) {
-           xbt_automaton_transition_t transition_succ = (xbt_automaton_transition_t)xbt_dynar_get_as(current_pair->automaton_state->out, cursor, xbt_automaton_transition_t);
-           if (evaluate_label(transition_succ->label, prop_values)) {
-              std::shared_ptr<Pair> next_pair = std::make_shared<Pair>();
-              next_pair->graph_state = std::shared_ptr<simgrid::mc::State>(MC_state_new());
-              next_pair->automaton_state = transition_succ->dst;
-              next_pair->atomic_propositions = this->getPropositionValues();
-              next_pair->depth = current_pair->depth + 1;
-              /* Get enabled processes and insert them in the interleave set of the next graph_state */
-              for (auto& p : mc_model_checker->process().simix_processes())
-                if (simgrid::mc::process_is_enabled(&p.copy))
-                  MC_state_interleave_process(next_pair->graph_state.get(), &p.copy);
-
-              next_pair->requests = MC_state_interleave_size(next_pair->graph_state.get());
-
-              /* FIXME : get search_cycle value for each acceptant state */
-              if (next_pair->automaton_state->type == 1 || current_pair->search_cycle)
-                next_pair->search_cycle = true;
-
-              /* Add new pair to the exploration stack */
-              livenessStack_.push_back(std::move(next_pair));
-
-           }
-           cursor--;
-         }
-
-      } /* End of visited_pair test */
+    /* Pair already visited ? stop the exploration on the current path */
+    int visited_num = -1;
+    if ((!current_pair->exploration_started)
+      && (visited_num = this->insertVisitedPair(
+        reached_pair, current_pair.get())) != -1) {
+      if (dot_output != nullptr){
+        fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
+          initial_global_state->prev_pair, visited_num,
+          initial_global_state->prev_req.c_str());
+        fflush(dot_output);
+      }
+      XBT_DEBUG("Pair already visited (equal to pair %d), exploration on the current path stopped.", visited_num);
+      current_pair->requests = 0;
+      this->backtrack();
+      continue;
+    }
 
-    } else {
+    smx_simcall_t req = MC_state_get_request(current_pair->graph_state.get());
+    int req_num = current_pair->graph_state->transition.argument;
 
-    backtracking:
-      if(visited_num == -1)
-        XBT_DEBUG("No more request to execute. Looking for backtracking point.");
-
-      /* Traverse the stack backwards until a pair with a non empty interleave
-         set is found, deleting all the pairs that have it empty in the way. */
-      while (!livenessStack_.empty()) {
-        std::shared_ptr<simgrid::mc::Pair> current_pair = livenessStack_.back();
-        livenessStack_.pop_back();
-        if (current_pair->requests > 0) {
-          /* We found a backtracking point */
-          XBT_DEBUG("Backtracking to depth %d", current_pair->depth);
-          livenessStack_.push_back(std::move(current_pair));
-          this->replay();
-          XBT_DEBUG("Backtracking done");
-          break;
-        }else{
-          XBT_DEBUG("Delete pair %d at depth %d", current_pair->num, current_pair->depth);
-          if (current_pair->automaton_state->type == 1)
-            this->removeAcceptancePair(current_pair->num);
-        }
+    if (dot_output != nullptr) {
+      if (initial_global_state->prev_pair != 0 && initial_global_state->prev_pair != current_pair->num) {
+        fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
+          initial_global_state->prev_pair, current_pair->num,
+          initial_global_state->prev_req.c_str());
+        initial_global_state->prev_req.clear();
       }
+      initial_global_state->prev_pair = current_pair->num;
+      initial_global_state->prev_req = simgrid::mc::request_get_dot_output(req, req_num);
+      if (current_pair->search_cycle)
+        fprintf(dot_output, "%d [shape=doublecircle];\n", current_pair->num);
+      fflush(dot_output);
+    }
+
+    XBT_DEBUG("Execute: %s",
+      simgrid::mc::request_to_string(
+        req, req_num, simgrid::mc::RequestType::simix).c_str());
+
+    /* Update mc_stats */
+    mc_stats->executed_transitions++;
+    if (!current_pair->exploration_started)
+      mc_stats->visited_pairs++;
+
+    /* Answer the request */
+    mc_model_checker->handle_simcall(current_pair->graph_state->transition);
+
+    /* Wait for requests (schedules processes) */
+    mc_model_checker->wait_for_requests();
+
+    current_pair->requests--;
+    current_pair->exploration_started = true;
 
-    } /* End of if (current_pair->requests > 0) else ... */
+    /* Get values of atomic propositions (variables used in the property formula) */
+    std::shared_ptr<const std::vector<int>> prop_values = this->getPropositionValues();
+
+    // For each enabled transition in the property automaton, push a
+    // (application_state, automaton_state) pair to the exploration stack:
+    int cursor = xbt_dynar_length(current_pair->automaton_state->out) - 1;
+    while (cursor >= 0) {
+      xbt_automaton_transition_t transition_succ = (xbt_automaton_transition_t)xbt_dynar_get_as(current_pair->automaton_state->out, cursor, xbt_automaton_transition_t);
+      if (evaluate_label(transition_succ->label, *prop_values))
+          explorationStack_.push_back(this->newPair(
+            current_pair.get(), transition_succ->dst, prop_values));
+       cursor--;
+     }
 
   }
 
@@ -498,6 +426,52 @@ int LivenessChecker::main(void)
   return SIMGRID_MC_EXIT_SUCCESS;
 }
 
+std::shared_ptr<Pair> LivenessChecker::newPair(Pair* current_pair, xbt_automaton_state_t state, std::shared_ptr<const std::vector<int>> propositions)
+{
+  std::shared_ptr<Pair> next_pair = std::make_shared<Pair>();
+  next_pair->automaton_state = state;
+  next_pair->graph_state = std::shared_ptr<simgrid::mc::State>(MC_state_new());
+  next_pair->atomic_propositions = std::move(propositions);
+  if (current_pair)
+    next_pair->depth = current_pair->depth + 1;
+  else
+    next_pair->depth = 1;
+  /* Get enabled processes and insert them in the interleave set of the next graph_state */
+  for (auto& p : mc_model_checker->process().simix_processes())
+    if (simgrid::mc::process_is_enabled(&p.copy))
+      next_pair->graph_state->interleave(&p.copy);
+  next_pair->requests = next_pair->graph_state->interleaveSize();
+  /* FIXME : get search_cycle value for each acceptant state */
+  if (next_pair->automaton_state->type == 1 ||
+      (current_pair && current_pair->search_cycle))
+    next_pair->search_cycle = true;
+  else
+    next_pair->search_cycle = false;
+  return std::move(next_pair);
+}
+
+void LivenessChecker::backtrack()
+{
+  /* Traverse the stack backwards until a pair with a non empty interleave
+     set is found, deleting all the pairs that have it empty in the way. */
+  while (!explorationStack_.empty()) {
+    std::shared_ptr<simgrid::mc::Pair> current_pair = explorationStack_.back();
+    explorationStack_.pop_back();
+    if (current_pair->requests > 0) {
+      /* We found a backtracking point */
+      XBT_DEBUG("Backtracking to depth %d", current_pair->depth);
+      explorationStack_.push_back(std::move(current_pair));
+      this->replay();
+      XBT_DEBUG("Backtracking done");
+      break;
+    } else {
+      XBT_DEBUG("Delete pair %d at depth %d", current_pair->num, current_pair->depth);
+      if (current_pair->automaton_state->type == 1)
+        this->removeAcceptancePair(current_pair->num);
+    }
+  }
+}
+
 int LivenessChecker::run()
 {
   XBT_INFO("Check the liveness property %s", _sg_mc_property_file);