X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/75e982c8df081076c4d1c40e94552c4159b46feb..239cd16f4e95031d3a106e487c1485726069f1d7:/src/mc/api/State.cpp diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp index eb193df584..90045f501b 100644 --- a/src/mc/api/State.cpp +++ b/src/mc/api/State.cpp @@ -4,6 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/mc/api/State.hpp" +#include "src/mc/explo/Exploration.hpp" #include "src/mc/mc_config.hpp" #include @@ -14,14 +15,47 @@ namespace simgrid::mc { long State::expended_states_ = 0; -State::State(const RemoteApp& remote_app) : num_(++expended_states_) +State::State(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(num_); + if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination) + system_state_ = std::make_shared(num_, remote_app.get_page_store(), + remote_app.get_remote_process_memory()); +} + +State::State(RemoteApp& remote_app, const State* parent_state) + : num_(++expended_states_), parent_state_(parent_state) +{ + + remote_app.get_actors_status(actors_to_run_); + + /* Stateful model checking */ + if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination) + system_state_ = std::make_shared(num_, remote_app.get_page_store(), + remote_app.get_remote_process_memory()); + + + /* If we want sleep set reduction, copy the sleep set and eventually removes things from it */ + if (_sg_mc_sleep_set) { + /* 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] : parent_state_->get_sleep_set()) { + + if (not parent_state_->get_transition()->depends(&transition)) { + + sleep_set_.emplace(aid, transition); + if (actors_to_run_.count(aid) != 0) { + XBT_DEBUG("Actor %ld will not be explored, for it is in the sleep set", aid); + + actors_to_run_.at(aid).mark_done(); + } + } else + XBT_DEBUG("Transition >>%s<< removed from the sleep set because it was dependent with >>%s<<", + transition.to_string().c_str(), parent_state_->get_transition()->to_string().c_str()); + } } } @@ -30,19 +64,18 @@ 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_enabled_todo() { - for (auto & [aid, actor] : actors_to_run_) { - - if (actor.is_enabled() and not actor.is_done() and not actor.is_todo()) - actor.mark_todo(); - + for (auto const& [aid, _] : this->get_actors_list()) { + if (this->is_actor_enabled(aid) and not is_actor_done(aid)) { + this->mark_todo(aid); } + } } - + Transition* State::get_transition() const { - return transition_.get(); + return transition_; } aid_t State::next_transition() const @@ -50,33 +83,60 @@ aid_t State::next_transition() const XBT_DEBUG("Search for an actor to run. %zu actors to consider", actors_to_run_.size()); for (auto const& [aid, actor] : actors_to_run_) { /* Only consider actors (1) marked as interleaving by the checker and (2) currently enabled in the application */ - if (not actor.is_todo() || not actor.is_enabled()) { + if (not actor.is_todo() || not actor.is_enabled() || actor.is_done()) { - if (not actor.is_todo()) - XBT_DEBUG("Can't run actor %ld because it is not todo", aid); + if (not actor.is_todo()) + XBT_DEBUG("Can't run actor %ld because it is not todo", aid); - if (not actor.is_enabled()) - XBT_DEBUG("Can't run actor %ld because it is not enabled", aid); + if (not actor.is_enabled()) + XBT_DEBUG("Can't run actor %ld because it is not enabled", aid); - continue; + if (actor.is_done()) + XBT_DEBUG("Can't run actor %ld because it has already been done", aid); - - } + continue; + } return aid; } return -1; } -void State::execute_next(aid_t next) + +void State::execute_next(aid_t next, RemoteApp& app) { - /* 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_++; - - transition_.reset(mc_model_checker->handle_simcall(next, times_considered, true)); - mc_model_checker->wait_for_requests(); + auto* just_executed = app.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(just_executed); + actor_state.set_transition(std::move(executed_transition), times_considered); + + app.wait_for_requests(); } } // namespace simgrid::mc