/* Create comm pattern */
pattern->type = PatternCommunicationType::send;
pattern->comm_addr = api::get().get_comm_isend_raw_addr(request);
- pattern->rdv = api::get().get_pattern_comm_rdv(pattern->comm_addr);
- pattern->src_proc = api::get().get_pattern_comm_src_proc(pattern->comm_addr);
- pattern->src_host = Api::get().get_actor_host_name(issuer);
+ pattern->rdv = api::get().get_pattern_comm_rdv(pattern->comm_addr);
+ pattern->src_proc = api::get().get_pattern_comm_src_proc(pattern->comm_addr);
+ pattern->src_host = api::get().get_actor_host_name(issuer);
#if HAVE_SMPI
pattern->tag = api::get().get_smpi_request_tag(request, simgrid::simix::Simcall::COMM_ISEND);
std::vector<std::string> trace;
for (auto const& state : stack_) {
smx_simcall_t req = &state->executed_req_;
- trace.push_back(api::get().request_to_string(req, state->transition_.argument_, RequestType::executed));
+ trace.push_back(api::get().request_to_string(req, state->transition_.times_considered_, RequestType::executed));
}
return trace;
}
auto actors = api::get().get_actors();
for (auto& actor : actors)
if (api::get().actor_is_enabled(actor.copy.get_buffer()->get_pid()))
- initial_state->add_interleaving_set(actor.copy.get_buffer());
+ initial_state->mark_todo(actor.copy.get_buffer());
stack_.push_back(std::move(initial_state));
}
/* Intermediate backtracking */
State* last_state = stack_.back().get();
if (last_state->system_state_) {
- Api::get().restore_state(last_state->system_state_);
+ api::get().restore_state(last_state->system_state_);
restore_communications_pattern(last_state);
return;
}
if (state == stack_.back())
break;
- int req_num = state->transition_.argument_;
+ int req_num = state->transition_.times_considered_;
const s_smx_simcall* saved_req = &state->executed_req_;
xbt_assert(saved_req);
XBT_DEBUG("**************************************************");
XBT_DEBUG("Exploration depth = %zu (state = %d, interleaved processes = %zu)", stack_.size(), cur_state->num_,
- cur_state->interleave_size());
+ cur_state->count_todo());
/* Update statistics */
api::get().mc_inc_visited_states();
req = nullptr;
if (req != nullptr && visited_state == nullptr) {
- int req_num = cur_state->transition_.argument_;
+ int req_num = cur_state->transition_.times_considered_;
XBT_DEBUG("Execute: %s", api::get().request_to_string(req, req_num, RequestType::simix).c_str());
auto actors = api::get().get_actors();
for (auto& actor : actors)
if (api::get().actor_is_enabled(actor.copy.get_buffer()->get_pid()))
- next_state->add_interleaving_set(actor.copy.get_buffer());
+ next_state->mark_todo(actor.copy.get_buffer());
if (dot_output != nullptr)
fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", cur_state->num_, next_state->num_, req_str.c_str());
while (not stack_.empty()) {
std::unique_ptr<State> state(std::move(stack_.back()));
stack_.pop_back();
- if (state->interleave_size() && stack_.size() < (std::size_t)_sg_mc_max_depth) {
+ if (state->count_todo() && stack_.size() < (std::size_t)_sg_mc_max_depth) {
/* We found a back-tracking point, let's loop */
XBT_DEBUG("Back-tracking to state %d at depth %zu", state->num_, stack_.size() + 1);
stack_.push_back(std::move(state));