merge conflicts

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

diff --git a/src/mc/memory_map.c b/src/mc/memory_map.c
index fa49689..ca5a15e 100644 (file)
--- a/src/mc/memory_map.c
+++ b/src/mc/memory_map.c
@@ -18,8 +18,6 @@ memory_map_t get_memory_map(void)
   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");
@@ -34,9 +32,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_INFO("%s", line);
-    if(XBT_LOG_ISENABLED(mc_memory_map, xbt_log_priority_debug))
-      backup_line = strdup(line);
+    XBT_DEBUG("%s", line);
 
     /* Wipeout the new line character */
     line[read - 1] = '\0';
@@ -143,24 +139,9 @@ 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.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);
 
   return ret;
 }