X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f734ec7475682eb90323e804cbcfddd7e4523992..4bcfd40036f842e976d329cd0cee7349b8e0f4d6:/src/mc/mc_smx.cpp diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp index 044939cb61..c1ea4b3f38 100644 --- a/src/mc/mc_smx.cpp +++ b/src/mc/mc_smx.cpp @@ -1,12 +1,12 @@ -/* 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. */ #include "simgrid/s4u/Host.hpp" -#include "src/mc/mc_smx.hpp" #include "src/mc/ModelChecker.hpp" +#include "src/mc/mc_smx.hpp" using simgrid::mc::remote; @@ -25,38 +25,12 @@ static inline simgrid::mc::ActorInformation* actor_info_cast(smx_actor_t actor) 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& target, - simgrid::mc::RemotePtr 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& target, simgrid::mc::RemotePtr remote_dynar) @@ -66,19 +40,19 @@ static void MC_process_refresh_simix_actor_dynar(simgrid::mc::RemoteClient* proc s_xbt_dynar_t dynar; process->read_bytes(&dynar, sizeof(dynar), remote_dynar); - smx_actor_t* data = (smx_actor_t*)malloc(dynar.elmsize * dynar.used); - process->read_bytes(data, dynar.elmsize * dynar.used, dynar.data); + smx_actor_t* data = static_cast(::operator new(dynar.elmsize * dynar.used)); + process->read_bytes(data, dynar.elmsize * dynar.used, simgrid::mc::RemotePtr(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(data[i]); info.hostname = nullptr; process->read_bytes(&info.copy, sizeof(info.copy), remote(data[i])); target.push_back(std::move(info)); } - free(data); + ::operator delete(data); } namespace simgrid { namespace mc { @@ -97,16 +71,15 @@ void RemoteClient::refresh_simix() static_assert(sizeof(simix_global) == sizeof(simgrid::simix::Global*), "Bad size for simix_global"); - RemotePtr simix_global_p = - this->read_variable("simix_global"); + RemotePtr simix_global_p{this->read_variable("simix_global")}; // simix_global = REMOTE(*simix_global) Remote simix_global = this->read(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; } @@ -123,7 +96,7 @@ void RemoteClient::refresh_simix() * @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); @@ -144,31 +117,13 @@ smx_actor_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req) 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() {} - ~fake_host() {} - }; - 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)); @@ -180,11 +135,11 @@ 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->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_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(); @@ -196,8 +151,7 @@ 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)); + mc_model_checker->process().read_variable("process_count", &res, sizeof(res)); return res; } #endif