X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0306c1d1de62ea1a118115476092d66cf6fe04b1..c67e5b51697f2607390d1f2362e099b7683b5169:/src/mc/remote/RemoteClient.cpp diff --git a/src/mc/remote/RemoteClient.cpp b/src/mc/remote/RemoteClient.cpp index d243abb427..1828f2340a 100644 --- a/src/mc/remote/RemoteClient.cpp +++ b/src/mc/remote/RemoteClient.cpp @@ -1,48 +1,20 @@ -/* Copyright (c) 2014-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-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. */ #define _FILE_OFFSET_BITS 64 /* needed for pread_whole to work as expected on 32bits */ -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include - -#include -#include // PROT_* -#include -#include - -#include - -#include - -#include -#include +#include "src/mc/remote/RemoteClient.hpp" -#include "xbt/base.h" +#include "src/mc/mc_smx.hpp" +#include "src/mc/sosp/Snapshot.hpp" #include "xbt/file.hpp" #include "xbt/log.h" -#include - -#include "src/mc/mc_smx.hpp" -#include "src/mc/mc_snapshot.hpp" -#include "src/mc/mc_unw.hpp" -#include "src/mc/AddressSpace.hpp" -#include "src/mc/ObjectInformation.hpp" -#include "src/mc/Variable.hpp" -#include "src/mc/remote/RemoteClient.hpp" +#include +#include +#include // PROT_* using simgrid::mc::remote; @@ -65,16 +37,17 @@ static const std::vector filtered_libraries = { "libthr", /* thread library */ "libutil", #endif - "libasan", /* gcc sanitizers */ "libargp", /* workarounds for glibc-less systems */ - "libtsan", - "libubsan", - "libbz2", + "libasan", /* gcc sanitizers */ "libboost_chrono", "libboost_context", "libboost_context-mt", + "libboost_stacktrace_addr2line", + "libboost_stacktrace_backtrace", "libboost_system", "libboost_thread", + "libboost_timer", + "libbz2", "libc", "libc++", "libcdt", @@ -85,18 +58,33 @@ static const std::vector filtered_libraries = { "libdw", "libelf", "libevent", + "libexecinfo", + "libflang", + "libflangrti", "libgcc_s", + "libgfortran", + "libimf", + "libintlc", + "libirng", "liblua5.1", "liblua5.3", "liblzma", "libm", + "libomp", + "libpapi", + "libpfm", + "libpgmath", "libpthread", + "libquadmath", "librt", "libstdc++", + "libsvml", + "libtsan", /* gcc sanitizers */ + "libubsan", /* gcc sanitizers */ "libunwind", - "libunwind-x86_64", - "libunwind-x86", "libunwind-ptrace", + "libunwind-x86", + "libunwind-x86_64", "libz"}; static bool is_simgrid_lib(const std::string& libname) @@ -111,18 +99,21 @@ static bool is_filtered_lib(const std::string& libname) static std::string get_lib_name(const std::string& pathname) { - static const std::regex so_re("\\.so[.0-9]*$"); - static const std::regex version_re("-[.0-9-]*$"); - std::string map_basename = simgrid::xbt::Path(pathname).getBasename(); + std::string map_basename = simgrid::xbt::Path(pathname).get_base_name(); std::string libname; - std::smatch match; - if (std::regex_search(map_basename, match, so_re)) { - libname = match.prefix(); - - // Strip the version suffix: - if (std::regex_search(libname, match, version_re)) - libname = match.prefix(); + size_t pos = map_basename.rfind(".so"); + if (pos != std::string::npos) { + // strip the extension (matching regex "\.so.*$") + libname.assign(map_basename, 0, pos); + + // strip the version suffix (matching regex "-[.0-9-]*$") + while (true) { + pos = libname.rfind('-'); + if (pos == std::string::npos || libname.find_first_not_of(".0123456789", pos + 1) != std::string::npos) + break; + libname.erase(pos); + } } return libname; @@ -210,13 +201,12 @@ void RemoteClient::init() this->memory_file = fd; // Read std_heap (is a struct mdesc*): - simgrid::mc::Variable* std_heap_var = this->find_variable("__mmalloc_default_mdp"); + const simgrid::mc::Variable* std_heap_var = this->find_variable("__mmalloc_default_mdp"); if (not std_heap_var) xbt_die("No heap information in the target process"); if (not std_heap_var->address) xbt_die("No constant address for this variable"); - this->read_bytes(&this->heap_address, sizeof(mdesc*), remote(std_heap_var->address), - simgrid::mc::ProcessIndexDisabled); + this->read_bytes(&this->heap_address, sizeof(mdesc*), remote(std_heap_var->address)); this->smx_actors_infos.clear(); this->smx_dead_actors_infos.clear(); @@ -249,8 +239,8 @@ void RemoteClient::refresh_heap() { // Read/dereference/refresh the std_heap pointer: if (not this->heap) - this->heap = std::unique_ptr(new s_xbt_mheap_t()); - this->read_bytes(this->heap.get(), sizeof(mdesc), remote(this->heap_address), simgrid::mc::ProcessIndexDisabled); + this->heap.reset(new s_xbt_mheap_t()); + this->read_bytes(this->heap.get(), sizeof(mdesc), remote(this->heap_address)); this->cache_flags_ |= RemoteClient::cache_heap; } @@ -267,8 +257,7 @@ void RemoteClient::refresh_malloc_info() size_t count = this->heap->heaplimit + 1; if (this->heap_info.size() < count) this->heap_info.resize(count); - this->read_bytes(this->heap_info.data(), count * sizeof(malloc_info), remote(this->heap->heapinfo), - simgrid::mc::ProcessIndexDisabled); + this->read_bytes(this->heap_info.data(), count * sizeof(malloc_info), remote(this->heap->heapinfo)); this->cache_flags_ |= RemoteClient::cache_malloc; } @@ -375,7 +364,7 @@ simgrid::mc::Frame* RemoteClient::find_function(RemotePtr ip) const /** Find (one occurrence of) the named variable definition */ -simgrid::mc::Variable* RemoteClient::find_variable(const char* name) const +const simgrid::mc::Variable* RemoteClient::find_variable(const char* name) const { // First lookup the variable in the executable shared object. // A global variable used directly by the executable code from a library @@ -383,13 +372,13 @@ simgrid::mc::Variable* RemoteClient::find_variable(const char* name) const // We need to look up the variable in the executable first. if (this->binary_info) { std::shared_ptr const& info = this->binary_info; - simgrid::mc::Variable* var = info->find_variable(name); + const simgrid::mc::Variable* var = info->find_variable(name); if (var) return var; } for (std::shared_ptr const& info : this->object_infos) { - simgrid::mc::Variable* var = info->find_variable(name); + const simgrid::mc::Variable* var = info->find_variable(name); if (var) return var; } @@ -399,7 +388,8 @@ simgrid::mc::Variable* RemoteClient::find_variable(const char* name) const void RemoteClient::read_variable(const char* name, void* target, size_t size) const { - simgrid::mc::Variable* var = this->find_variable(name); + const simgrid::mc::Variable* var = this->find_variable(name); + xbt_assert(var, "Variable %s not found", name); xbt_assert(var->address, "No simple location for this variable"); xbt_assert(var->type->full_type, "Partial type for %s, cannot check size", name); xbt_assert((size_t)var->type->full_type->byte_size == size, "Unexpected size for %s (expected %zu, was %zu)", name, @@ -412,7 +402,6 @@ std::string RemoteClient::read_string(RemotePtr address) const if (not address) return {}; - // TODO, use std::vector with .data() in C++17 to avoid useless copies std::vector res(128); off_t off = 0; @@ -437,33 +426,8 @@ std::string RemoteClient::read_string(RemotePtr address) const } } -const void* RemoteClient::read_bytes(void* buffer, std::size_t size, RemotePtr address, int process_index, - ReadOptions options) const +void* RemoteClient::read_bytes(void* buffer, std::size_t size, RemotePtr address, ReadOptions /*options*/) const { - if (process_index != simgrid::mc::ProcessIndexDisabled) { - std::shared_ptr const& info = this->find_object_info_rw((void*)address.address()); -// Segment overlap is not handled. -#if HAVE_SMPI - if (info.get() && this->privatized(*info)) { - if (process_index < 0) - xbt_die("Missing process index"); - if (process_index >= (int)MC_smpi_process_count()) - xbt_die("Invalid process index"); - - // Read smpi_privatization_regions from MCed: - smpi_privatization_region_t remote_smpi_privatization_regions = - mc_model_checker->process().read_variable("smpi_privatization_regions"); - - s_smpi_privatization_region_t privatization_region = - mc_model_checker->process().read( - remote(remote_smpi_privatization_regions + process_index)); - - // Address translation in the privatization segment: - size_t offset = address.address() - (std::uint64_t)info->start_rw; - address = remote((char*)privatization_region.address + offset); - } -#endif - } if (pread_whole(this->memory_file, buffer, size, (size_t)address.address()) < 0) xbt_die("Read at %p from process %lli failed", (void*)address.address(), (long long)this->pid_); return buffer; @@ -583,10 +547,7 @@ void RemoteClient::unignore_heap(void* address, size_t size) while (start <= end) { cursor = (start + end) / 2; auto& region = ignored_heap_[cursor]; - if (region.address == address) { - ignored_heap_.erase(ignored_heap_.begin() + cursor); - return; - } else if (region.address < address) + if (region.address < address) start = cursor + 1; else if ((char*)region.address <= ((char*)address + size)) { ignored_heap_.erase(ignored_heap_.begin() + cursor); @@ -619,7 +580,7 @@ std::vector& RemoteClient::dead_actors() return smx_dead_actors_infos; } -void RemoteClient::dumpStack() +void RemoteClient::dump_stack() { unw_addr_space_t as = unw_create_addr_space(&_UPT_accessors, BYTE_ORDER); if (as == nullptr) { @@ -642,21 +603,20 @@ void RemoteClient::dumpStack() return; } - simgrid::mc::dumpStack(stderr, cursor); + simgrid::mc::dumpStack(stderr, std::move(cursor)); _UPT_destroy(context); unw_destroy_addr_space(as); - return; } bool RemoteClient::actor_is_enabled(aid_t pid) { - s_mc_message_actor_enabled msg{MC_MESSAGE_ACTOR_ENABLED, pid}; - process()->getChannel().send(msg); + s_mc_message_actor_enabled_t msg{MC_MESSAGE_ACTOR_ENABLED, pid}; + process()->get_channel().send(msg); char buff[MC_MESSAGE_LENGTH]; - ssize_t received = process()->getChannel().receive(buff, MC_MESSAGE_LENGTH, true); - xbt_assert(received == sizeof(s_mc_message_int), "Unexpected size in answer to ACTOR_ENABLED"); - return ((mc_message_int_t*)buff)->value; + ssize_t received = process()->get_channel().receive(buff, MC_MESSAGE_LENGTH, true); + xbt_assert(received == sizeof(s_mc_message_int_t), "Unexpected size in answer to ACTOR_ENABLED"); + return ((s_mc_message_int_t*)buff)->value; } } }