-/* 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 <cstdlib>
#include <cstdio>
+#include <cstdlib>
#include <cstring>
+#include <fstream>
+#include <iostream>
+#include <string>
#include <sys/types.h>
# include <libprocstat.h>
#endif
-#include <xbt/sysdep.h>
+#include <cinttypes>
#include <xbt/base.h>
-#include <xbt/file.h>
#include <xbt/log.h>
+#include <xbt/sysdep.h>
#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 {
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
+ 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;
#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 <complete-path-to-file>
*/
-
- //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 */
/* 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 {
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();
ret.push_back(std::move(memreg));
}
- std::free(line);
- std::fclose(fp);
+ fp.close();
#elif defined __FreeBSD__
struct procstat *prstat;
struct kinfo_proc *proc;
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
