Merge branch 'master' into MC_LTL

[simgrid.git] / src / mc / memory_map.c

diff --git a/src/mc/memory_map.c b/src/mc/memory_map.c
index d1f279e..1fe0b1a 100644 (file)
--- a/src/mc/memory_map.c
+++ b/src/mc/memory_map.c
@@ -22,6 +22,9 @@ memory_map_t get_memory_map(void)
 /* to be returned. */
   fp = fopen("/proc/self/maps", "r");
 
+  if(fp == NULL)
+    perror("fopen failed");
+
   xbt_assert(fp,
               "Cannot open /proc/self/maps to investigate the memory map of the process. Please report this bug.");
 
@@ -32,7 +35,7 @@ memory_map_t get_memory_map(void)
   /* Read one line at the time, parse it and add it to the memory map to be returned */
   while ((read = getline(&line, &n, fp)) != -1) {
 
-    //XBT_DEBUG("%s", line);
+    XBT_DEBUG("%s", line);
 
     /* Wipeout the new line character */
     line[read - 1] = '\0';
@@ -138,10 +141,12 @@ memory_map_t get_memory_map(void)
         xbt_realloc(ret->regions, sizeof(memreg) * (ret->mapsize + 1));
     memcpy(ret->regions + ret->mapsize, &memreg, sizeof(memreg));
     ret->mapsize++;
+
   }
 
-  if (line)
-    free(line);
+  free(line);
+
+  fclose(fp);
 
   return ret;
 }