}
static inline
-mc_smx_process_info_t MC_smx_process_get_info(smx_process_t p)
+simgrid::mc::SimixProcessInformation* MC_smx_process_get_info(smx_process_t p)
{
assert(is_in_vector(p, mc_model_checker->process().smx_process_infos)
|| is_in_vector(p, mc_model_checker->process().smx_old_process_infos));
- mc_smx_process_info_t process_info =
- (mc_smx_process_info_t)
- ((char*) p - offsetof(s_mc_smx_process_info_t, copy));
+ simgrid::mc::SimixProcessInformation* process_info =
+ (simgrid::mc::SimixProcessInformation*)
+ ((char*) p - offsetof(simgrid::mc::SimixProcessInformation, copy));
return process_info;
}
// This is the address of the smx_process in the MCed process:
void* address = req->issuer;
- unsigned i;
- mc_smx_process_info_t p;
-
// Lookup by address:
- MC_PROCESS_FOREACH(mc_model_checker->process().smx_process_infos, i, p)
- if (p->address == address)
- return &p->copy;
- MC_PROCESS_FOREACH(mc_model_checker->process().smx_old_process_infos, i, p)
- if (p->address == address)
- return &p->copy;
+ for (auto& p : mc_model_checker->process().smx_process_infos)
+ if (p.address == address)
+ return &p.copy;
+ for (auto& p : mc_model_checker->process().smx_old_process_infos)
+ if (p.address == address)
+ return &p.copy;
xbt_die("Issuer not found");
}
if (mc_mode == MC_MODE_CLIENT)
return process_remote_address;
- mc_smx_process_info_t process_info = MC_smx_resolve_process_info(process_remote_address);
+ simgrid::mc::SimixProcessInformation* process_info = MC_smx_resolve_process_info(process_remote_address);
if (process_info)
return &process_info->copy;
else
return nullptr;
}
-mc_smx_process_info_t MC_smx_resolve_process_info(smx_process_t process_remote_address)
+simgrid::mc::SimixProcessInformation* MC_smx_resolve_process_info(smx_process_t process_remote_address)
{
if (mc_mode == MC_MODE_CLIENT)
xbt_die("No process_info for local process is not enabled.");
-
- unsigned index;
- mc_smx_process_info_t process_info;
- MC_PROCESS_FOREACH(mc_model_checker->process().smx_process_infos, index, process_info)
- if (process_info->address == process_remote_address)
- return process_info;
- MC_PROCESS_FOREACH(mc_model_checker->process().smx_old_process_infos, index, process_info)
- if (process_info->address == process_remote_address)
- return process_info;
+ for (auto& process_info : mc_model_checker->process().smx_process_infos)
+ if (process_info.address == process_remote_address)
+ return &process_info;
+ for (auto& process_info : mc_model_checker->process().smx_old_process_infos)
+ if (process_info.address == process_remote_address)
+ return &process_info;
xbt_die("Process info not found");
}
const size_t offset = (char*) &foo.host.name() - (char*) &foo.host;
// Read the simgrid::xbt::string in the MCed process:
- mc_smx_process_info_t info = MC_smx_process_get_info(p);
+ simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p);
simgrid::xbt::string_data remote_string;
auto remote_string_address = remote(
(simgrid::xbt::string_data*) ((char*) p->host + offset));
if (!p->name)
return nullptr;
- mc_smx_process_info_t info = MC_smx_process_get_info(p);
+ simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p);
if (info->name.empty()) {
char* name = process->read_string(p->name);
info->name = name;