X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cff982bd049d26d7acbd0e23324e0de051b06d0d..196b543c8e909828b40e851eaf4443ee28f76c70:/src/mc/mc_smx.cpp diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp index 6c8e6304b7..7593fc29f7 100644 --- a/src/mc/mc_smx.cpp +++ b/src/mc/mc_smx.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2022. 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. */ @@ -6,32 +6,32 @@ #include "simgrid/s4u/Host.hpp" #include "src/mc/ModelChecker.hpp" -#include "src/mc/mc_smx.hpp" +#include "src/mc/remote/RemoteProcess.hpp" -using simgrid::mc::remote; - -/** HACK, Statically "upcast" a s_smx_actor_t into an ActorInformation +/** @file + * @brief (Cross-process, MCer/MCed) Access to SMX structures + * + * We copy some C data structure from the MCed process in the MCer process. + * This is implemented by: + * + * - `model_checker->process.smx_process_infos` + * (copy of `EngineImpl::actor_list_`); * - * This gets 'actorInfo' from '&actorInfo->copy'. It upcasts in the - * sense that we could achieve the same thing by having ActorInformation - * inherit from s_smx_actor_t but we don't really want to do that. + * - `model_checker->hostnames`. + * + * The process lists are currently refreshed each time MCed code is executed. + * We don't try to give a persistent MCer address for a given MCed process. + * For this reason, a MCer simgrid::mc::Process* is currently not reusable after + * MCed code. */ -static inline simgrid::mc::ActorInformation* actor_info_cast(smx_actor_t actor) -{ - simgrid::mc::ActorInformation temp; - std::size_t offset = (char*)temp.copy.get_buffer() - (char*)&temp; - - auto* process_info = reinterpret_cast((char*)actor - offset); - return process_info; -} /** 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 target Local vector (to be filled with `simgrid::mc::ActorInformation`) * @param remote_dynar Address of the process dynar in the remote list */ -static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteSimulation* process, +static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteProcess* process, std::vector& target, simgrid::mc::RemotePtr remote_dynar) { @@ -40,7 +40,7 @@ static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteSimula s_xbt_dynar_t dynar; process->read_bytes(&dynar, sizeof(dynar), remote_dynar); - auto* data = static_cast(::operator new(dynar.elmsize * dynar.used)); + auto* 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: @@ -48,112 +48,21 @@ static void MC_process_refresh_simix_actor_dynar(const simgrid::mc::RemoteSimula simgrid::mc::ActorInformation info; info.address = simgrid::mc::RemotePtr(data[i]); - info.hostname = nullptr; - process->read_bytes(&info.copy, sizeof(info.copy), remote(data[i])); + process->read_bytes(&info.copy, sizeof(info.copy), simgrid::mc::remote(data[i])); target.push_back(std::move(info)); } ::operator delete(data); } -namespace simgrid { -namespace mc { +namespace simgrid::mc { -void RemoteSimulation::refresh_simix() +void RemoteProcess::refresh_simix() { - if (this->cache_flags_ & RemoteSimulation::cache_simix_processes) + if (this->cache_flags_ & RemoteProcess::cache_simix_processes) return; - // TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global` - - static_assert(std::is_same< - std::unique_ptr, - decltype(simix_global) - >::value, "Unexpected type for simix_global"); - static_assert(sizeof(simix_global) == sizeof(simgrid::simix::Global*), - "Bad size for 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.get_buffer()->actors_vector)); - MC_process_refresh_simix_actor_dynar(this, this->smx_dead_actors_infos, - remote(simix_global.get_buffer()->dead_actors_vector)); - - this->cache_flags_ |= RemoteSimulation::cache_simix_processes; -} - -} -} - -/** Get the issuer of a simcall (`req->issuer`) - * - * In split-process mode, it does the black magic necessary to get an address - * of a (shallow) copy of the data structure the issuer SIMIX actor in the local - * address space. - * - * @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 const* req) -{ - 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_); - - // Lookup by address: - for (auto& actor : mc_model_checker->get_remote_simulation().actors()) - if (actor.address == address) - return actor.copy.get_buffer(); - for (auto& actor : mc_model_checker->get_remote_simulation().dead_actors()) - if (actor.address == address) - 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->get_host()->get_cname(); - - const simgrid::mc::RemoteSimulation* process = &mc_model_checker->get_remote_simulation(); + MC_process_refresh_simix_actor_dynar(this, this->smx_actors_infos, actors_addr_); - // Read the simgrid::xbt::string in the MCed process: - simgrid::mc::ActorInformation* info = actor_info_cast(actor); - auto remote_string_address = - remote(reinterpret_cast(&actor->get_host()->get_name())); - simgrid::xbt::string_data remote_string = process->read(remote_string_address); - std::vector 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; + this->cache_flags_ |= RemoteProcess::cache_simix_processes; } -const char* MC_smx_actor_get_name(smx_actor_t actor) -{ - 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_); - info->name = process->read_string(remote(string_data.data), string_data.len); - } - return info->name.c_str(); -} - -unsigned long MC_smx_get_maxpid() -{ - unsigned long 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; -} +} // namespace simgrid::mc