}
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;
}
assert(i == swag.count);
}
-void MC_process_smx_refresh(simgrid::mc::Process* process)
+namespace simgrid {
+namespace mc {
+
+void Process::refresh_simix()
{
xbt_assert(mc_mode == MC_MODE_SERVER);
- if (process->cache_flags & MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES)
+ if (this->cache_flags & MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES)
return;
// TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global`
// simix_global_p = REMOTE(simix_global);
smx_global_t simix_global_p;
- process->read_variable("simix_global", &simix_global_p, sizeof(simix_global_p));
+ this->read_variable("simix_global", &simix_global_p, sizeof(simix_global_p));
// simix_global = REMOTE(*simix_global)
s_smx_global_t simix_global;
- process->read_bytes(&simix_global, sizeof(simix_global),
+ this->read_bytes(&simix_global, sizeof(simix_global),
remote(simix_global_p));
MC_process_refresh_simix_process_list(
- process, process->smx_process_infos, simix_global.process_list);
+ this, this->smx_process_infos, simix_global.process_list);
MC_process_refresh_simix_process_list(
- process, process->smx_old_process_infos, simix_global.process_to_destroy);
+ this, this->smx_old_process_infos, simix_global.process_to_destroy);
+
+ this->cache_flags |= MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES;
+}
- process->cache_flags |= MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES;
+}
}
/** Get the issuer of a simcall (`req->issuer`)
if (mc_mode == MC_MODE_CLIENT)
return req->issuer;
- MC_process_smx_refresh(&mc_model_checker->process());
-
// This is the address of the smx_process in the MCed process:
void* address = req->issuer;
// Lookup by address:
- for (auto& p : mc_model_checker->process().smx_process_infos)
+ for (auto& p : mc_model_checker->process().simix_processes())
if (p.address == address)
return &p.copy;
- for (auto& p : mc_model_checker->process().smx_old_process_infos)
+ for (auto& p : mc_model_checker->process().old_simix_processes())
if (p.address == address)
return &p.copy;
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.");
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;
return info->name.c_str();
}
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
int MC_smpi_process_count(void)
{
if (mc_mode == MC_MODE_CLIENT)
return smpi_process_count();
- else {
- int res;
- mc_model_checker->process().read_variable("process_count",
- &res, sizeof(res));
- return res;
- }
+ int res;
+ mc_model_checker->process().read_variable("process_count",
+ &res, sizeof(res));
+ return res;
}
#endif