Merge branch 'issue105' into 'master'

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

diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp
index 875d4fb460ad6bdb6128ae78a0b33b58bd9da744..eba88b3239858ef128ba8548fe6f83624a69e834 100644 (file)
--- a/src/mc/api/State.cpp
+++ b/src/mc/api/State.cpp
@@ -4,7 +4,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/mc/api/State.hpp"
-#include "src/mc/Session.hpp"
 #include "src/mc/api.hpp"
 #include "src/mc/mc_config.hpp"
 
@@ -13,7 +12,6 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_state, mc, "Logging specific to MC states");
 
 using simgrid::mc::remote;
-using api = simgrid::mc::Api;
 
 namespace simgrid {
 namespace mc {
@@ -22,17 +20,13 @@ long State::expended_states_ = 0;
 
 State::State() : num_(++expended_states_)
 {
-  const unsigned long maxpid = api::get().get_maxpid();
+  const unsigned long maxpid = Api::get().get_maxpid();
   actor_states_.resize(maxpid);
   transition_.reset(new Transition());
   /* Stateful model checking */
   if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination) {
-    auto snapshot_ptr = api::get().take_snapshot(num_);
+    auto snapshot_ptr = Api::get().take_snapshot(num_);
     system_state_     = std::shared_ptr<simgrid::mc::Snapshot>(snapshot_ptr);
-    if (_sg_mc_comms_determinism || _sg_mc_send_determinism) {
-      copy_incomplete_comm_pattern();
-      copy_index_comm_pattern();
-    }
   }
 }
 
@@ -55,63 +49,33 @@ int State::next_transition() const
     const ActorState* actor_state = &actor_states_[aid];
 
     /* Only consider actors (1) marked as interleaving by the checker and (2) currently enabled in the application*/
-    if (not actor_state->is_todo() || not simgrid::mc::session_singleton->actor_is_enabled(aid))
+    if (not actor_state->is_todo() || not Api::get().get_session().actor_is_enabled(aid))
       continue;
 
     return i;
   }
   return -1;
 }
-Transition* State::execute_next(int next)
+void State::execute_next(int next)
 {
   std::vector<ActorInformation>& actors = mc_model_checker->get_remote_process().actors();
 
-  kernel::actor::ActorImpl* actor = actors[next].copy.get_buffer();
+  const kernel::actor::ActorImpl* actor = actors[next].copy.get_buffer();
   aid_t aid                       = actor->get_pid();
   int times_considered;
 
   simgrid::mc::ActorState* actor_state = &actor_states_[aid];
   /* This actor is ready to be executed. Prepare its execution when simcall_handle will be called on it */
-  if (actor->simcall_.observer_ != nullptr) {
-    times_considered = actor_state->get_times_considered_and_inc();
-    if (actor->simcall_.mc_max_consider_ <= actor_state->get_times_considered())
-      actor_state->set_done();
-  } else {
-    times_considered = 0;
+  times_considered = actor_state->get_times_considered_and_inc();
+  if (actor->simcall_.mc_max_consider_ <= actor_state->get_times_considered())
     actor_state->set_done();
-  }
-
-  transition_->init(aid, times_considered);
-  executed_req_ = actor->simcall_;
 
-  XBT_DEBUG("Let's run actor %ld, going for transition %s", aid, transition_->to_cstring());
+  XBT_DEBUG("Let's run actor %ld (times_considered = %d)", aid, times_considered);
 
   Transition::executed_transitions_++;
 
-  Transition* res = mc_model_checker->handle_simcall(*transition_, true);
+  transition_.reset(mc_model_checker->handle_simcall(aid, times_considered, true));
   mc_model_checker->wait_for_requests();
-
-  return res;
 }
-
-void State::copy_incomplete_comm_pattern()
-{
-  incomplete_comm_pattern_.clear();
-  const unsigned long maxpid = api::get().get_maxpid();
-  for (unsigned long i = 0; i < maxpid; i++) {
-    std::vector<simgrid::mc::PatternCommunication> res;
-    for (auto const& comm : incomplete_communications_pattern[i])
-      res.push_back(comm->dup());
-    incomplete_comm_pattern_.push_back(std::move(res));
-  }
-}
-
-void State::copy_index_comm_pattern()
-{
-  communication_indices_.clear();
-  for (auto const& list_process_comm : initial_communications_pattern)
-    this->communication_indices_.push_back(list_process_comm.index_comm);
-}
-
 } // namespace mc
 } // namespace simgrid