X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/24e3d7b3bb3312445ad0986fc67853995031bea0..3db47603316610f1878cb48634c357b75bbbed9d:/src/mc/mc_smx.cpp diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp index 0343dae79b..04361857b8 100644 --- a/src/mc/mc_smx.cpp +++ b/src/mc/mc_smx.cpp @@ -4,50 +4,38 @@ /* 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 +#include +#include #include -#include +#include +#include +#include #include "src/simix/smx_private.h" #include "src/mc/mc_smx.h" -#include "ModelChecker.hpp" +#include "src/mc/ModelChecker.hpp" using simgrid::mc::remote; extern "C" { -static -void MC_smx_process_info_clear(mc_smx_process_info_t p) -{ - p->hostname = NULL; - free(p->name); - p->name = NULL; -} - -xbt_dynar_t MC_smx_process_info_list_new(void) -{ - return xbt_dynar_new( - sizeof(s_mc_smx_process_info_t), - ( void_f_pvoid_t) &MC_smx_process_info_clear); -} - static inline -bool is_in_dynar(smx_process_t p, xbt_dynar_t dynar) +bool is_in_vector(smx_process_t p, std::vector& ps) { - return (uintptr_t) p >= (uintptr_t) dynar->data - && (uintptr_t) p < ((uintptr_t) dynar->data + dynar->used * dynar->elmsize); + return (uintptr_t) p >= (uintptr_t) &ps[0] + && (uintptr_t) p < (uintptr_t) &ps[ps.size()]; } static inline -mc_smx_process_info_t MC_smx_process_get_info(smx_process_t p) +simgrid::mc::SimixProcessInformation* MC_smx_process_get_info(smx_process_t p) { - assert(is_in_dynar(p, mc_model_checker->process().smx_process_infos) - || is_in_dynar(p, mc_model_checker->process().smx_old_process_infos)); - mc_smx_process_info_t process_info = - (mc_smx_process_info_t) - ((char*) p - offsetof(s_mc_smx_process_info_t, copy)); + assert(is_in_vector(p, mc_model_checker->process().smx_process_infos) + || is_in_vector(p, mc_model_checker->process().smx_old_process_infos)); + simgrid::mc::SimixProcessInformation* process_info = + (simgrid::mc::SimixProcessInformation*) + ((char*) p - offsetof(simgrid::mc::SimixProcessInformation, copy)); return process_info; } @@ -59,25 +47,23 @@ mc_smx_process_info_t MC_smx_process_get_info(smx_process_t p) */ static void MC_process_refresh_simix_process_list( simgrid::mc::Process* process, - xbt_dynar_t target, xbt_swag_t remote_swag) + std::vector& target, 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(remote_swag)); - smx_process_t p; - xbt_dynar_reset(target); - // Load each element of the dynar from the MCed process: int i = 0; - for (p = (smx_process_t) swag.head; p; ++i) { + for (smx_process_t p = (smx_process_t) swag.head; p; ++i) { - s_mc_smx_process_info_t info; + simgrid::mc::SimixProcessInformation info; info.address = p; - info.name = NULL; - info.hostname = NULL; + info.hostname = nullptr; process->read_bytes(&info.copy, sizeof(info.copy), remote(p)); - xbt_dynar_push(target, &info); + target.push_back(std::move(info)); // Lookup next process address: p = (smx_process_t) xbt_swag_getNext(&info.copy, swag.offset); @@ -85,29 +71,35 @@ static void MC_process_refresh_simix_process_list( assert(i == swag.count); } -void MC_process_smx_refresh(simgrid::mc::Process* process) +namespace simgrid { +namespace mc { + +void Process::refresh_simix() { xbt_assert(mc_mode == MC_MODE_SERVER); - if (process->cache_flags & MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES) + if (this->cache_flags & MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES) return; // TODO, avoid to reload `&simix_global`, `simix_global`, `*simix_global` // simix_global_p = REMOTE(simix_global); smx_global_t simix_global_p; - process->read_variable("simix_global", &simix_global_p, sizeof(simix_global_p)); + this->read_variable("simix_global", &simix_global_p, sizeof(simix_global_p)); // simix_global = REMOTE(*simix_global) s_smx_global_t simix_global; - process->read_bytes(&simix_global, sizeof(simix_global), + this->read_bytes(&simix_global, sizeof(simix_global), remote(simix_global_p)); MC_process_refresh_simix_process_list( - process, process->smx_process_infos, simix_global.process_list); + this, this->smx_process_infos, simix_global.process_list); MC_process_refresh_simix_process_list( - process, process->smx_old_process_infos, simix_global.process_to_destroy); + this, this->smx_old_process_infos, simix_global.process_to_destroy); + + this->cache_flags |= MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES; +} - process->cache_flags |= MC_PROCESS_CACHE_FLAG_SIMIX_PROCESSES; +} } /** Get the issuer of a simcall (`req->issuer`) @@ -124,21 +116,16 @@ smx_process_t MC_smx_simcall_get_issuer(smx_simcall_t req) if (mc_mode == MC_MODE_CLIENT) return req->issuer; - MC_process_smx_refresh(&mc_model_checker->process()); - // This is the address of the smx_process in the MCed process: void* address = req->issuer; - unsigned i; - mc_smx_process_info_t p; - // Lookup by address: - xbt_dynar_foreach_ptr(mc_model_checker->process().smx_process_infos, i, p) - if (p->address == address) - return &p->copy; - xbt_dynar_foreach_ptr(mc_model_checker->process().smx_old_process_infos, i, p) - if (p->address == address) - return &p->copy; + for (auto& p : mc_model_checker->process().simix_processes()) + if (p.address == address) + return &p.copy; + for (auto& p : mc_model_checker->process().old_simix_processes()) + if (p.address == address) + return &p.copy; xbt_die("Issuer not found"); } @@ -146,37 +133,34 @@ smx_process_t MC_smx_simcall_get_issuer(smx_simcall_t req) smx_process_t MC_smx_resolve_process(smx_process_t process_remote_address) { if (!process_remote_address) - return NULL; + return nullptr; if (mc_mode == MC_MODE_CLIENT) return process_remote_address; - mc_smx_process_info_t process_info = MC_smx_resolve_process_info(process_remote_address); + simgrid::mc::SimixProcessInformation* process_info = MC_smx_resolve_process_info(process_remote_address); if (process_info) return &process_info->copy; else - return NULL; + return nullptr; } -mc_smx_process_info_t MC_smx_resolve_process_info(smx_process_t process_remote_address) +simgrid::mc::SimixProcessInformation* MC_smx_resolve_process_info(smx_process_t process_remote_address) { if (mc_mode == MC_MODE_CLIENT) xbt_die("No process_info for local process is not enabled."); - - unsigned index; - mc_smx_process_info_t process_info; - xbt_dynar_foreach_ptr(mc_model_checker->process().smx_process_infos, index, process_info) - if (process_info->address == process_remote_address) - return process_info; - xbt_dynar_foreach_ptr(mc_model_checker->process().smx_old_process_infos, index, process_info) - if (process_info->address == process_remote_address) - return process_info; + for (auto& process_info : mc_model_checker->process().smx_process_infos) + if (process_info.address == process_remote_address) + return &process_info; + for (auto& process_info : mc_model_checker->process().smx_old_process_infos) + if (process_info.address == process_remote_address) + return &process_info; xbt_die("Process info not found"); } const char* MC_smx_process_get_host_name(smx_process_t p) { if (mc_mode == MC_MODE_CLIENT) - return SIMIX_host_get_name(p->host); + return sg_host_get_name(p->host); simgrid::mc::Process* process = &mc_model_checker->process(); @@ -196,10 +180,10 @@ const char* MC_smx_process_get_host_name(smx_process_t p) ~fake_host() {} }; fake_host foo; - const size_t offset = (char*) &foo.host.getName() - (char*) &foo.host; + const size_t offset = (char*) &foo.host.name() - (char*) &foo.host; // Read the simgrid::xbt::string in the MCed process: - mc_smx_process_info_t info = MC_smx_process_get_info(p); + simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p); simgrid::xbt::string_data remote_string; auto remote_string_address = remote( (simgrid::xbt::string_data*) ((char*) p->host + offset)); @@ -216,26 +200,26 @@ const char* MC_smx_process_get_name(smx_process_t p) if (mc_mode == MC_MODE_CLIENT) return p->name; if (!p->name) - return NULL; + return nullptr; - mc_smx_process_info_t info = MC_smx_process_get_info(p); - if (!info->name) { - info->name = process->read_string(p->name); + simgrid::mc::SimixProcessInformation* info = MC_smx_process_get_info(p); + if (info->name.empty()) { + char* name = process->read_string(p->name); + info->name = name; + free(name); } - return info->name; + return info->name.c_str(); } -#ifdef HAVE_SMPI +#if HAVE_SMPI int MC_smpi_process_count(void) { if (mc_mode == MC_MODE_CLIENT) return smpi_process_count(); - else { - int res; - mc_model_checker->process().read_variable("process_count", - &res, sizeof(res)); - return res; - } + int res; + mc_model_checker->process().read_variable("process_count", + &res, sizeof(res)); + return res; } #endif