X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48eccb2c1532e35819830ca56fad7cf89887359f..ab922137b20cd1e668e3da66a63134886aebe3bb:/src/mc/Process.cpp diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp index 597710f838..7ffd7b3f99 100644 --- a/src/mc/Process.cpp +++ b/src/mc/Process.cpp @@ -55,35 +55,51 @@ namespace mc { #define SO_RE "\\.so[\\.0-9]*$" #define VERSION_RE "-[\\.0-9-]*$" -// In lexicographic order (but this is currently not used in the code): -static const char *const filtered_libraries[] = { - "ld", - "libbz2", - "libboost_chrono", - "libboost_context", - "libboost_system", - "libboost_thread", - "libc", - "libc++", - "libcdt", - "libcgraph", - "libdl", - "libdw", - "libelf", - "libgcc_s", - "liblua5.1", - "liblua5.3", - "liblzma", - "libm", - "libpthread", - "librt", - "libstdc++", - "libunwind", - "libunwind-x86_64", - "libunwind-x86", - "libunwind-ptrace", - "libz" -}; +// List of library which memory segments are not considered: +static const char* const filtered_libraries[] = { +#ifdef __linux__ + "ld", +#elif defined __FreeBSD__ + "ld-elf", + "ld-elf32", + "libkvm", /* kernel data access library */ + "libprocstat", /* process and file information retrieval */ + "libthr", /* thread library */ + "libutil", +#endif + "libasan", /* gcc sanitizers */ + "libargp", /* workarounds for glibc-less systems */ + "libtsan", + "libubsan", + "libbz2", + "libboost_chrono", + "libboost_context", + "libboost_context-mt", + "libboost_system", + "libboost_thread", + "libc", + "libc++", + "libcdt", + "libcgraph", + "libcrypto", + "libcxxrt", + "libdl", + "libdw", + "libelf", + "libevent", + "libgcc_s", + "liblua5.1", + "liblua5.3", + "liblzma", + "libm", + "libpthread", + "librt", + "libstdc++", + "libunwind", + "libunwind-x86_64", + "libunwind-x86", + "libunwind-ptrace", + "libz"}; static bool is_simgrid_lib(const char* libname) { @@ -127,12 +143,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; @@ -218,8 +234,8 @@ void Process::init() remote(std_heap_var->address), simgrid::mc::ProcessIndexDisabled); - this->smx_process_infos.clear(); - this->smx_old_process_infos.clear(); + this->smx_actors_infos.clear(); + this->smx_dead_actors_infos.clear(); this->unw_addr_space = simgrid::mc::UnwindContext::createUnwindAddressSpace(); this->unw_underlying_addr_space = simgrid::unw::create_addr_space(); this->unw_underlying_context = simgrid::unw::create_context( @@ -241,7 +257,7 @@ Process::~Process() /** Refresh the information about the process * - * Do not use direclty, this is used by the getters when appropriate + * Do not use directly, this is used by the getters when appropriate * in order to have fresh data. */ void Process::refresh_heap() @@ -345,7 +361,7 @@ void Process::init_memory_map_info() regfree(&res.so_re); regfree(&res.version_re); - // Resolve time (including accross differents objects): + // Resolve time (including across different objects): for (auto const& object_info : this->object_infos) postProcessObjectInformation(this, object_info.get()); @@ -388,14 +404,14 @@ simgrid::mc::Frame* Process::find_function(RemotePtr ip) const return info ? info->find_function((void*) ip.address()) : nullptr; } -/** Find (one occurence of) the named variable definition +/** Find (one occurrence of) the named variable definition */ simgrid::mc::Variable* Process::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 // is reinstanciated in the executable memory .data/.bss. - // We need to look up the variable in the execvutable first. + // 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); @@ -415,21 +431,19 @@ simgrid::mc::Variable* Process::find_variable(const char* name) const void Process::read_variable(const char* name, void* target, size_t size) const { simgrid::mc::Variable* var = this->find_variable(name); - if (!var->address) - xbt_die("No simple location for this variable"); - if (!var->type->full_type) - xbt_die("Partial type for %s, cannot check size", name); - if ((size_t) var->type->full_type->byte_size != size) - xbt_die("Unexpected size for %s (expected %zi, was %zi)", - name, size, (size_t) var->type->full_type->byte_size); + 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 %zi, was %zi)", name, + size, (size_t)var->type->full_type->byte_size); this->read_bytes(target, size, remote(var->address)); } -std::string Process::read_string(RemotePtr address) const +std::string Process::read_string(RemotePtr address) const { if (!address) return {}; + // TODO, use std::vector with .data() in C++17 to avoid useless copies std::vector res(128); off_t off = 0; @@ -478,28 +492,26 @@ const void *Process::read_bytes(void* buffer, std::size_t size, mc_model_checker->process().read( remote(remote_smpi_privatisation_regions + process_index)); - // Address translation in the privaization segment: + // Address translation in the privatization segment: size_t offset = address.address() - (std::uint64_t)info->start_rw; address = remote((char*)privatisation_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; } /** Write data to a process memory * - * @param process the process - * @param local local memory address (source) - * @param remote target process memory address (target) - * @param len data size + * @param buffer local memory address (source) + * @param len data size + * @param address target process memory address (target) */ 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_); } @@ -631,21 +643,21 @@ void Process::ignore_local_variable(const char *var_name, const char *frame_name info->remove_local_variable(var_name, frame_name); } -std::vector& Process::simix_processes() +std::vector& Process::actors() { this->refresh_simix(); - return smx_process_infos; + return smx_actors_infos; } -std::vector& Process::old_simix_processes() +std::vector& Process::dead_actors() { this->refresh_simix(); - return smx_old_process_infos; + return smx_dead_actors_infos; } void Process::dumpStack() { - unw_addr_space_t as = unw_create_addr_space(&_UPT_accessors, __BYTE_ORDER); + unw_addr_space_t as = unw_create_addr_space(&_UPT_accessors, BYTE_ORDER); if (as == nullptr) { XBT_ERROR("Could not initialize ptrace address space"); return;