X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/81e2987ceb9329c50f0ac8109504aa5c784071e2..cf71783d4bf34090b9ba489365fcf85b22b04e50:/src/mc/Process.cpp diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp index b001926912..5360933c4a 100644 --- a/src/mc/Process.cpp +++ b/src/mc/Process.cpp @@ -8,7 +8,6 @@ #include #include -#include #include #include @@ -25,14 +24,16 @@ #include #include +#include +#include +#include #include -#include "mc_object_info.h" -#include "mc_unw.h" -#include "mc_snapshot.h" -#include "mc_ignore.h" -#include "mc_smx.h" -#include "mc_server.h" +#include "src/mc/mc_object_info.h" +#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" #include "src/mc/AddressSpace.hpp" @@ -101,11 +102,11 @@ struct s_mc_memory_map_re { static char* MC_get_lib_name(const char* pathname, struct s_mc_memory_map_re* res) { - const char* map_basename = basename((char*) pathname); + const char* map_basename = xbt_basename((char*) pathname); regmatch_t match; if(regexec(&res->so_re, map_basename, 1, &match, 0)) - return NULL; + return nullptr; char* libname = strndup(map_basename, match.rm_so); @@ -167,7 +168,7 @@ static void MC_zero_buffer_init(void) int fd = open("/dev/zero", O_RDONLY); if (fd<0) xbt_die("Could not open /dev/zero"); - zero_buffer = mmap(NULL, zero_buffer_size, PROT_READ, MAP_SHARED, fd, 0); + zero_buffer = mmap(nullptr, zero_buffer_size, PROT_READ, MAP_SHARED, fd, 0); if (zero_buffer == MAP_FAILED) xbt_die("Could not map the zero buffer"); close(fd); @@ -207,76 +208,65 @@ int open_vm(pid_t pid, int flags) namespace simgrid { namespace mc { -Process::Process(pid_t pid, int sockfd) : AddressSpace(this) +Process::Process(pid_t pid, int sockfd) : + AddressSpace(this),pid_(pid), socket_(sockfd), running_(true) +{} + +void Process::init() { - Process* process = this; - process->socket_ = sockfd; - process->pid_ = pid; - process->running_ = true; - process->status_ = 0; - process->memory_map_ = simgrid::xbt::get_memory_map(pid); - process->cache_flags = MC_PROCESS_CACHE_FLAG_NONE; - process->init_memory_map_info(); - process->clear_refs_fd_ = -1; - process->pagemap_fd_ = -1; - - int fd = open_vm(process->pid_, O_RDWR); + this->memory_map_ = simgrid::xbt::get_memory_map(this->pid_); + this->init_memory_map_info(); + + int fd = open_vm(this->pid_, O_RDWR); if (fd<0) xbt_die("Could not open file for process virtual address space"); - process->memory_file = fd; + this->memory_file = fd; // Read std_heap (is a struct mdesc*): - simgrid::mc::Variable* std_heap_var = process->find_variable("__mmalloc_default_mdp"); + simgrid::mc::Variable* std_heap_var = this->find_variable("__mmalloc_default_mdp"); if (!std_heap_var) xbt_die("No heap information in the target process"); if(!std_heap_var->address) xbt_die("No constant address for this variable"); - process->read_bytes(&process->heap_address, sizeof(struct mdesc*), + this->read_bytes(&this->heap_address, sizeof(struct mdesc*), remote(std_heap_var->address), simgrid::mc::ProcessIndexDisabled); - process->smx_process_infos = MC_smx_process_info_list_new(); - process->smx_old_process_infos = MC_smx_process_info_list_new(); - process->unw_addr_space = unw_create_addr_space(&mc_unw_accessors , __BYTE_ORDER); - process->unw_underlying_addr_space = unw_create_addr_space(&mc_unw_vmread_accessors, __BYTE_ORDER); - process->unw_underlying_context = _UPT_create(pid); + this->smx_process_infos.clear(); + this->smx_old_process_infos.clear(); + this->unw_addr_space = unw_create_addr_space(&mc_unw_accessors , __BYTE_ORDER); + this->unw_underlying_addr_space = unw_create_addr_space(&mc_unw_vmread_accessors, __BYTE_ORDER); + this->unw_underlying_context = _UPT_create(this->pid_); } Process::~Process() { - Process* process = this; - if (this->socket_ >= 0 && close(this->socket_) < 0) xbt_die("Could not close communication socket"); - process->pid_ = 0; - - process->maestro_stack_start_ = nullptr; - process->maestro_stack_end_ = nullptr; - - xbt_dynar_free(&process->smx_process_infos); - xbt_dynar_free(&process->smx_old_process_infos); + this->maestro_stack_start_ = nullptr; + this->maestro_stack_end_ = nullptr; - if (process->memory_file >= 0) { - close(process->memory_file); + if (this->memory_file >= 0) { + close(this->memory_file); } - if (process->unw_underlying_addr_space != unw_local_addr_space) { - unw_destroy_addr_space(process->unw_underlying_addr_space); - _UPT_destroy(process->unw_underlying_context); + 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); } - process->unw_underlying_context = NULL; - process->unw_underlying_addr_space = NULL; + this->unw_underlying_context = nullptr; + this->unw_underlying_addr_space = nullptr; - unw_destroy_addr_space(process->unw_addr_space); - process->unw_addr_space = NULL; + unw_destroy_addr_space(this->unw_addr_space); + this->unw_addr_space = nullptr; - process->cache_flags = MC_PROCESS_CACHE_FLAG_NONE; + this->cache_flags = MC_PROCESS_CACHE_FLAG_NONE; - if (process->clear_refs_fd_ >= 0) - close(process->clear_refs_fd_); - if (process->pagemap_fd_ >= 0) - close(process->pagemap_fd_); + if (this->clear_refs_fd_ >= 0) + close(this->clear_refs_fd_); + if (this->pagemap_fd_ >= 0) + close(this->pagemap_fd_); } /** Refresh the information about the process @@ -321,8 +311,8 @@ void Process::init_memory_map_info() this->maestro_stack_start_ = nullptr; this->maestro_stack_end_ = nullptr; this->object_infos.resize(0); - this->binary_info = NULL; - this->libsimgrid_info = NULL; + this->binary_info = nullptr; + this->libsimgrid_info = nullptr; struct s_mc_memory_map_re res; @@ -331,7 +321,7 @@ void Process::init_memory_map_info() std::vector const& maps = this->memory_map_; - const char* current_name = NULL; + const char* current_name = nullptr; this->object_infos.resize(0); @@ -341,7 +331,7 @@ void Process::init_memory_map_info() // Nothing to do if (maps[i].pathname.empty()) { - current_name = NULL; + current_name = nullptr; continue; } @@ -351,7 +341,7 @@ void Process::init_memory_map_info() this->maestro_stack_start_ = remote(reg.start_addr); this->maestro_stack_end_ = remote(reg.end_addr); } - current_name = NULL; + current_name = nullptr; continue; } @@ -363,7 +353,7 @@ void Process::init_memory_map_info() continue; const bool is_executable = !i; - char* libname = NULL; + char* libname = nullptr; if (!is_executable) { libname = MC_get_lib_name(pathname, &res); if(!libname) @@ -397,7 +387,7 @@ void Process::init_memory_map_info() XBT_DEBUG("Get debug information done !"); } -std::shared_ptr Process::find_object_info(remote_ptr addr) const +std::shared_ptr Process::find_object_info(RemotePtr addr) const { for (auto const& object_info : this->object_infos) { if (addr.address() >= (std::uint64_t)object_info->start @@ -405,10 +395,10 @@ std::shared_ptr Process::find_object_info(remote return object_info; } } - return NULL; + return nullptr; } -std::shared_ptr Process::find_object_info_exec(remote_ptr addr) const +std::shared_ptr Process::find_object_info_exec(RemotePtr addr) const { for (std::shared_ptr const& info : this->object_infos) { if (addr.address() >= (std::uint64_t) info->start_exec @@ -419,7 +409,7 @@ std::shared_ptr Process::find_object_info_exec(remote_ptr Process::find_object_info_rw(remote_ptr addr) const +std::shared_ptr Process::find_object_info_rw(RemotePtr addr) const { for (std::shared_ptr const& info : this->object_infos) { if (addr.address() >= (std::uint64_t)info->start_rw @@ -430,7 +420,7 @@ std::shared_ptr Process::find_object_info_rw(remote_ptr return nullptr; } -simgrid::mc::Frame* Process::find_function(remote_ptr ip) const +simgrid::mc::Frame* Process::find_function(RemotePtr ip) const { std::shared_ptr info = this->find_object_info_exec(ip); return info ? info->find_function((void*) ip.address()) : nullptr; @@ -457,7 +447,7 @@ simgrid::mc::Variable* Process::find_variable(const char* name) const return var; } - return NULL; + return nullptr; } void Process::read_variable(const char* name, void* target, size_t size) const @@ -473,10 +463,10 @@ void Process::read_variable(const char* name, void* target, size_t size) const this->read_bytes(target, size, remote(var->address)); } -char* Process::read_string(remote_ptr address) const +char* Process::read_string(RemotePtr address) const { if (!address) - return NULL; + return nullptr; off_t len = 128; char* res = (char*) malloc(len); @@ -506,15 +496,15 @@ char* Process::read_string(remote_ptr address) const } const void *Process::read_bytes(void* buffer, std::size_t size, - remote_ptr address, int process_index, - AddressSpace::ReadMode mode) const + RemotePtr address, int process_index, + 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. #ifdef HAVE_SMPI - if (info.get() && info.get()->privatized()) { + if (info.get() && this->privatized(*info)) { if (process_index < 0) xbt_die("Missing process index"); if (process_index >= (int) MC_smpi_process_count()) @@ -548,13 +538,13 @@ const void *Process::read_bytes(void* buffer, std::size_t size, * @param remote target process memory address (target) * @param len data size */ -void Process::write_bytes(const void* buffer, size_t len, remote_ptr address) +void Process::write_bytes(const void* buffer, size_t len, RemotePtr address) { if (pwrite_whole(this->memory_file, buffer, len, address.address()) < 0) xbt_die("Write to process %lli failed", (long long) this->pid_); } -void Process::clear_bytes(remote_ptr address, size_t len) +void Process::clear_bytes(RemotePtr address, size_t len) { pthread_once(&zero_buffer_flag, MC_zero_buffer_init); while (len) { @@ -637,5 +627,83 @@ void Process::read_pagemap(uint64_t* pagemap, size_t page_start, size_t page_cou xbt_die("Could not read pagemap"); } +void Process::ignore_heap(IgnoredHeapRegion const& region) +{ + if (ignored_heap_.empty()) { + ignored_heap_.push_back(std::move(region)); + return; + } + + typedef std::vector::size_type size_type; + + size_type start = 0; + size_type end = ignored_heap_.size() - 1; + + // Binary search the position of insertion: + size_type cursor; + while (start <= end) { + cursor = start + (end - start) / 2; + auto& current_region = ignored_heap_[cursor]; + if (current_region.address == region.address) + return; + else if (current_region.address < region.address) + start = cursor + 1; + else if (cursor != 0) + end = cursor - 1; + // Avoid underflow: + else + break; + } + + // Insert it mc_heap_ignore_region_t: + if (ignored_heap_[cursor].address < region.address) + ++cursor; + ignored_heap_.insert( ignored_heap_.begin() + cursor, region); +} + +void Process::unignore_heap(void *address, size_t size) +{ + typedef std::vector::size_type size_type; + + size_type start = 0; + size_type end = ignored_heap_.size() - 1; + + // Binary search: + size_type cursor; + 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) + start = cursor + 1; + else if ((char *) region.address <= ((char *) address + size)) { + ignored_heap_.erase(ignored_heap_.begin() + cursor); + return; + } else if (cursor != 0) + end = cursor - 1; + // Avoid underflow: + else + break; + } +} + +void Process::ignore_local_variable(const char *var_name, const char *frame_name) +{ + if (frame_name != nullptr && strcmp(frame_name, "*") == 0) + frame_name = nullptr; + for (std::shared_ptr const& info : + this->object_infos) + info->remove_local_variable(var_name, frame_name); +} + +std::vector& Process::simix_processes() +{ + xbt_assert(mc_mode != MC_MODE_CLIENT); + MC_process_smx_refresh(&mc_model_checker->process()); + return smx_process_infos; +} + } }