X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/269363f1bc63093972eb06e0537ca5f22ab8a53d..82f048773df5d2086fe2044d2bef0cbffdf6f982:/src/mc/Process.cpp diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp index 80fa3f2419..3f06a40b42 100644 --- a/src/mc/Process.cpp +++ b/src/mc/Process.cpp @@ -29,7 +29,6 @@ #include #include -#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" @@ -42,17 +41,19 @@ using simgrid::mc::remote; -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 +83,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,15 +101,19 @@ 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); + char* map_basename = xbt_basename(pathname); regmatch_t match; - if(regexec(&res->so_re, map_basename, 1, &match, 0)) + if(regexec(&res->so_re, map_basename, 1, &match, 0)) { + free(map_basename); return nullptr; + } char* libname = strndup(map_basename, match.rm_so); + free(map_basename); + map_basename = nullptr; // Strip the version suffix: if(libname && !regexec(&res->version_re, libname, 1, &match, 0)) { @@ -162,7 +167,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) @@ -181,11 +186,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; @@ -198,17 +198,10 @@ 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) + AddressSpace(this), pid_(pid), channel_(sockfd), running_(true) {} void Process::init() @@ -240,12 +233,6 @@ void Process::init() Process::~Process() { - if (this->socket_ >= 0 && close(this->socket_) < 0) - xbt_die("Could not close communication socket"); - - this->maestro_stack_start_ = nullptr; - this->maestro_stack_end_ = nullptr; - if (this->memory_file >= 0) close(this->memory_file); @@ -253,13 +240,8 @@ Process::~Process() unw_destroy_addr_space(this->unw_underlying_addr_space); _UPT_destroy(this->unw_underlying_context); } - this->unw_underlying_context = nullptr; - this->unw_underlying_addr_space = nullptr; unw_destroy_addr_space(this->unw_addr_space); - this->unw_addr_space = nullptr; - - this->cache_flags = MC_PROCESS_CACHE_FLAG_NONE; if (this->clear_refs_fd_ >= 0) close(this->clear_refs_fd_); @@ -321,7 +303,7 @@ void Process::init_memory_map_info() const char* current_name = nullptr; - this->object_infos.resize(0); + this->object_infos.clear(); for (size_t i=0; i < maps.size(); i++) { simgrid::xbt::VmMap const& reg = maps[i]; @@ -353,21 +335,21 @@ 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; } } std::shared_ptr info = - MC_find_object_info(this->memory_map_, pathname); + simgrid::mc::createObjectInformation(this->memory_map_, pathname); 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); } @@ -377,7 +359,7 @@ void Process::init_memory_map_info() // Resolve time (including accross differents objects): for (auto const& object_info : this->object_infos) - MC_post_process_object_info(this, object_info.get()); + postProcessObjectInformation(this, object_info.get()); xbt_assert(this->maestro_stack_start_, "Did not find maestro_stack_start"); xbt_assert(this->maestro_stack_end_, "Did not find maestro_stack_end"); @@ -495,7 +477,7 @@ const void *Process::read_bytes(void* buffer, std::size_t size, std::shared_ptr const& info = this->find_object_info_rw((void*)address.address()); // Segment overlap is not handled. -#ifdef HAVE_SMPI +#if HAVE_SMPI if (info.get() && this->privatized(*info)) { if (process_index < 0) xbt_die("Missing process index"); @@ -538,7 +520,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); @@ -691,9 +673,16 @@ void Process::ignore_local_variable(const char *var_name, const char *frame_name std::vector& Process::simix_processes() { xbt_assert(mc_mode != MC_MODE_CLIENT); - MC_process_smx_refresh(&mc_model_checker->process()); + this->refresh_simix(); return smx_process_infos; } +std::vector& Process::old_simix_processes() +{ + xbt_assert(mc_mode != MC_MODE_CLIENT); + this->refresh_simix(); + return smx_old_process_infos; +} + } }