#include "src/smpi/include/smpi_request.hpp"
#endif
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(Api, mc, "Logging specific to MC Fasade APIs ");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(Api, mc, "Logging specific to MC Facade APIs ");
using Simcall = simgrid::simix::Simcall;
return info->hostname;
}
+const char* Api::actor_get_name(smx_actor_t actor) const
+{
+ if (mc_model_checker == nullptr)
+ return actor->get_cname();
+
+ const simgrid::mc::RemoteSimulation* process = &mc_model_checker->get_remote_simulation();
+
+ simgrid::mc::ActorInformation* info = actor_info_cast(actor);
+ if (info->name.empty()) {
+ simgrid::xbt::string_data string_data = simgrid::xbt::string::to_string_data(actor->name_);
+ info->name = process->read_string(remote(string_data.data), string_data.len);
+ }
+ return info->name.c_str();
+}
+
void Api::initialize(char** argv) const
{
simgrid::mc::session = new simgrid::mc::Session([argv] {
RemotePtr<kernel::activity::CommImpl> Api::get_comm_wait_raw_addr(smx_simcall_t request) const
{
auto comm_addr = simgrid::simix::unmarshal_raw<simgrid::kernel::activity::CommImpl*>(request->args_[0]);
- return RemotePtr<kernel::activity::CommImpl>(static_cast<kernel::activity::CommImpl*>(comm_addr));
+ return RemotePtr<kernel::activity::CommImpl>(comm_addr);
}
RemotePtr<kernel::activity::CommImpl> Api::get_comm_waitany_raw_addr(smx_simcall_t request, int value) const
return nullptr;
}
-std::list<udpor_transition_t> Api::get_enabled_transitions(simgrid::mc::State* state)
+std::list<transition_detail_t> Api::get_enabled_transitions(simgrid::mc::State* state)
{
- std::list<udpor_transition_t> tr_list{};
+ std::list<transition_detail_t> tr_list{};
for (auto& actor : mc_model_checker->get_remote_simulation().actors()) {
auto actor_pid = actor.copy.get_buffer()->get_pid();
if (not simgrid::mc::actor_is_enabled(actor_impl))
continue;
- udpor_transition_t udpor_transition = std::unique_ptr<s_udpor_transition>(new s_udpor_transition());
+ transition_detail_t transition = std::unique_ptr<s_transition_detail>(new s_transition_detail());
Simcall simcall_call = actor_impl->simcall_.call_;
smx_simcall_t simcall = &actor_impl->simcall_;
- udpor_transition->call_ = simcall_call;
+ transition->call_ = simcall_call;
switch (simcall_call) {
case Simcall::COMM_ISEND:
case Simcall::COMM_IRECV: {
- udpor_transition->mbox_remote_addr = get_mbox_remote_addr(simcall);
- udpor_transition->comm_remote_addr = get_comm_remote_addr(simcall);
+ 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(udpor_transition));
+ tr_list.emplace_back(std::move(transition));
}
return tr_list;
char* bs = buff_size_to_string(simcall_comm_isend__get__src_buff_size(req));
if (issuer->get_host())
args = bprintf("src=(%ld)%s (%s), buff=%s, size=%s", issuer->get_pid(), actor_get_host_name(issuer),
- MC_smx_actor_get_name(issuer), p, bs);
+ actor_get_name(issuer), p, bs);
else
- args = bprintf("src=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), MC_smx_actor_get_name(issuer), p, bs);
+ args = bprintf("src=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), actor_get_name(issuer), p, bs);
xbt_free(bs);
xbt_free(p);
break;
char* bs = buff_size_to_string(size);
if (issuer->get_host())
args = bprintf("dst=(%ld)%s (%s), buff=%s, size=%s", issuer->get_pid(), actor_get_host_name(issuer),
- MC_smx_actor_get_name(issuer), p, bs);
+ actor_get_name(issuer), p, bs);
else
- args = bprintf("dst=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), MC_smx_actor_get_name(issuer), p, bs);
+ args = bprintf("dst=(%ld)%s, buff=%s, size=%s", issuer->get_pid(), actor_get_name(issuer), p, bs);
xbt_free(bs);
xbt_free(p);
break;
mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(act->dst_actor_.get()));
args = bprintf("comm=%s [(%ld)%s (%s)-> (%ld)%s (%s)]", p, src_proc ? src_proc->get_pid() : 0,
src_proc ? actor_get_host_name(src_proc) : "",
- src_proc ? MC_smx_actor_get_name(src_proc) : "", dst_proc ? dst_proc->get_pid() : 0,
+ src_proc ? actor_get_name(src_proc) : "", dst_proc ? dst_proc->get_pid() : 0,
dst_proc ? actor_get_host_name(dst_proc) : "",
- dst_proc ? MC_smx_actor_get_name(dst_proc) : "");
+ dst_proc ? actor_get_name(dst_proc) : "");
}
xbt_free(p);
break;
smx_actor_t dst_proc =
mc_model_checker->get_remote_simulation().resolve_actor(simgrid::mc::remote(act->dst_actor_.get()));
args = bprintf("comm=%s [(%ld)%s (%s) -> (%ld)%s (%s)]", p, src_proc->get_pid(),
- MC_smx_actor_get_name(src_proc), actor_get_host_name(src_proc), dst_proc->get_pid(),
- MC_smx_actor_get_name(dst_proc), actor_get_host_name(dst_proc));
+ actor_get_name(src_proc), actor_get_host_name(src_proc), dst_proc->get_pid(),
+ actor_get_name(dst_proc), actor_get_host_name(dst_proc));
}
xbt_free(p);
break;
std::string str;
if (args != nullptr)
str = simgrid::xbt::string_printf("[(%ld)%s (%s)] %s(%s)", issuer->get_pid(), actor_get_host_name(issuer),
- MC_smx_actor_get_name(issuer), type, args);
+ actor_get_name(issuer), type, args);
else
str = simgrid::xbt::string_printf("[(%ld)%s (%s)] %s ", issuer->get_pid(), actor_get_host_name(issuer),
- MC_smx_actor_get_name(issuer), type);
+ actor_get_name(issuer), type);
xbt_free(args);
return str;
}