-/* Copyright (c) 2015-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-2021. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
using simgrid::mc::remote;
-/** HACK, Statically "upcast" a s_smx_actor_t into a ActorInformation
+/** HACK, Statically "upcast" a s_smx_actor_t into an ActorInformation
*
* This gets 'actorInfo' from '&actorInfo->copy'. It upcasts in the
* sense that we could achieve the same thing by having ActorInformation
static inline simgrid::mc::ActorInformation* actor_info_cast(smx_actor_t actor)
{
simgrid::mc::ActorInformation temp;
- std::size_t offset = (char*) temp.copy.getBuffer() - (char*)&temp;
+ std::size_t offset = (char*)temp.copy.get_buffer() - (char*)&temp;
- simgrid::mc::ActorInformation* process_info = (simgrid::mc::ActorInformation*)((char*)actor - offset);
+ auto* process_info = reinterpret_cast<simgrid::mc::ActorInformation*>((char*)actor - offset);
return process_info;
}
* @param target Local vector (to be filled with copies of `s_smx_actor_t`)
* @param remote_dynar Address of the process dynar in the remote list
*/
-static void MC_process_refresh_simix_actor_dynar(simgrid::mc::RemoteClient* process,
+static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteSimulation* process,
std::vector<simgrid::mc::ActorInformation>& target,
simgrid::mc::RemotePtr<s_xbt_dynar_t> remote_dynar)
{
s_xbt_dynar_t dynar;
process->read_bytes(&dynar, sizeof(dynar), remote_dynar);
- smx_actor_t* data = static_cast<smx_actor_t*>(::operator new(dynar.elmsize * dynar.used));
+ auto* data = static_cast<smx_actor_t*>(::operator new(dynar.elmsize * dynar.used));
process->read_bytes(data, dynar.elmsize * dynar.used, simgrid::mc::RemotePtr<void>(dynar.data));
// Load each element of the vector from the MCed process:
for (unsigned int i = 0; i < dynar.used; ++i) {
-
simgrid::mc::ActorInformation info;
+
info.address = simgrid::mc::RemotePtr<simgrid::kernel::actor::ActorImpl>(data[i]);
info.hostname = nullptr;
process->read_bytes(&info.copy, sizeof(info.copy), remote(data[i]));
namespace simgrid {
namespace mc {
-void RemoteClient::refresh_simix()
+void RemoteSimulation::refresh_simix()
{
- if (this->cache_flags_ & RemoteClient::cache_simix_processes)
+ if (this->cache_flags_ & RemoteSimulation::cache_simix_processes)
return;
// TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global`
Remote<simgrid::simix::Global> simix_global =
this->read<simgrid::simix::Global>(simix_global_p);
- MC_process_refresh_simix_actor_dynar(this, this->smx_actors_infos, remote(simix_global.getBuffer()->actors_vector));
+ MC_process_refresh_simix_actor_dynar(this, this->smx_actors_infos, remote(simix_global.get_buffer()->actors_vector));
MC_process_refresh_simix_actor_dynar(this, this->smx_dead_actors_infos,
- remote(simix_global.getBuffer()->dead_actors_vector));
+ remote(simix_global.get_buffer()->dead_actors_vector));
- this->cache_flags_ |= RemoteClient::cache_simix_processes;
+ this->cache_flags_ |= RemoteSimulation::cache_simix_processes;
}
}
xbt_assert(mc_model_checker != nullptr);
// This is the address of the smx_actor in the MCed process:
- auto address = simgrid::mc::remote(req->issuer);
+ auto address = simgrid::mc::remote(req->issuer_);
// Lookup by address:
- for (auto& actor : mc_model_checker->process().actors())
+ for (auto& actor : mc_model_checker->get_remote_simulation().actors())
if (actor.address == address)
- return actor.copy.getBuffer();
- for (auto& actor : mc_model_checker->process().dead_actors())
+ return actor.copy.get_buffer();
+ for (auto& actor : mc_model_checker->get_remote_simulation().dead_actors())
if (actor.address == address)
- return actor.copy.getBuffer();
+ return actor.copy.get_buffer();
xbt_die("Issuer not found");
}
const char* MC_smx_actor_get_host_name(smx_actor_t actor)
{
if (mc_model_checker == nullptr)
- return actor->host_->get_cname();
-
- simgrid::mc::RemoteClient* 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 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).
+ return actor->get_host()->get_cname();
- We are using a (C++11) unrestricted union in order to avoid
- any construction/destruction of the simgrid::s4u::Host.
- */
- union fake_host {
- simgrid::s4u::Host host;
- fake_host() { /* Nothing to do*/}
- ~fake_host() { /* Nothing to do*/}
- };
- fake_host foo;
- const size_t offset = (char*)&foo.host.get_name() - (char*)&foo.host;
+ const simgrid::mc::RemoteSimulation* process = &mc_model_checker->get_remote_simulation();
// Read the simgrid::xbt::string in the MCed process:
simgrid::mc::ActorInformation* info = actor_info_cast(actor);
- auto remote_string_address = remote((simgrid::xbt::string_data*)((char*)actor->host_ + offset));
+ auto remote_string_address =
+ remote(reinterpret_cast<const simgrid::xbt::string_data*>(&actor->get_host()->get_name()));
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).c_str();
+ std::vector<char> hostname(remote_string.len + 1);
+ // no need to read the terminating null byte, and thus hostname[remote_string.len] is guaranteed to be '\0'
+ process->read_bytes(hostname.data(), remote_string.len, remote(remote_string.data));
+ info->hostname = mc_model_checker->get_host_name(hostname.data()).c_str();
return info->hostname;
}
const char* MC_smx_actor_get_name(smx_actor_t actor)
{
- simgrid::mc::RemoteClient* process = &mc_model_checker->process();
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_);
return info->name.c_str();
}
-#if HAVE_SMPI
-int MC_smpi_process_count()
-{
- if (mc_model_checker == nullptr)
- return smpi_process_count();
- int res;
- mc_model_checker->process().read_variable("process_count",
- &res, sizeof(res));
- return res;
-}
-#endif
-
unsigned long MC_smx_get_maxpid()
{
unsigned long maxpid;
- mc_model_checker->process().read_variable("simix_process_maxpid",
- &maxpid, sizeof(maxpid));
+ const char* name = "simgrid::kernel::actor::maxpid";
+ if (mc_model_checker->get_remote_simulation().find_variable(name) == nullptr)
+ name = "maxpid"; // We seem to miss the namespaces when compiling with GCC
+ mc_model_checker->get_remote_simulation().read_variable(name, &maxpid, sizeof(maxpid));
return maxpid;
}
