Merge branch 'master' of https://framagit.org/simgrid/simgrid

[simgrid.git] / src / mc / api / State.cpp

diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp
index f4cb228..6fb9160 100644 (file)
--- a/src/mc/api/State.cpp
+++ b/src/mc/api/State.cpp
@@ -18,7 +18,6 @@ State::State(const RemoteApp& remote_app) : num_(++expended_states_)
 {
   remote_app.get_actors_status(actors_to_run_);
 
-  transition_.reset(new Transition());
   /* Stateful model checking */
   if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination) {
     system_state_ = std::make_shared<simgrid::mc::Snapshot>(num_);
@@ -35,10 +34,12 @@ State::State(const RemoteApp& remote_app, const State* previous_state) : num_(++
   if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination) {
     system_state_ = std::make_shared<simgrid::mc::Snapshot>(num_);
   }
-  
+
+  /* For each actor in the previous sleep set, keep it if it is not dependent with current transition.
+   * And if we kept it and the actor is enabled in this state, mark the actor as already done, so that
+   * it is not explored*/
   for (auto & [aid, transition] : previous_state->get_sleep_set()) {
       
-      XBT_DEBUG("Transition >>%s<< will be explored ?", transition.to_string().c_str());
       if (not previous_state->get_transition()->depends(&transition)) {
              
          sleep_set_.emplace(aid, transition);
@@ -60,7 +61,7 @@ std::size_t State::count_todo() const
   return boost::range::count_if(this->actors_to_run_, [](auto& pair) { return pair.second.is_todo(); });
 }
 
-    void State::mark_all_todo() 
+void State::mark_all_todo() 
 {
     for (auto & [aid, actor] : actors_to_run_) {
 
@@ -72,7 +73,7 @@ std::size_t State::count_todo() const
     
 Transition* State::get_transition() const
 {
-  return transition_.get();
+    return transition_;
 }
 
 aid_t State::next_transition() const
@@ -101,16 +102,42 @@ aid_t State::next_transition() const
   }
   return -1;
 }
+
 void State::execute_next(aid_t next)
 {
-  /* This actor is ready to be executed. Prepare its execution when simcall_handle will be called on it */
-  const unsigned times_considered = actors_to_run_.at(next).do_consider();
+  // This actor is ready to be executed. Execution involves three phases:
+
+  // 1. Identify the appropriate ActorState to prepare for execution
+  // when simcall_handle will be called on it
+  auto& actor_state                        = actors_to_run_.at(next);
+  const unsigned times_considered          = actor_state.do_consider();
+  const auto* expected_executed_transition = actor_state.get_transition(times_considered);
+  xbt_assert(expected_executed_transition != nullptr,
+             "Expected a transition with %u times considered to be noted in actor %ld", times_considered, next);
 
   XBT_DEBUG("Let's run actor %ld (times_considered = %u)", next, times_considered);
 
+  // 2. Execute the actor according to the preparation above
   Transition::executed_transitions_++;
+  auto* just_executed = mc_model_checker->handle_simcall(next, times_considered, true);
+  xbt_assert(just_executed->type_ == expected_executed_transition->type_,
+             "The transition that was just executed by actor %ld, viz:\n"
+             "%s\n"
+             "is not what was purportedly scheduled to execute, which was:\n"
+             "%s\n",
+             next, just_executed->to_string().c_str(), expected_executed_transition->to_string().c_str());
+
+  // 3. Update the state with the newest information. This means recording
+  // both
+  //  1. what action was last taken from this state (viz. `executed_transition`)
+  //  2. what action actor `next` was able to take given `times_considered`
+  // The latter update is important as *more* information is potentially available
+  // about a transition AFTER it has executed.
+  transition_ = just_executed;
+
+  auto executed_transition = std::unique_ptr<Transition>(just_executed);
+  actor_state.set_transition(std::move(executed_transition), times_considered);
 
-  transition_.reset(mc_model_checker->handle_simcall(next, times_considered, true));
   mc_model_checker->wait_for_requests();
 }
 } // namespace simgrid::mc