return mc_model_checker->get_remote_simulation().actors().size();
}
-void mc_api::copy_incomplete_comm_pattern(const simgrid::mc::State* state) const
+bool mc_api::comm_addr_equal(const kernel::activity::CommImpl* comm_addr1, const kernel::activity::CommImpl* comm_addr2) const
{
- MC_state_copy_incomplete_communications_pattern((simgrid::mc::State*)state);
+ return remote(comm_addr1) == remote(comm_addr2);
}
-void mc_api::copy_index_comm_pattern(const simgrid::mc::State* state) const
+kernel::activity::CommImpl* mc_api::get_comm_isend_raw_addr(smx_simcall_t request) const
{
- MC_state_copy_index_communications_pattern((simgrid::mc::State*)state);
+ auto comm_addr = simcall_comm_isend__getraw__result(request);
+ return static_cast<kernel::activity::CommImpl*>(comm_addr);
}
-kernel::activity::CommImpl* mc_api::get_pattern_comm_addr(smx_simcall_t request) const
+kernel::activity::CommImpl* mc_api::get_comm_wait_raw_addr(smx_simcall_t request) const
{
- auto comm_addr = simcall_comm_isend__getraw__result(request);
- return static_cast<kernel::activity::CommImpl*>(comm_addr);
+ return simcall_comm_wait__getraw__comm(request);
+}
+
+kernel::activity::CommImpl* mc_api::get_comm_waitany_raw_addr(smx_simcall_t request, int value) const
+{
+ auto addr = mc_model_checker->get_remote_simulation().read(remote(simcall_comm_waitany__getraw__comms(request) + value));
+ return static_cast<simgrid::kernel::activity::CommImpl*>(addr);
}
std::string mc_api::get_pattern_comm_rdv(void* addr) const
return buffer;
}
-std::vector<char> mc_api::get_pattern_comm_data(mc::RemotePtr<kernel::activity::CommImpl> const& comm_addr) const
+std::vector<char> mc_api::get_pattern_comm_data(const kernel::activity::CommImpl* comm_addr) const
{
simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
- mc_model_checker->get_remote_simulation().read(temp_comm, comm_addr);
+ mc_model_checker->get_remote_simulation().read(temp_comm, remote((kernel::activity::CommImpl*)comm_addr));
const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer();
std::vector<char> buffer {};
return mpi_request.detached();
}
-smx_actor_t mc_api::get_src_actor(mc::RemotePtr<kernel::activity::CommImpl> const& comm_addr) const
+smx_actor_t mc_api::get_src_actor(const kernel::activity::CommImpl* comm_addr) const
{
simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
- mc_model_checker->get_remote_simulation().read(temp_comm, comm_addr);
+ mc_model_checker->get_remote_simulation().read(temp_comm, remote((kernel::activity::CommImpl*)comm_addr));
const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer();
auto src_proc = mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(comm->src_actor_.get()));
return src_proc;
}
-smx_actor_t mc_api::get_dst_actor(mc::RemotePtr<kernel::activity::CommImpl> const& comm_addr) const
+smx_actor_t mc_api::get_dst_actor(const kernel::activity::CommImpl* comm_addr) const
{
simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
- mc_model_checker->get_remote_simulation().read(temp_comm, comm_addr);
+ mc_model_checker->get_remote_simulation().read(temp_comm, remote((kernel::activity::CommImpl*)comm_addr));
const simgrid::kernel::activity::CommImpl* comm = temp_comm.get_buffer();
auto dst_proc = mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(comm->dst_actor_.get()));
MC_show_deadlock();
}
-smx_actor_t mc_api::mc_smx_simcall_get_issuer(s_smx_simcall const* req) const
+smx_actor_t mc_api::simcall_get_issuer(s_smx_simcall const* req) const
{
return MC_smx_simcall_get_issuer(req);
}
return mc_model_checker->get_host_name(hostname);
}
-void mc_api::mc_dump_record_path() const
+void mc_api::dump_record_path() const
{
simgrid::mc::dumpRecordPath();
}
return simgrid::mc::request_get_dot_output(req, value);
}
-const char* mc_api::simix_simcall_name(simgrid::simix::Simcall kind) const
+const char* mc_api::simcall_get_name(simgrid::simix::Simcall kind) const
{
return SIMIX_simcall_name(kind);
}
}
#endif
+void mc_api::restore_state(std::shared_ptr<simgrid::mc::Snapshot> system_state) const
+{
+ system_state->restore(&mc_model_checker->get_remote_simulation());
+}
+
bool mc_api::snapshot_equal(const Snapshot* s1, const Snapshot* s2) const
{
return simgrid::mc::snapshot_equal(s1, s2);
session->close();
}
-void mc_api::s_restore_initial_state() const
+void mc_api::restore_initial_state() const
{
session->restore_initial_state();
}
session->execute(transition);
}
-void mc_api::s_log_state() const
+void mc_api::log_state() const
{
session->log_state();
}