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 19c8b633ca0b3548ca865527fb36ea0ca535dfd1..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,12 +20,12 @@ 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);
   }
 }
@@ -51,7 +49,7 @@ 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;
@@ -72,8 +70,6 @@ void State::execute_next(int next)
   if (actor->simcall_.mc_max_consider_ <= actor_state->get_times_considered())
     actor_state->set_done();
 
-  executed_req_ = actor->simcall_;
-
   XBT_DEBUG("Let's run actor %ld (times_considered = %d)", aid, times_considered);
 
   Transition::executed_transitions_++;