X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..978a9da87ac03ecca12d6980e56b8f31989f2bdf:/src/mc/memory_map.c

diff --git a/src/mc/memory_map.c b/src/mc/memory_map.c
index 7a5175e2fc..e63cab775f 100644
--- a/src/mc/memory_map.c
+++ b/src/mc/memory_map.c
@@ -1,17 +1,25 @@
-#define _GNU_SOURCE
-#include "private.h"
+/* Copyright (c) 2008-2014. 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 "mc_private.h"
 #include <stdlib.h>
 
-memory_map_t get_memory_map(void)
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory_map, mc,
+                                "Logging specific to algorithms for memory_map");
+
+memory_map_t MC_get_memory_map(void)
 {
   FILE *fp;                     /* File pointer to process's proc maps file */
   char *line = NULL;            /* Temporal storage for each line that is readed */
   ssize_t read;                 /* Number of bytes readed */
-  size_t n = 0;                 /* Amount of bytes to read by getline */
+  size_t n = 0;                 /* Amount of bytes to read by xbt_getline */
   memory_map_t ret = NULL;      /* The memory map to return */
 
 /* The following variables are used during the parsing of the file "maps" */
-  s_map_region memreg;          /* temporal map region used for creating the map */
+  s_map_region_t memreg;          /* temporal map region used for creating the map */
   char *lfields[6], *tok, *endptr;
   int i;
 
@@ -19,13 +27,20 @@ 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.");
 
+  setbuf(fp, NULL);
+
   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) {
+  while ((read = xbt_getline(&line, &n, fp)) != -1) {
+
+    //fprintf(stderr,"%s", line);
 
     /* Wipeout the new line character */
     line[read - 1] = '\0';
@@ -66,17 +81,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 +146,22 @@ 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;
 }
+
+void MC_free_memory_map(memory_map_t map){
+
+  int i;
+  for(i=0; i< map->mapsize; i++){
+    xbt_free(map->regions[i].pathname);
+  }
+  xbt_free(map->regions);
+  xbt_free(map);
+}