A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
accept single quotes while converting the XML files
[simgrid.git]
/
src
/
xbt
/
memory_map.cpp
diff --git
a/src/xbt/memory_map.cpp
b/src/xbt/memory_map.cpp
index
7d2888b
..
0db9b1f
100644
(file)
--- a/
src/xbt/memory_map.cpp
+++ b/
src/xbt/memory_map.cpp
@@
-21,15
+21,18
@@
#include "memory_map.hpp"
extern "C" {
#include "memory_map.hpp"
extern "C" {
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_memory_map, xbt,
- "Logging specific to algorithms for memory_map");
-
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_memory_map, xbt, "Logging specific to algorithms for memory_map");
}
namespace simgrid {
namespace xbt {
}
namespace simgrid {
namespace xbt {
+/**
+ * \todo This function contains many cases that do not allow for a
+ * recovery. Currently, xbt_abort() is called but we should
+ * much rather die with the specific reason so that it's easier
+ * to find out what's going on.
+ */
XBT_PRIVATE std::vector<VmMap> get_memory_map(pid_t pid)
{
#ifdef __linux__
XBT_PRIVATE std::vector<VmMap> get_memory_map(pid_t pid)
{
#ifdef __linux__
@@
-37,45
+40,48
@@
XBT_PRIVATE std::vector<VmMap> get_memory_map(pid_t pid)
/* to be returned. */
char* path = bprintf("/proc/%i/maps", (int) pid);
FILE *fp = std::fopen(path, "r");
/* to be returned. */
char* path = bprintf("/proc/%i/maps", (int) pid);
FILE *fp = std::fopen(path, "r");
- if
(fp == NULL)
+ if
(fp == nullptr) {
std::perror("fopen failed");
std::perror("fopen failed");
- xbt_assert(fp,
- "Cannot open %s to investigate the memory map of the process.", path);
+ xbt_die("Cannot open %s to investigate the memory map of the process.", path);
+ }
free(path);
free(path);
- setbuf(fp,
NULL
);
+ setbuf(fp,
nullptr
);
std::vector<VmMap> ret;
/* 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 */
std::vector<VmMap> ret;
/* 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 =
NULL
;
+ 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::size_t n = 0; /* Amount of bytes to read by xbt_getline */
while ((read = xbt_getline(&line, &n, fp)) != -1) {
+ /**
+ * The lines that we read have this format: (This is just an example)
+ * 00602000-00603000 rw-p 00002000 00:28 1837264 <complete-path-to-file>
+ */
//fprintf(stderr,"%s", line);
/* Wipeout the new line character */
line[read - 1] = '\0';
//fprintf(stderr,"%s", line);
/* Wipeout the new line character */
line[read - 1] = '\0';
- /* Tokenize the line using spaces as delimiters and store each token */
- /* in lfields array. We expect 5 tokens/fields */
+ /* Tokenize the line using spaces as delimiters and store each token in lfields array. We expect 5 tokens for 6 fields */
char* lfields[6];
lfields[0] = strtok(line, " ");
int i;
char* lfields[6];
lfields[0] = strtok(line, " ");
int i;
- for (i = 1; i < 6 && lfields[i - 1] !=
NULL
; i++) {
- lfields[i] = std::strtok(
NULL
, " ");
+ for (i = 1; i < 6 && lfields[i - 1] !=
nullptr
; i++) {
+ lfields[i] = std::strtok(
nullptr
, " ");
}
/* Check to see if we got the expected amount of columns */
if (i < 6)
}
/* Check to see if we got the expected amount of columns */
if (i < 6)
- xbt_
abort(
);
+ xbt_
die("The memory map apparently only supplied less than 6 columns. Recovery impossible."
);
/* 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], "-");
/* 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], "-");
- if (tok ==
NULL
)
- xbt_
abort(
);
+ if (tok ==
nullptr
)
+ xbt_
die("Start and end address of the map are not concatenated by a hyphen (-). Recovery impossible."
);
VmMap memreg;
char *endptr;
VmMap memreg;
char *endptr;
@@
-84,8
+90,8
@@
XBT_PRIVATE std::vector<VmMap> get_memory_map(pid_t pid)
if (*endptr != '\0')
xbt_abort();
if (*endptr != '\0')
xbt_abort();
- tok = std::strtok(
NULL
, "-");
- if (tok ==
NULL
)
+ tok = std::strtok(
nullptr
, "-");
+ if (tok ==
nullptr
)
xbt_abort();
memreg.end_addr = std::strtoull(tok, &endptr, 16);
xbt_abort();
memreg.end_addr = std::strtoull(tok, &endptr, 16);
@@
-117,11
+123,14
@@
XBT_PRIVATE std::vector<VmMap> get_memory_map(pid_t pid)
if (memreg.prot == 0)
memreg.prot |= PROT_NONE;
if (memreg.prot == 0)
memreg.prot |= PROT_NONE;
- if (lfields[1][
4
] == 'p')
+ if (lfields[1][
3
] == 'p')
memreg.flags |= MAP_PRIVATE;
memreg.flags |= MAP_PRIVATE;
-
- else if (lfields[1][4] == 's')
+ else if (lfields[1][3] == 's')
memreg.flags |= MAP_SHARED;
memreg.flags |= MAP_SHARED;
+ else {
+ xbt_die("Flag was neither 'p' (private) nor 's' (shared). This should have never happened! Instead, the permissions column was set to: %s\n"
+ "This was the whole line that caused the trouble: %s", lfields[1], line);
+ }
/* Get the offset value */
memreg.offset = std::strtoull(lfields[2], &endptr, 16);
/* Get the offset value */
memreg.offset = std::strtoull(lfields[2], &endptr, 16);
@@
-131,7
+140,7
@@
XBT_PRIVATE std::vector<VmMap> get_memory_map(pid_t pid)
/* Get the device major:minor bytes */
tok = std::strtok(lfields[3], ":");
/* Get the device major:minor bytes */
tok = std::strtok(lfields[3], ":");
- if (tok ==
NULL
)
+ if (tok ==
nullptr
)
xbt_abort();
memreg.dev_major = (char) strtoul(tok, &endptr, 16);
xbt_abort();
memreg.dev_major = (char) strtoul(tok, &endptr, 16);
@@
-139,8
+148,8
@@
XBT_PRIVATE std::vector<VmMap> get_memory_map(pid_t pid)
if (*endptr != '\0')
xbt_abort();
if (*endptr != '\0')
xbt_abort();
- tok = std::strtok(
NULL
, ":");
- if (tok ==
NULL
)
+ tok = std::strtok(
nullptr
, ":");
+ if (tok ==
nullptr
)
xbt_abort();
memreg.dev_minor = (char) std::strtoul(tok, &endptr, 16);
xbt_abort();
memreg.dev_minor = (char) std::strtoul(tok, &endptr, 16);
@@
-159,8
+168,7
@@
XBT_PRIVATE std::vector<VmMap> get_memory_map(pid_t pid)
/* Create space for a new map region in the region's array and copy the */
/* parsed stuff from the temporal memreg variable */
/* Create space for a new map region in the region's array and copy the */
/* parsed stuff from the temporal memreg variable */
- XBT_DEBUG("Found region for %s",
- !memreg.pathname.empty() ? memreg.pathname.c_str() : "(null)");
+ XBT_DEBUG("Found region for %s", !memreg.pathname.empty() ? memreg.pathname.c_str() : "(null)");
ret.push_back(std::move(memreg));
}
ret.push_back(std::move(memreg));
}
@@
-169,8
+177,7
@@
XBT_PRIVATE std::vector<VmMap> get_memory_map(pid_t pid)
std::fclose(fp);
return ret;
#else
std::fclose(fp);
return ret;
#else
- /* On FreeBSD, kinfo_getvmmap() could be used but mmap() support is disabled
- anyway. */
+ /* On FreeBSD, kinfo_getvmmap() could be used but mmap() support is disabled anyway. */
xbt_die("Could not get memory map from process %lli", (long long int) pid);
#endif
}
xbt_die("Could not get memory map from process %lli", (long long int) pid);
#endif
}