X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1c8c73ef7e2f1307c815cd11071f8c584436f9d5..398f1a82c992764ca69db74edde82ad36a6b1277:/src/xbt/memory_map.cpp diff --git a/src/xbt/memory_map.cpp b/src/xbt/memory_map.cpp index ae6113c147..edba494696 100644 --- a/src/xbt/memory_map.cpp +++ b/src/xbt/memory_map.cpp @@ -1,22 +1,25 @@ -/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include #include +#include #include +#include +#include +#include #include #if defined __APPLE__ +# include # include # include # include # include # include # include -# include # if __MAC_OS_X_VERSION_MIN_REQUIRED < 1050 # define mach_vm_address_t vm_address_t # define mach_vm_size_t vm_size_t @@ -43,16 +46,14 @@ # include #endif -#include +#include #include -#include #include +#include #include "memory_map.hpp" -extern "C" { XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_memory_map, xbt, "Logging specific to algorithms for memory_map"); -} namespace simgrid { namespace xbt { @@ -144,21 +145,13 @@ XBT_PRIVATE std::vector get_memory_map(pid_t pid) memreg.inode = 0; /* Path */ - char path[MAXPATHLEN]; - int pathlen; - pathlen = proc_regionfilename(pid, address, path, sizeof(path)); - path[pathlen] = '\0'; - memreg.pathname = path; - -#if 0 /* Display mappings for debug */ - fprintf(stderr, - "%#014llx - %#014llx | %c%c%c | %s\n", - memreg.start_addr, memreg.end_addr, - (memreg.prot & PROT_READ) ? 'r' : '-', - (memreg.prot & PROT_WRITE) ? 'w' : '-', - (memreg.prot & PROT_EXEC) ? 'x' : '-', - memreg.pathname.c_str()); -#endif + Dl_info dlinfo; + if (dladdr(reinterpret_cast(address), &dlinfo)) + memreg.pathname = dlinfo.dli_fname; + + XBT_DEBUG("Region: %016" PRIx64 "-%016" PRIx64 " | %c%c%c | %s", memreg.start_addr, memreg.end_addr, + (memreg.prot & PROT_READ) ? 'r' : '-', (memreg.prot & PROT_WRITE) ? 'w' : '-', + (memreg.prot & PROT_EXEC) ? 'x' : '-', memreg.pathname.c_str()); ret.push_back(std::move(memreg)); address += size; @@ -168,37 +161,32 @@ XBT_PRIVATE std::vector get_memory_map(pid_t pid) #elif defined __linux__ /* Open the actual process's proc maps file and create the memory_map_t */ /* to be returned. */ - char* path = bprintf("/proc/%i/maps", (int) pid); - FILE *fp = std::fopen(path, "r"); - if (fp == nullptr) { - std::perror("fopen failed"); - xbt_die("Cannot open %s to investigate the memory map of the process.", path); + std::string path = std::string("/proc/") + std::to_string(pid) + "/maps"; + std::ifstream fp; + fp.rdbuf()->pubsetbuf(0, 0); + fp.open(path); + if (not fp) { + std::perror("open failed"); + xbt_die("Cannot open %s to investigate the memory map of the process.", path.c_str()); } - free(path); - setbuf(fp, nullptr); /* Read one line at the time, parse it and add it to the memory map to be returned */ - ssize_t read; /* Number of bytes readed */ - char* line = nullptr; - std::size_t n = 0; /* Amount of bytes to read by xbt_getline */ - while ((read = xbt_getline(&line, &n, fp)) != -1) { + std::string sline; + while (std::getline(fp, sline)) { /** * The lines that we read have this format: (This is just an example) * 00602000-00603000 rw-p 00002000 00:28 1837264 */ - - //fprintf(stderr,"%s", line); - - /* Wipeout the new line character */ - line[read - 1] = '\0'; + char* line = &sline[0]; /* Tokenize the line using spaces as delimiters and store each token in lfields array. We expect 5 tokens for 6 fields */ + char* saveptr = nullptr; // for strtok_r() char* lfields[6]; - lfields[0] = strtok(line, " "); + lfields[0] = strtok_r(line, " ", &saveptr); int i; for (i = 1; i < 6 && lfields[i - 1] != nullptr; i++) { - lfields[i] = std::strtok(nullptr, " "); + lfields[i] = strtok_r(nullptr, " ", &saveptr); } /* Check to see if we got the expected amount of columns */ @@ -207,7 +195,7 @@ XBT_PRIVATE std::vector get_memory_map(pid_t pid) /* Ok we are good enough to try to get the info we need */ /* First get the start and the end address of the map */ - char *tok = std::strtok(lfields[0], "-"); + char* tok = strtok_r(lfields[0], "-", &saveptr); if (tok == nullptr) xbt_die("Start and end address of the map are not concatenated by a hyphen (-). Recovery impossible."); @@ -218,7 +206,7 @@ XBT_PRIVATE std::vector get_memory_map(pid_t pid) if (*endptr != '\0') xbt_abort(); - tok = std::strtok(nullptr, "-"); + tok = strtok_r(nullptr, "-", &saveptr); if (tok == nullptr) xbt_abort(); @@ -232,7 +220,6 @@ XBT_PRIVATE std::vector get_memory_map(pid_t pid) xbt_abort(); memreg.prot = 0; - for (i = 0; i < 3; i++){ switch(lfields[1][i]){ case 'r': @@ -251,6 +238,7 @@ XBT_PRIVATE std::vector get_memory_map(pid_t pid) if (memreg.prot == 0) memreg.prot |= PROT_NONE; + memreg.flags = 0; if (lfields[1][3] == 'p') { memreg.flags |= MAP_PRIVATE; } else { @@ -268,7 +256,7 @@ XBT_PRIVATE std::vector get_memory_map(pid_t pid) xbt_abort(); /* Get the device major:minor bytes */ - tok = std::strtok(lfields[3], ":"); + tok = strtok_r(lfields[3], ":", &saveptr); if (tok == nullptr) xbt_abort(); @@ -277,7 +265,7 @@ XBT_PRIVATE std::vector get_memory_map(pid_t pid) if (*endptr != '\0') xbt_abort(); - tok = std::strtok(nullptr, ":"); + tok = strtok_r(nullptr, ":", &saveptr); if (tok == nullptr) xbt_abort(); @@ -302,8 +290,7 @@ XBT_PRIVATE std::vector get_memory_map(pid_t pid) ret.push_back(std::move(memreg)); } - std::free(line); - std::fclose(fp); + fp.close(); #elif defined __FreeBSD__ struct procstat *prstat; struct kinfo_proc *proc;