State::State(unsigned long state_number) : num_(state_number)
{
this->internal_comm.clear();
- std::memset(&this->internal_req, 0, sizeof(this->internal_req));
- std::memset(&this->executed_req_, 0, sizeof(this->executed_req_));
+ this->internal_req = s_smx_simcall();
+ this->executed_req_ = s_smx_simcall();
actor_states_.resize(MC_smx_get_maxpid());
/* Stateful model checking */
std::size_t State::interleave_size() const
{
- return boost::range::count_if(this->actor_states_, [](simgrid::mc::ProcessState const& p) { return p.is_todo(); });
+ return boost::range::count_if(this->actor_states_, [](simgrid::mc::ActorState const& a) { return a.is_todo(); });
}
Transition State::get_transition() const
* This can be seen as an iterator returning the next transition of the process.
*
* We only consider the processes that are both
- * - marked "to be interleaved" in their ProcessState (controlled by the checker algorithm).
+ * - marked "to be interleaved" in their ActorState (controlled by the checker algorithm).
* - which simcall can currently be executed (like a comm where the other partner is already known)
* Once we returned the last enabled transition of a process, it is marked done.
*
* Things can get muddled with the WAITANY and TESTANY simcalls, that are rewritten on the fly to a bunch of WAIT
* (resp TEST) transitions using the transition.argument field to remember what was the last returned sub-transition.
*/
-static inline smx_simcall_t MC_state_get_request_for_process(simgrid::mc::State* state, smx_actor_t actor)
+static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::State* state, smx_actor_t actor)
{
/* reset the outgoing transition */
- simgrid::mc::ProcessState* procstate = &state->actor_states_[actor->get_pid()];
+ simgrid::mc::ActorState* procstate = &state->actor_states_[actor->get_pid()];
state->transition_.pid_ = -1;
state->transition_.argument_ = -1;
state->executed_req_.call_ = SIMCALL_NONE;
mc_model_checker->process().read(temp_act, remote_act);
simgrid::kernel::activity::CommImpl* act = temp_act.get_buffer();
if (act->src_actor_.get() && act->dst_actor_.get())
- state->transition_.argument_ = 0;
+ state->transition_.argument_ = 0; // OK
else if (act->src_actor_.get() == nullptr && act->type_ == simgrid::kernel::activity::CommImpl::Type::READY &&
act->detached())
- state->transition_.argument_ = 0;
+ state->transition_.argument_ = 0; // OK
else
- state->transition_.argument_ = -1;
+ state->transition_.argument_ = -1; // timeout
procstate->set_done();
req = &actor->simcall;
break;
return req;
}
-smx_simcall_t MC_state_get_request(simgrid::mc::State* state)
+smx_simcall_t MC_state_choose_request(simgrid::mc::State* state)
{
for (auto& actor : mc_model_checker->process().actors()) {
/* Only consider the actors that were marked as interleaving by the checker algorithm */
if (not state->actor_states_[actor.copy.get_buffer()->get_pid()].is_todo())
continue;
- smx_simcall_t res = MC_state_get_request_for_process(state, actor.copy.get_buffer());
+ smx_simcall_t res = MC_state_choose_request_for_process(state, actor.copy.get_buffer());
if (res)
return res;
}