#include "src/kernel/actor/SimcallObserver.hpp"
#include "src/mc/Session.hpp"
#include "src/mc/checker/Checker.hpp"
+#include "src/mc/mc_base.hpp"
#include "src/mc/mc_comm_pattern.hpp"
#include "src/mc/mc_exit.hpp"
#include "src/mc/mc_pattern.hpp"
return *info->hostname;
}
-std::string Api::get_actor_name(smx_actor_t actor) const
+xbt::string const& Api::get_actor_name(smx_actor_t actor) const
{
if (mc_model_checker == nullptr)
- return actor->get_cname();
+ return actor->get_name();
simgrid::mc::ActorInformation* info = actor_info_cast(actor);
if (info->name.empty()) {
if (actor) {
res = "(" + std::to_string(actor->get_pid()) + ")";
if (actor->get_host())
- res += std::string(get_actor_host_name(actor)) + " (" + get_actor_name(actor) + ")";
+ res += std::string(get_actor_host_name(actor)) + " (" + std::string(get_actor_name(actor)) + ")";
else
res += get_actor_name(actor);
} else
THROW_IMPOSSIBLE;
}
+ // FIXME: session and checker are never deleted
simgrid::mc::session_singleton = session;
mc_model_checker->setChecker(checker);
return checker;
#if HAVE_SMPI
bool Api::check_send_request_detached(smx_simcall_t const& simcall) const
{
- simgrid::smpi::Request mpi_request;
+ Remote<simgrid::smpi::Request> mpi_request;
mc_model_checker->get_remote_process().read(
- &mpi_request, remote(static_cast<smpi::Request*>(simcall_comm_isend__get__data(simcall))));
- return mpi_request.detached();
+ mpi_request, remote(static_cast<smpi::Request*>(simcall_comm_isend__get__data(simcall))));
+ return mpi_request.get_buffer()->detached();
}
#endif
break;
default:
- type = SIMIX_simcall_name(req->call_);
+ type = SIMIX_simcall_name(*req);
args = "??";
break;
}
#if HAVE_SMPI
int Api::get_smpi_request_tag(smx_simcall_t const& simcall, simgrid::simix::Simcall type) const
{
- simgrid::smpi::Request mpi_request;
void* simcall_data = nullptr;
if (type == Simcall::COMM_ISEND)
simcall_data = simcall_comm_isend__get__data(simcall);
else if (type == Simcall::COMM_IRECV)
simcall_data = simcall_comm_irecv__get__data(simcall);
- mc_model_checker->get_remote_process().read(&mpi_request, remote(static_cast<smpi::Request*>(simcall_data)));
- return mpi_request.tag();
+ Remote<simgrid::smpi::Request> mpi_request;
+ mc_model_checker->get_remote_process().read(mpi_request, remote(static_cast<smpi::Request*>(simcall_data)));
+ return mpi_request.get_buffer()->tag();
}
#endif