-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-2019. 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. */
return process_info;
}
-/** Load the remote swag of processes into a vector
+/** Load the remote list of processes into a vector
*
- * @param process MCed process
- * @param target Local vector (to be filled with copies of `s_smx_actor_t`)
- * @param remote_swag Address of the process SWAG in the remote list
+ * @param process MCed process
+ * @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_process_list(simgrid::mc::RemoteClient* process,
- std::vector<simgrid::mc::ActorInformation>& target,
- simgrid::mc::RemotePtr<s_xbt_swag_t> remote_swag)
-{
- target.clear();
-
- // swag = REMOTE(*simix_global->process_list)
- s_xbt_swag_t swag;
- process->read_bytes(&swag, sizeof(swag), remote_swag);
-
- // Load each element of the vector from the MCed process:
- int i = 0;
- for (smx_actor_t p = (smx_actor_t) swag.head; p; ++i) {
-
- simgrid::mc::ActorInformation info;
- info.address = p;
- info.hostname = nullptr;
- process->read_bytes(&info.copy, sizeof(info.copy), remote(p));
- target.push_back(std::move(info));
-
- // Lookup next process address:
- p = (smx_actor_t) xbt_swag_getNext(&info.copy, swag.offset);
- }
- assert(i == swag.count);
-}
-
static void MC_process_refresh_simix_actor_dynar(simgrid::mc::RemoteClient* process,
std::vector<simgrid::mc::ActorInformation>& target,
simgrid::mc::RemotePtr<s_xbt_dynar_t> remote_dynar)
process->read_bytes(&dynar, sizeof(dynar), remote_dynar);
smx_actor_t* data = static_cast<smx_actor_t*>(::operator new(dynar.elmsize * dynar.used));
- process->read_bytes(data, dynar.elmsize * dynar.used, dynar.data);
+ 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 = data[i];
+ 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]));
target.push_back(std::move(info));
static_assert(sizeof(simix_global) == sizeof(simgrid::simix::Global*),
"Bad size for simix_global");
- RemotePtr<simgrid::simix::Global> simix_global_p =
- this->read_variable<simgrid::simix::Global*>("simix_global");
+ RemotePtr<simgrid::simix::Global> simix_global_p{this->read_variable<simgrid::simix::Global*>("simix_global")};
// simix_global = REMOTE(*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_process_list(this, this->smx_dead_actors_infos,
- remote(simix_global.getBuffer()->process_to_destroy));
+ MC_process_refresh_simix_actor_dynar(this, this->smx_dead_actors_infos,
+ remote(simix_global.getBuffer()->dead_actors_vector));
this->cache_flags_ |= RemoteClient::cache_simix_processes;
}
* @param process the MCed process
* @param req the simcall (copied in the local process)
*/
-smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
+smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall const* req)
{
xbt_assert(mc_model_checker != nullptr);
const char* MC_smx_actor_get_host_name(smx_actor_t actor)
{
if (mc_model_checker == nullptr)
- return actor->host->getCname();
+ return actor->get_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).
-
- 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.getName() - (char*)&foo.host;
-
// 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((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));
{
simgrid::mc::RemoteClient* process = &mc_model_checker->process();
if (mc_model_checker == nullptr)
- return actor->name.c_str();
+ return actor->get_cname();
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);
+ simgrid::xbt::string_data string_data = simgrid::xbt::string::to_string_data(actor->name_);
info->name = process->read_string(remote(string_data.data), string_data.len);
}
return info->name.c_str();
if (mc_model_checker == nullptr)
return smpi_process_count();
int res;
- mc_model_checker->process().read_variable("process_count",
- &res, sizeof(res));
+ mc_model_checker->process().read_variable("process_count", &res, sizeof(res));
return res;
}
#endif
