X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d95145df4657e19b9a02db53de4c9f758a0c6f5..e6ca184e99d50d0ee8fe405a83ee5277e2ecfce6:/src/mc/Process.cpp diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp index cb39d09efc..6434732f50 100644 --- a/src/mc/Process.cpp +++ b/src/mc/Process.cpp @@ -24,6 +24,9 @@ #include #include +#include +#include +#include #include #include "src/mc/mc_object_info.h" @@ -44,12 +47,18 @@ extern "C" { XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_process, mc, "MC process information"); +} + // ***** Helper stuff +namespace simgrid { +namespace mc { + #define SO_RE "\\.so[\\.0-9]*$" #define VERSION_RE "-[\\.0-9-]*$" -static const char *const FILTERED_LIBS[] = { +// In lexicographic order (but this is currently not used in the code): +static const char *const filtered_libraries[] = { "ld", "libbz2", "libboost_chrono", @@ -79,14 +88,14 @@ static const char *const FILTERED_LIBS[] = { "libz" }; -static bool MC_is_simgrid_lib(const char* libname) +static bool is_simgrid_lib(const char* libname) { return !strcmp(libname, "libsimgrid"); } -static bool MC_is_filtered_lib(const char* libname) +static bool is_filtered_lib(const char* libname) { - for (const char* filtered_lib : FILTERED_LIBS) + for (const char* filtered_lib : filtered_libraries) if (strcmp(libname, filtered_lib)==0) return true; return false; @@ -97,13 +106,13 @@ struct s_mc_memory_map_re { regex_t version_re; }; -static char* MC_get_lib_name(const char* pathname, struct s_mc_memory_map_re* res) +static char* get_lib_name(const char* pathname, struct s_mc_memory_map_re* res) { 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); @@ -127,9 +136,9 @@ static ssize_t pread_whole(int fd, void *buf, size_t count, std::uint64_t offset count -= res; buffer += res; offset += res; - } else if (res==0) { + } else if (res==0) return -1; - } else if (errno != EINTR) { + else if (errno != EINTR) { perror("pread_whole"); return -1; } @@ -147,11 +156,10 @@ static ssize_t pwrite_whole(int fd, const void *buf, size_t count, off_t offset) count -= res; buffer += res; offset += res; - } else if (res==0) { + } else if (res==0) return -1; - } else if (errno != EINTR) { + else if (errno != EINTR) return -1; - } } return real_count; } @@ -160,12 +168,12 @@ 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 MC_zero_buffer_init(void) +static void 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); @@ -179,11 +187,6 @@ int open_process_file(pid_t pid, const char* file, int flags) return open(buff, flags); } -} - -namespace simgrid { -namespace mc { - int open_vm(pid_t pid, int flags) { const size_t buffer_size = 30; @@ -196,15 +199,8 @@ int open_vm(pid_t pid, int flags) return open(buffer, flags); } - -} -} - // ***** Process -namespace simgrid { -namespace mc { - Process::Process(pid_t pid, int sockfd) : AddressSpace(this),pid_(pid), socket_(sockfd), running_(true) {} @@ -229,8 +225,8 @@ void Process::init() remote(std_heap_var->address), simgrid::mc::ProcessIndexDisabled); - this->smx_process_infos = MC_smx_process_info_list_new(); - this->smx_old_process_infos = MC_smx_process_info_list_new(); + 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_); @@ -244,22 +240,18 @@ Process::~Process() this->maestro_stack_start_ = nullptr; this->maestro_stack_end_ = nullptr; - xbt_dynar_free(&this->smx_process_infos); - xbt_dynar_free(&this->smx_old_process_infos); - - if (this->memory_file >= 0) { + if (this->memory_file >= 0) 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); } - this->unw_underlying_context = NULL; - this->unw_underlying_addr_space = NULL; + this->unw_underlying_context = nullptr; + this->unw_underlying_addr_space = nullptr; unw_destroy_addr_space(this->unw_addr_space); - this->unw_addr_space = NULL; + this->unw_addr_space = nullptr; this->cache_flags = MC_PROCESS_CACHE_FLAG_NONE; @@ -311,8 +303,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; @@ -321,7 +313,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); @@ -331,7 +323,7 @@ void Process::init_memory_map_info() // Nothing to do if (maps[i].pathname.empty()) { - current_name = NULL; + current_name = nullptr; continue; } @@ -341,7 +333,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; } @@ -353,12 +345,12 @@ 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); + libname = get_lib_name(pathname, &res); if(!libname) continue; - if (MC_is_filtered_lib(libname)) { + if (is_filtered_lib(libname)) { free(libname); continue; } @@ -369,7 +361,7 @@ void Process::init_memory_map_info() this->object_infos.push_back(info); if (is_executable) this->binary_info = info; - else if (libname && MC_is_simgrid_lib(libname)) + else if (libname && is_simgrid_lib(libname)) this->libsimgrid_info = info; free(libname); } @@ -387,40 +379,34 @@ 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) { + for (auto const& object_info : this->object_infos) if (addr.address() >= (std::uint64_t)object_info->start - && addr.address() <= (std::uint64_t)object_info->end) { + && addr.address() <= (std::uint64_t)object_info->end) 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) { + for (std::shared_ptr const& info : this->object_infos) if (addr.address() >= (std::uint64_t) info->start_exec - && addr.address() <= (std::uint64_t) info->end_exec) { + && addr.address() <= (std::uint64_t) info->end_exec) return info; - } - } return nullptr; } -std::shared_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) { + for (std::shared_ptr const& info : this->object_infos) if (addr.address() >= (std::uint64_t)info->start_rw - && addr.address() <= (std::uint64_t)info->end_rw) { + && addr.address() <= (std::uint64_t)info->end_rw) return info; - } - } 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; @@ -447,7 +433,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 @@ -463,10 +449,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); @@ -496,7 +482,7 @@ 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, + RemotePtr address, int process_index, ReadOptions options) const { if (process_index != simgrid::mc::ProcessIndexDisabled) { @@ -538,15 +524,15 @@ 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); + pthread_once(&zero_buffer_flag, zero_buffer_init); while (len) { size_t s = len > zero_buffer_size ? zero_buffer_size : len; this->write_bytes(zero_buffer, s, address); @@ -589,16 +575,14 @@ void Process::ignore_region(std::uint64_t addr, std::size_t size) std::size_t position; if (current_region->addr == addr) { - if (current_region->size < size) { + if (current_region->size < size) position = cursor + 1; - } else { + else position = cursor; - } - } else if (current_region->addr < addr) { + } else if (current_region->addr < addr) position = cursor + 1; - } else { + else position = cursor; - } ignored_regions_.insert( ignored_regions_.begin() + position, region); } @@ -698,5 +682,12 @@ 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() +{ + xbt_assert(mc_mode != MC_MODE_CLIENT); + MC_process_smx_refresh(&mc_model_checker->process()); + return smx_process_infos; +} + } }