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 7a5175e..1fe0b1a 100644 (file)
--- a/src/mc/memory_map.c
+++ b/src/mc/memory_map.c
@@ -2,6 +2,9 @@
 #include "private.h"
 #include <stdlib.h>
 
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory_map, mc,
+                                "Logging specific to algorithms for memory_map");
+
 memory_map_t get_memory_map(void)
 {
   FILE *fp;                     /* File pointer to process's proc maps file */
@@ -19,14 +22,21 @@ memory_map_t get_memory_map(void)
 /* to be returned. */
   fp = fopen("/proc/self/maps", "r");
 
-  xbt_assert0(fp,
+  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.");
 
+  //XBT_DEBUG("/proc/self/maps");
+
   ret = xbt_new0(s_memory_map_t, 1);
 
   /* 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);
+
     /* Wipeout the new line character */
     line[read - 1] = '\0';
 
@@ -66,17 +76,31 @@ memory_map_t get_memory_map(void)
     if (strlen(lfields[1]) < 4)
       xbt_abort();
 
-    memreg.perms = 0;
-
-    for (i = 0; i < 3; i++)
-      if (lfields[1][i] != '-')
-        memreg.perms |= 1 << i;
+    memreg.prot = 0;
+
+    for (i = 0; i < 3; i++){
+      switch(lfields[1][i]){
+        case 'r':
+          memreg.prot |= PROT_READ;
+          break;
+        case 'w':
+          memreg.prot |= PROT_WRITE;
+          break;
+        case 'x':
+          memreg.prot |= PROT_EXEC;
+          break;
+        default:
+          break;
+      }
+    }
+    if (memreg.prot == 0)
+      memreg.prot |= PROT_NONE;
 
     if (lfields[1][4] == 'p')
-      memreg.perms |= MAP_PRIV;
+      memreg.flags |= MAP_PRIVATE;
 
     else if (lfields[1][4] == 's')
-      memreg.perms |= MAP_SHARED;
+      memreg.flags |= MAP_SHARED;
 
     /* Get the offset value */
     memreg.offset = (void *) strtoul(lfields[2], &endptr, 16);
@@ -117,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;
 }