X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d3154c75960afc4f3fe7e53c835e35f2584ed97a..fd769219531a772284d75320187a0ef9f8118afd:/src/mc/Process.cpp diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp index 5360933c4a..6434732f50 100644 --- a/src/mc/Process.cpp +++ b/src/mc/Process.cpp @@ -47,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", @@ -82,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; @@ -100,7 +106,7 @@ 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); @@ -130,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; } @@ -150,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; } @@ -163,7 +168,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 MC_zero_buffer_init(void) +static void zero_buffer_init(void) { int fd = open("/dev/zero", O_RDONLY); if (fd<0) @@ -182,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; @@ -199,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) {} @@ -247,9 +240,8 @@ Process::~Process() this->maestro_stack_start_ = nullptr; this->maestro_stack_end_ = nullptr; - 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); @@ -355,10 +347,10 @@ void Process::init_memory_map_info() const bool is_executable = !i; 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); } @@ -389,34 +381,28 @@ void Process::init_memory_map_info() 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 nullptr; } 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(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; } @@ -546,7 +532,7 @@ void Process::write_bytes(const void* buffer, size_t len, RemotePtr addres 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); }