using simgrid::mc::remote;
-extern "C" {
-
-static inline
-bool is_in_vector(smx_process_t p, std::vector<simgrid::mc::SimixProcessInformation>& ps)
-{
- return (uintptr_t) p >= (uintptr_t) &ps[0]
- && (uintptr_t) p < (uintptr_t) &ps[ps.size()];
-}
-
+/** Statically "upcast" a s_smx_process_t into a SimixProcessInformation
+ *
+ * This gets 'processInfo' from '&processInfo->copy'. It upcasts in the
+ * sense that we could achieve the same thing by having SimixProcessInformation
+ * inherit from s_smx_process_t but we don't really want to do that.
+ */
static inline
-simgrid::mc::SimixProcessInformation* MC_smx_process_get_info(smx_process_t p)
+simgrid::mc::SimixProcessInformation* process_info_cast(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));
simgrid::mc::SimixProcessInformation* process_info =
(simgrid::mc::SimixProcessInformation*)
((char*) p - offsetof(simgrid::mc::SimixProcessInformation, copy));
* @param process the MCed process
* @param req the simcall (copied in the local process)
*/
-smx_process_t MC_smx_simcall_get_issuer(smx_simcall_t req)
+smx_process_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
{
- if (mc_mode == MC_MODE_CLIENT)
- return req->issuer;
+ xbt_assert(mc_mode == MC_MODE_SERVER);
// This is the address of the smx_process in the MCed process:
- void* address = req->issuer;
+ auto address = simgrid::mc::remote(req->issuer);
// Lookup by address:
for (auto& p : mc_model_checker->process().simix_processes())
xbt_die("Issuer not found");
}
-smx_process_t MC_smx_resolve_process(smx_process_t process_remote_address)
-{
- if (!process_remote_address)
- return nullptr;
- if (mc_mode == MC_MODE_CLIENT)
- return 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;
-}
-
-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.");
- 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 char* MC_smx_process_get_host_name(smx_process_t p)
{
if (mc_mode == MC_MODE_CLIENT)
simgrid::mc::Process* process = &mc_model_checker->process();
- /* Horrible hack to find the offset of the id in the simgrid::s4u::Host.
+ /* HACK, Horrible hack to find the offset of the id in the simgrid::s4u::Host.
Offsetof is not supported for non-POD types but this should
work in pratice for the targets currently supported by the MC
const size_t offset = (char*) &foo.host.name() - (char*) &foo.host;
// Read the simgrid::xbt::string in the MCed process:
- simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p);
+ simgrid::mc::SimixProcessInformation* info = process_info_cast(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;
- simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p);
+ simgrid::mc::SimixProcessInformation* info = process_info_cast(p);
if (info->name.empty())
info->name = process->read_string(p->name);
return info->name.c_str();
&maxpid, sizeof(maxpid));
return maxpid;
}
-
-}