X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07483e97b12350d1d293f19689575f0fbdcf0246..c9680266ff5262307dd726d248c4e965cacc8e21:/src/mc/Process.cpp?ds=sidebyside diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp index 30a45ff7c9..d4d71ea8cd 100644 --- a/src/mc/Process.cpp +++ b/src/mc/Process.cpp @@ -1,10 +1,9 @@ -/* Copyright (c) 2014-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2014-2017. 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 +#define _FILE_OFFSET_BITS 64 /* needed for pread_whole to work as expected on 32bits */ #include #include @@ -28,13 +27,12 @@ #include #include -#include -#include +#include "xbt/base.h" +#include "xbt/log.h" #include #include "src/mc/mc_unw.h" #include "src/mc/mc_snapshot.h" -#include "src/mc/mc_ignore.h" #include "src/mc/mc_smx.h" #include "src/mc/Process.hpp" @@ -81,6 +79,7 @@ static const char* const filtered_libraries[] = { "libc++", "libcdt", "libcgraph", + "libcrypto", "libcxxrt", "libdl", "libdw", @@ -102,7 +101,7 @@ static const char* const filtered_libraries[] = { static bool is_simgrid_lib(const char* libname) { - return !strcmp(libname, "libsimgrid"); + return not strcmp(libname, "libsimgrid"); } static bool is_filtered_lib(const char* libname) @@ -133,7 +132,7 @@ static char* get_lib_name(const char* pathname, struct s_mc_memory_map_re* res) map_basename = nullptr; // Strip the version suffix: - if(libname && !regexec(&res->version_re, libname, 1, &match, 0)) { + if (libname && not regexec(&res->version_re, libname, 1, &match, 0)) { char* temp = libname; libname = strndup(temp, match.rm_so); free(temp); @@ -142,12 +141,12 @@ static char* get_lib_name(const char* pathname, struct s_mc_memory_map_re* res) return libname; } -static ssize_t pread_whole(int fd, void *buf, size_t count, std::uint64_t offset) +static ssize_t pread_whole(int fd, void *buf, size_t count, off_t offset) { char* buffer = (char*) buf; ssize_t real_count = count; while (count) { - ssize_t res = pread(fd, buffer, count, (std::int64_t) offset); + ssize_t res = pread(fd, buffer, count, offset); if (res > 0) { count -= res; buffer += res; @@ -184,7 +183,7 @@ static pthread_once_t zero_buffer_flag = PTHREAD_ONCE_INIT; static const void* zero_buffer; static const size_t zero_buffer_size = 10 * 4096; -static void zero_buffer_init(void) +static void zero_buffer_init() { int fd = open("/dev/zero", O_RDONLY); if (fd<0) @@ -225,9 +224,9 @@ void Process::init() // Read std_heap (is a struct mdesc*): simgrid::mc::Variable* std_heap_var = this->find_variable("__mmalloc_default_mdp"); - if (!std_heap_var) + if (not std_heap_var) xbt_die("No heap information in the target process"); - if(!std_heap_var->address) + if (not std_heap_var->address) xbt_die("No constant address for this variable"); this->read_bytes(&this->heap_address, sizeof(struct mdesc*), remote(std_heap_var->address), @@ -247,8 +246,10 @@ Process::~Process() close(this->memory_file); if (this->unw_underlying_addr_space != unw_local_addr_space) { - unw_destroy_addr_space(this->unw_underlying_addr_space); - _UPT_destroy(this->unw_underlying_context); + if (this->unw_underlying_addr_space) + unw_destroy_addr_space(this->unw_underlying_addr_space); + if (this->unw_underlying_context) + _UPT_destroy(this->unw_underlying_context); } unw_destroy_addr_space(this->unw_addr_space); @@ -262,7 +263,7 @@ Process::~Process() void Process::refresh_heap() { // Read/dereference/refresh the std_heap pointer: - if (!this->heap) + if (not this->heap) this->heap = std::unique_ptr(new s_xbt_mheap_t()); this->read_bytes(this->heap.get(), sizeof(struct mdesc), remote(this->heap_address), simgrid::mc::ProcessIndexDisabled); @@ -320,7 +321,7 @@ void Process::init_memory_map_info() // [stack], [vvar], [vsyscall], [vdso] ... if (pathname[0] == '[') { - if ((reg.prot & PROT_WRITE) && !memcmp(pathname, "[stack]", 7)) { + if ((reg.prot & PROT_WRITE) && not memcmp(pathname, "[stack]", 7)) { this->maestro_stack_start_ = remote(reg.start_addr); this->maestro_stack_end_ = remote(reg.end_addr); } @@ -332,14 +333,14 @@ void Process::init_memory_map_info() continue; current_name = pathname; - if (!(reg.prot & PROT_READ) && (reg.prot & PROT_EXEC)) + if (not(reg.prot & PROT_READ) && (reg.prot & PROT_EXEC)) continue; - const bool is_executable = !i; + const bool is_executable = not i; char* libname = nullptr; - if (!is_executable) { + if (not is_executable) { libname = get_lib_name(pathname, &res); - if(!libname) + if (not libname) continue; if (is_filtered_lib(libname)) { free(libname); @@ -439,7 +440,7 @@ void Process::read_variable(const char* name, void* target, size_t size) const std::string Process::read_string(RemotePtr address) const { - if (!address) + if (not address) return {}; // TODO, use std::vector with .data() in C++17 to avoid useless copies @@ -482,24 +483,23 @@ const void *Process::read_bytes(void* buffer, std::size_t size, if (process_index >= (int) MC_smpi_process_count()) xbt_die("Invalid process index"); - // Read smpi_privatisation_regions from MCed: - smpi_privatisation_region_t remote_smpi_privatisation_regions = - mc_model_checker->process().read_variable( - "smpi_privatisation_regions"); + // 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_privatisation_region_t privatisation_region = - mc_model_checker->process().read( - remote(remote_smpi_privatisation_regions + process_index)); + 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*)privatisation_region.address + offset); + address = remote((char*)privatization_region.address + offset); } #endif } - - if (pread_whole(this->memory_file, buffer, size, address.address()) < 0) - xbt_die("Read from process %lli failed", (long long) this->pid_); + 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; } @@ -511,7 +511,7 @@ const void *Process::read_bytes(void* buffer, std::size_t size, */ void Process::write_bytes(const void* buffer, size_t len, RemotePtr address) { - if (pwrite_whole(this->memory_file, buffer, len, address.address()) < 0) + if (pwrite_whole(this->memory_file, buffer, len, (size_t)address.address()) < 0) xbt_die("Write to process %lli failed", (long long) this->pid_); }