-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2008-2017. 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. */
/* Addresses */
memreg.start_addr = address;
- memreg.end_addr = address + size - 1;
+ memreg.end_addr = address + size;
/* Permissions */
memreg.prot = PROT_NONE;
memreg.prot |= PROT_EXEC;
/* Private (copy-on-write) or shared? */
+ memreg.flags = 0;
if (info.shared)
memreg.flags |= MAP_SHARED;
else
/* Path */
char path[MAXPATHLEN];
- int pathlen;
+ int pathlen;
pathlen = proc_regionfilename(pid, address, path, sizeof(path));
- path[pathlen] = '\0';
+ path[pathlen] = '\0';
memreg.pathname = path;
#if 0 /* Display mappings for debug */
* 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';
/* 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 */
/* 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.");
if (*endptr != '\0')
xbt_abort();
- tok = std::strtok(nullptr, "-");
+ tok = strtok_r(nullptr, "-", &saveptr);
if (tok == nullptr)
xbt_abort();
xbt_abort();
memreg.prot = 0;
-
for (i = 0; i < 3; i++){
switch(lfields[1][i]){
case 'r':
if (memreg.prot == 0)
memreg.prot |= PROT_NONE;
+ memreg.flags = 0;
if (lfields[1][3] == 'p') {
memreg.flags |= MAP_PRIVATE;
} else {
memreg.flags |= MAP_SHARED;
if (lfields[1][3] != 's')
- XBT_WARN("The protection is neither 'p' (private) nor 's' (shared) but '%s'. Let's assume shared, as on b0rken win-ubuntu systems.\nFull line: %s\n",
- lfields[1], line);
+ XBT_WARN("The protection is neither 'p' (private) nor 's' (shared) but '%s'. Let's assume shared, as on b0rken "
+ "win-ubuntu systems.\nFull line: %s\n",
+ lfields[1], line);
}
/* Get the offset value */
xbt_abort();
/* Get the device major:minor bytes */
- tok = std::strtok(lfields[3], ":");
+ tok = strtok_r(lfields[3], ":", &saveptr);
if (tok == nullptr)
xbt_abort();
if (*endptr != '\0')
xbt_abort();
- tok = std::strtok(nullptr, ":");
+ tok = strtok_r(nullptr, ":", &saveptr);
if (tok == nullptr)
xbt_abort();
/* 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", not memreg.pathname.empty() ? memreg.pathname.c_str() : "(null)");
ret.push_back(std::move(memreg));
}
memreg.prot |= PROT_EXEC;
/* Private (copy-on-write) or shared? */
+ memreg.flags = 0;
if (vmentries[i].kve_flags & KVME_FLAG_COW)
memreg.flags |= MAP_PRIVATE;
else
*/
if (vmentries[i].kve_path[0] != '\0')
memreg.pathname = vmentries[i].kve_path;
- else if (vmentries[i].kve_type == KVME_TYPE_DEFAULT
- && vmentries[i-1].kve_type == KVME_TYPE_VNODE
- && vmentries[i-1].kve_path[0] != '\0')
+ else if (vmentries[i].kve_type == KVME_TYPE_DEFAULT && vmentries[i - 1].kve_type == KVME_TYPE_VNODE &&
+ vmentries[i - 1].kve_path[0] != '\0')
memreg.pathname = vmentries[i-1].kve_path;
else if (vmentries[i].kve_type == KVME_TYPE_DEFAULT
&& vmentries[i].kve_flags & KVME_FLAG_GROWS_DOWN)
* later identifies mappings based on the permissions that are expected
* when running the Linux kernel.
*/
- if (vmentries[i].kve_type == KVME_TYPE_VNODE
- && ! (vmentries[i].kve_flags & KVME_FLAG_NEEDS_COPY))
+ if (vmentries[i].kve_type == KVME_TYPE_VNODE && not(vmentries[i].kve_flags & KVME_FLAG_NEEDS_COPY))
memreg.prot &= ~PROT_WRITE;
ret.push_back(std::move(memreg));