return XBT_LOG_ISENABLED(Api, xbt_log_priority_verbose) ? std::to_string(buff_size) : "(verbose only)";
}
-/* Search an enabled transition for the given process.
- *
- * 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 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_choose_request_for_process(const RemoteProcess& process, simgrid::mc::State* state,
- smx_actor_t actor)
-{
- /* reset the outgoing transition */
- simgrid::mc::ActorState* procstate = &state->actor_states_[actor->get_pid()];
- state->transition_.aid_ = -1;
- state->transition_.times_considered_ = -1;
- state->transition_.textual[0] = '\0';
- state->executed_req_.call_ = Simcall::NONE;
-
- if (not simgrid::mc::actor_is_enabled(actor))
- return nullptr; // Not executable in the application
-
- smx_simcall_t req = nullptr;
- if (actor->simcall_.observer_ != nullptr) {
- state->transition_.times_considered_ = procstate->get_times_considered_and_inc();
- if (actor->simcall_.mc_max_consider_ <= procstate->get_times_considered())
- procstate->set_done();
- req = &actor->simcall_;
- } else {
- procstate->set_done();
- state->transition_.times_considered_ = 0;
- req = &actor->simcall_;
- }
- if (not req)
- return nullptr;
-
- state->transition_.aid_ = actor->get_pid();
- state->executed_req_ = *req;
-
- // Fetch the data of the request and translate it:
- state->internal_req_ = *req;
- state->internal_req_.mc_value_ = state->transition_.times_considered_;
-
- return req;
-}
-
-kernel::activity::CommImpl* Api::get_comm_or_nullptr(smx_simcall_t const r) const
-{
- if (auto wait = dynamic_cast<kernel::actor::ActivityWaitSimcall*>(r->observer_))
- return static_cast<kernel::activity::CommImpl*>(wait->get_activity());
- if (auto test = dynamic_cast<kernel::actor::ActivityTestSimcall*>(r->observer_))
- return static_cast<kernel::activity::CommImpl*>(test->get_activity());
- return nullptr;
-}
-
/** Statically "upcast" a s_smx_actor_t into an ActorInformation
*
* This gets 'actorInfo' from '&actorInfo->copy'. It upcasts in the
simgrid::mc::dumpRecordPath();
}
-smx_simcall_t Api::mc_state_choose_request(simgrid::mc::State* state) const
+/* Search for an enabled transition amongst actors
+ *
+ * This is the first actor marked TODO by the checker, and currently enabled in the application.
+ *
+ * Once we found it, prepare its execution (increase the times_considered of its observer and remove it as done on need)
+ *
+ * If we can't find any actor, return false
+ */
+
+bool Api::mc_state_choose_request(simgrid::mc::State* state) const
{
RemoteProcess& process = mc_model_checker->get_remote_process();
XBT_DEBUG("Search for an actor to run. %zu actors to consider", process.actors().size());
- for (auto& actor : 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())
+ for (auto& actor_info : process.actors()) {
+ auto actor = actor_info.copy.get_buffer();
+ simgrid::mc::ActorState* actor_state = &state->actor_states_[actor->get_pid()];
+
+ /* 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::actor_is_enabled(actor))
continue;
- smx_simcall_t res = MC_state_choose_request_for_process(process, state, actor.copy.get_buffer());
- if (res) {
- XBT_DEBUG("Let's run actor %ld, going for transition %s", actor.copy.get_buffer()->get_pid(),
- SIMIX_simcall_name(*res));
- return res;
+ /* This actor is ready to be executed. Prepare its execution when simcall_handle will be called on it */
+ if (actor->simcall_.observer_ != nullptr) {
+ state->transition_.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 {
+ state->transition_.times_considered_ = 0;
+ actor_state->set_done();
}
- }
- return nullptr;
-}
-
-std::list<transition_detail_t> Api::get_enabled_transitions(simgrid::mc::State* state) const
-{
- std::list<transition_detail_t> tr_list{};
- for (auto& actor : mc_model_checker->get_remote_process().actors()) {
- auto actor_pid = actor.copy.get_buffer()->get_pid();
- auto actor_impl = actor.copy.get_buffer();
+ state->transition_.aid_ = actor->get_pid();
+ state->executed_req_ = actor->simcall_;
- // Only consider the actors that were marked as interleaving by the checker algorithm
- if (not state->actor_states_[actor_pid].is_todo())
- continue;
- // Not executable in the application
- if (not simgrid::mc::actor_is_enabled(actor_impl))
- continue;
-
- auto transition = std::make_unique<s_transition_detail>();
- Simcall simcall_call = actor_impl->simcall_.call_;
- smx_simcall_t simcall = &actor_impl->simcall_;
- transition->call_ = simcall_call;
- switch (simcall_call) {
- case Simcall::COMM_ISEND:
- case Simcall::COMM_IRECV:
- transition->mbox_remote_addr = get_mbox_remote_addr(simcall);
- transition->comm_remote_addr = get_comm_remote_addr(simcall);
- break;
-
- default:
- break;
- }
- tr_list.emplace_back(std::move(transition));
+ XBT_DEBUG("Let's run actor %ld, going for transition %s", actor->get_pid(),
+ SIMIX_simcall_name(state->executed_req_));
+ return true;
}
-
- return tr_list;
+ return false;
}
-std::string Api::request_to_string(smx_simcall_t req, int value) const
+std::string Api::request_to_string(aid_t aid, int value) const
{
xbt_assert(mc_model_checker != nullptr, "Must be called from MCer");
- smx_actor_t issuer = simcall_get_issuer(req);
-
- if (issuer->simcall_.observer_ != nullptr)
- return mc_model_checker->simcall_to_string(issuer->get_pid(), value);
- else
- return "[" + get_actor_string(issuer) + "] " + SIMIX_simcall_name(*req) + "(unknown?)";
+ return mc_model_checker->simcall_to_string(aid, value);
}
-std::string Api::request_get_dot_output(smx_simcall_t req, int value) const
+std::string Api::request_get_dot_output(aid_t aid, int value) const
{
- if (req->observer_ != nullptr) {
- const smx_actor_t issuer = simcall_get_issuer(req);
- const char* color = get_color(issuer->get_pid() - 1);
- return "label = \"" + mc_model_checker->simcall_dot_label(issuer->get_pid(), value) + "\", color = " + color +
- ", fontcolor = " + color;
- } else
- return "UNIMPLEMENTED";
+ const char* color = get_color(aid - 1);
+ return "label = \"" + mc_model_checker->simcall_dot_label(aid, value) + "\", color = " + color +
+ ", fontcolor = " + color;
}
#if HAVE_SMPI
session_singleton->close();
}
-RemotePtr<simgrid::kernel::actor::SimcallObserver> Api::execute(Transition& transition, smx_simcall_t simcall) const
+RemotePtr<simgrid::kernel::actor::SimcallObserver> Api::execute(Transition& transition) const
{
/* FIXME: once all simcalls have observers, kill the simcall parameter and use mc_model_checker->simcall_to_string() */
- transition.textual = request_to_string(simcall, transition.times_considered_);
+ transition.textual = request_to_string(transition.aid_, transition.times_considered_);
return session_singleton->execute(transition);
}
