static void update_comm_pattern(simgrid::mc::PatternCommunication* comm_pattern,
simgrid::mc::RemotePtr<simgrid::kernel::activity::CommImpl> comm_addr)
{
- // HACK, type punning
- simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
- mc_model_checker->get_remote_simulation().read(temp_comm, comm_addr);
- const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer();
-
- smx_actor_t src_proc =
- mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(comm->src_actor_.get()));
- smx_actor_t dst_proc =
- mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(comm->dst_actor_.get()));
+ auto src_proc = mcapi::get().get_src_actor(comm_addr);
+ auto dst_proc = mcapi::get().get_dst_actor(comm_addr);
comm_pattern->src_proc = src_proc->get_pid();
comm_pattern->dst_proc = dst_proc->get_pid();
- comm_pattern->src_host = MC_smx_actor_get_host_name(src_proc);
- comm_pattern->dst_host = MC_smx_actor_get_host_name(dst_proc);
- if (comm_pattern->data.empty() && comm->src_buff_ != nullptr) {
- size_t buff_size;
- mc_model_checker->get_remote_simulation().read(&buff_size, remote(comm->dst_buff_size_));
- comm_pattern->data.resize(buff_size);
- mc_model_checker->get_remote_simulation().read_bytes(comm_pattern->data.data(), comm_pattern->data.size(),
- remote(comm->src_buff_));
- }
+ comm_pattern->src_host = mcapi::get().get_actor_host_name(src_proc);
+ comm_pattern->dst_host = mcapi::get().get_actor_host_name(dst_proc);
+
+ if (comm_pattern->data.empty()) {
+ auto pattern_data = mcapi::get().get_pattern_comm_data(comm_addr);
+ if (pattern_data.data() != nullptr) {
+ auto data_size = pattern_data.size();
+ comm_pattern->data.resize(data_size);
+ memcpy(comm_pattern->data.data(), pattern_data.data(), data_size);
+ }
+ }
}
namespace simgrid {
XBT_INFO("%s", this->send_diff);
xbt_free(this->send_diff);
this->send_diff = nullptr;
- mc::session->log_state();
- mc_model_checker->exit(SIMGRID_MC_EXIT_NON_DETERMINISM);
+ mcapi::get().log_state();
+ mcapi::get().mc_exit(SIMGRID_MC_EXIT_NON_DETERMINISM);
} else if (_sg_mc_comms_determinism && (not this->send_deterministic && not this->recv_deterministic)) {
XBT_INFO("****************************************************");
XBT_INFO("***** Non-deterministic communications pattern *****");
xbt_free(this->recv_diff);
this->recv_diff = nullptr;
}
- mc::session->log_state();
- mc_model_checker->exit(SIMGRID_MC_EXIT_NON_DETERMINISM);
+ mcapi::get().log_state();
+ mcapi::get().mc_exit(SIMGRID_MC_EXIT_NON_DETERMINISM);
}
}
}
}
#if HAVE_SMPI
- if (mpi_request.detached()) {
+ auto send_detached = mcapi::get().check_send_request_detached(request);
+ if (send_detached) {
if (this->initial_communications_pattern_done) {
/* Evaluate comm determinism */
this->deterministic_comm_pattern(pattern->src_proc, pattern.get(), backtracking);
/* Intermediate backtracking */
State* last_state = stack_.back().get();
if (last_state->system_state_) {
- last_state->system_state_->restore(&mcapi::get().mc_get_remote_simulation());
+ mc_api::get().restore_state(last_state->system_state_);
MC_restore_communications_pattern(last_state);
return;
}
/* Restore the initial state */
- mcapi::get().s_restore_initial_state();
+ mcapi::get().restore_initial_state();
unsigned n = mcapi::get().get_maxpid();
assert(n == incomplete_communications_pattern.size());
if (visited_state == nullptr) {
/* Get enabled actors and insert them in the interleave set of the next state */
- auto actors = mcapi::get().mc_get_remote_simulation().actors();
+ auto actors = mcapi::get().get_actors();
for (auto& actor : actors)
if (mcapi::get().actor_is_enabled(actor.copy.get_buffer()->get_pid()))
next_state->add_interleaving_set(actor.copy.get_buffer());
}
}
- mcapi::get().s_log_state();
+ mcapi::get().log_state();
}
void CommunicationDeterminismChecker::run()