X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..83e12528b0f7fde3d3fc54fe56626c2043c39280:/src/mc/mc_smx.cpp diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp index f725c877f3..f72a03b50c 100644 --- a/src/mc/mc_smx.cpp +++ b/src/mc/mc_smx.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2020. 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. */ @@ -19,7 +19,7 @@ using simgrid::mc::remote; 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); return process_info; @@ -31,7 +31,7 @@ static inline simgrid::mc::ActorInformation* actor_info_cast(smx_actor_t actor) * @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::RemoteClient* process, std::vector& target, simgrid::mc::RemotePtr remote_dynar) { @@ -45,8 +45,8 @@ static void MC_process_refresh_simix_actor_dynar(simgrid::mc::RemoteClient* proc // 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(data[i]); info.hostname = nullptr; process->read_bytes(&info.copy, sizeof(info.copy), remote(data[i])); @@ -77,9 +77,9 @@ void RemoteClient::refresh_simix() 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_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; } @@ -96,20 +96,20 @@ 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); // 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()) if (actor.address == address) - return actor.copy.getBuffer(); + return actor.copy.get_buffer(); for (auto& actor : mc_model_checker->process().dead_actors()) if (actor.address == address) - return actor.copy.getBuffer(); + return actor.copy.get_buffer(); xbt_die("Issuer not found"); } @@ -117,31 +117,14 @@ 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(); - - 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.getName() - (char*)&foo.host; + const simgrid::mc::RemoteClient* process = &mc_model_checker->process(); // 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(&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)); @@ -151,34 +134,24 @@ const char* MC_smx_actor_get_host_name(smx_actor_t actor) const char* MC_smx_actor_get_name(smx_actor_t actor) { - simgrid::mc::RemoteClient* process = &mc_model_checker->process(); + const 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 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->process().find_variable(name) == nullptr) + name = "maxpid"; // We seem to miss the namespaces when compiling with GCC + mc_model_checker->process().read_variable(name, &maxpid, sizeof(maxpid)); return maxpid; }