Use C++ i/o.

diff --git a/src/xbt/memory_map.cpp b/src/xbt/memory_map.cpp
index ed7ee9d..418e93b 100644 (file)
--- a/src/xbt/memory_map.cpp
+++ b/src/xbt/memory_map.cpp
@@ -3,9 +3,12 @@
 /* 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. */
 
 /* 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 <cstdio>

+#include <cstdlib>

 #include <cstring>
 #include <cstring>

+#include <fstream>
+#include <iostream>
+#include <string>

 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 


@@ -168,27 +171,23 @@ XBT_PRIVATE std::vector<VmMap> 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. */
 #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 */
 
   /* 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>
      */
     /**
      * 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>
      */

-
-    /* 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()
 
     /* 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()


@@ -301,8 +300,7 @@ XBT_PRIVATE std::vector<VmMap> get_memory_map(pid_t pid)
     ret.push_back(std::move(memreg));
   }
 
     ret.push_back(std::move(memreg));
   }
 

-  std::free(line);
-  std::fclose(fp);
+  fp.close();

 #elif defined __FreeBSD__
   struct procstat *prstat;
   struct kinfo_proc *proc;
 #elif defined __FreeBSD__
   struct procstat *prstat;
   struct kinfo_proc *proc;