using simgrid::mc::remote;
-extern "C" {
-
+/** HACK, 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
-bool is_in_vector(smx_process_t p, std::vector<simgrid::mc::SimixProcessInformation>& ps)
+simgrid::mc::SimixProcessInformation* process_info_cast(smx_process_t p)
{
- return (uintptr_t) p >= (uintptr_t) &ps[0]
- && (uintptr_t) p < (uintptr_t) &ps[ps.size()];
-}
+ simgrid::mc::SimixProcessInformation temp;
+ std::size_t offset = (char*) temp.copy.getBuffer() - (char*)&temp;
-static inline
-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));
simgrid::mc::SimixProcessInformation* process_info =
- (simgrid::mc::SimixProcessInformation*)
- ((char*) p - offsetof(simgrid::mc::SimixProcessInformation, copy));
+ (simgrid::mc::SimixProcessInformation*) ((char*) p - offset);
return process_info;
}
this->read_variable("simix_global", &simix_global_p, sizeof(simix_global_p));
// simix_global = REMOTE(*simix_global)
- s_smx_global_t simix_global;
+ simgrid::simix::Global simix_global;
this->read_bytes(&simix_global, sizeof(simix_global),
remote(simix_global_p));
*/
smx_process_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
{
- xbt_assert(mc_mode == MC_MODE_SERVER);
+ xbt_assert(mc_model_checker != nullptr);
// This is the address of the smx_process in the MCed process:
auto address = simgrid::mc::remote(req->issuer);
// Lookup by address:
for (auto& p : mc_model_checker->process().simix_processes())
if (p.address == address)
- return &p.copy;
+ return p.copy.getBuffer();
for (auto& p : mc_model_checker->process().old_simix_processes())
if (p.address == address)
- return &p.copy;
+ return p.copy.getBuffer();
xbt_die("Issuer not found");
}
-smx_process_t MC_smx_resolve_process(
- simgrid::mc::RemotePtr<s_smx_process_t> process_remote_address)
-{
- xbt_assert(mc_mode == MC_MODE_SERVER);
-
- if (!process_remote_address)
- return nullptr;
-
- 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(
- simgrid::mc::RemotePtr<s_smx_process_t> process_remote_address)
-{
- xbt_assert(mc_mode == MC_MODE_SERVER);
-
- 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)
+ if (mc_model_checker == nullptr)
return sg_host_get_name(p->host);
simgrid::mc::Process* process = &mc_model_checker->process();
/* 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
+ work in practice for the targets currently supported by the MC
as long as we do not add funny features to the Host class
(such as virtual base).
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::xbt::string_data remote_string;
+ simgrid::mc::SimixProcessInformation* info = process_info_cast(p);
auto remote_string_address = remote(
(simgrid::xbt::string_data*) ((char*) p->host + offset));
- process->read_bytes(&remote_string, sizeof(remote_string), remote_string_address);
+ simgrid::xbt::string_data remote_string = process->read(remote_string_address);
char hostname[remote_string.len];
process->read_bytes(hostname, remote_string.len + 1, remote(remote_string.data));
info->hostname = mc_model_checker->get_host_name(hostname);
const char* MC_smx_process_get_name(smx_process_t p)
{
simgrid::mc::Process* process = &mc_model_checker->process();
- if (mc_mode == MC_MODE_CLIENT)
- return p->name;
- if (!p->name)
- return nullptr;
-
- simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p);
- if (info->name.empty())
- info->name = process->read_string(p->name);
+ if (mc_model_checker == nullptr)
+ return p->name.c_str();
+
+ simgrid::mc::SimixProcessInformation* info = process_info_cast(p);
+ if (info->name.empty()) {
+ simgrid::xbt::string_data string_data = (simgrid::xbt::string_data&)p->name;
+ info->name = process->read_string(remote(string_data.data), string_data.len);
+ }
return info->name.c_str();
}
#if HAVE_SMPI
int MC_smpi_process_count(void)
{
- if (mc_mode == MC_MODE_CLIENT)
+ if (mc_model_checker == nullptr)
return smpi_process_count();
int res;
mc_model_checker->process().read_variable("process_count",
&maxpid, sizeof(maxpid));
return maxpid;
}
-
-}
