X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/daf9d10c7877d35670e36e52be8a5207706d3bb1..c73aeef05e1a3702e23296f6ff6690d6d408543b:/src/mc/memory_map.c

diff --git a/src/mc/memory_map.c b/src/mc/memory_map.c
index 9e987f0f07..04538dda26 100644
--- a/src/mc/memory_map.c
+++ b/src/mc/memory_map.c
@@ -1,5 +1,9 @@
-#define _GNU_SOURCE
-#include "private.h"
+/* Copyright (c) 2008-2013 Da 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>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory_map, mc,
@@ -10,33 +14,32 @@ memory_map_t 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;
 
-  char *backup_line = NULL;
-
 /* Open the actual process's proc maps file and create the memory_map_t */
 /* 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.");
 
-  //XBT_DEBUG("/proc/self/maps");
+  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) {
 
-    //XBT_INFO("%s", line);
-    if(XBT_LOG_ISENABLED(mc_memory_map, xbt_log_priority_debug))
-      backup_line = strdup(line);
+    //fprintf(stderr,"%s", line);
 
     /* Wipeout the new line character */
     line[read - 1] = '\0';
@@ -143,25 +146,21 @@ memory_map_t get_memory_map(void)
     memcpy(ret->regions + ret->mapsize, &memreg, sizeof(memreg));
     ret->mapsize++;
 
-    if(XBT_LOG_ISENABLED(mc_memory_map, xbt_log_priority_debug)){
-      if ((memreg.prot & PROT_WRITE)){
-	if (memreg.pathname == NULL){
-	  if (memreg.start_addr == std_heap){ 
-	    XBT_DEBUG("New region in snapshot : %s", backup_line); 
-	  }
-	} else {
-	  if (!memcmp(basename(memreg.pathname), "libsimgrid", 10)){
-	    XBT_DEBUG("New region in snapshot : %s", backup_line); 
-	  }
-	}
-      }
-    }
-
-
   }
 
-  if (line)
-    free(line);
+  free(line);
+
+  fclose(fp);
 
   return ret;
 }
+
+void 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);
+}