X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c1aaa8bd4ce09f0e1c54cd82dac03adc12b0a488..3187f0cf6163ddd170510f8aea2a6b9fc9dd3e46:/src/xbt/mmalloc/mm_diff.c

diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c
index 1fdc5bd0f8..45f6d7cf98 100644
--- a/src/xbt/mmalloc/mm_diff.c
+++ b/src/xbt/mmalloc/mm_diff.c
@@ -6,6 +6,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/ex_interface.h" /* internals of backtrace setup */
+#include "xbt/str.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt,
                                 "Logging specific to mm_diff in mmalloc");
@@ -111,24 +112,24 @@ void mmalloc_backtrace_fragment_display(xbt_mheap_t mdp, size_t block, size_t fr
   }
 }
 
-int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2){
+int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2, void* s_heap, void* r_heap){
 
   if(mdp1 == NULL && mdp2 == NULL){
     fprintf(stderr, "Malloc descriptors null\n");
     return 0;
   }
 
-  int errors = mmalloc_compare_mdesc(mdp1, mdp2);
+  int errors = mmalloc_compare_mdesc(mdp1, mdp2, s_heap, r_heap);
 
   return (errors > 0);
 
 }
 
-int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
+int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void* s_heap, void* r_heap){
 
   int errors = 0;
 
-  if(mdp1->headersize != mdp2->headersize){
+  /*if(mdp1->headersize != mdp2->headersize){
     fprintf(stderr, "Different size of the file header for the mapped files\n");
     return 1;
   }
@@ -191,7 +192,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
   if(mdp1->version != mdp2->version){
     fprintf(stderr,"Different version of the mmalloc package\n");
     return 1;
-  }
+    }*/
 
 
   size_t i, j;
@@ -238,7 +239,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 	    fprintf(stderr, "Different byte (offset=%d) (%p - %p) in block %zu\n", k, (char *)addr_block1 + k, (char *)addr_block2 + k, i); 
 	    distance++;
 	    pointer_align = (k / sizeof(void*)) * sizeof(void*); 
-	    fprintf(stderr, "Pointer address : %p - %p\n", *((void **)((char *)addr_block1 + pointer_align)), *((void **)((char *)addr_block2 + pointer_align)));
+	    fprintf(stderr, "Pointed address : %p (in %s) - %p (in %s)\n", *((void **)((char *)addr_block1 + pointer_align)), get_addr_memory_map(*((void **)((char *)addr_block1 + pointer_align)), s_heap, r_heap), *((void **)((char *)addr_block2 + pointer_align)),get_addr_memory_map(*((void **)((char *)addr_block2 + pointer_align)), s_heap, r_heap) );
 	  }
 	}
 
@@ -296,7 +297,7 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 		  fprintf(stderr, "Different byte (offset=%d) (%p - %p) in fragment %zu in block %zu\n", k, (char *)addr_frag1 + k, (char *)addr_frag2 + k, j, i); 
 		  distance++;
 		  pointer_align = (k / sizeof(void*)) * sizeof(void*);
-		  fprintf(stderr, "Pointer address : %p - %p\n", *((void **)((char *)addr_frag1 + pointer_align)), *((void **)((char *)addr_frag2 + pointer_align)));
+		  fprintf(stderr, "Pointed address : %p (in %s) - %p (in %s)\n", *((void **)((char *)addr_frag1 + pointer_align)), get_addr_memory_map(*((void **)((char *)addr_frag1 + pointer_align)), s_heap, r_heap), *((void **)((char *)addr_frag2 + pointer_align)), get_addr_memory_map(*((void **)((char *)addr_frag2 + pointer_align)), s_heap, r_heap));
 		}
 	      }
 
@@ -327,6 +328,67 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 }
 
 
+const char* get_addr_memory_map(void *addr, void* s_heap, void* r_heap){
+
+  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 */
+
+  fp = fopen("/proc/self/maps", "r");
+  
+  if(fp == NULL)
+    perror("fopen failed");
+
+  if(addr == NULL)
+    return "nil";
+
+  char *lfields[6], *start, *end, *endptr, *map;
+  void *start_addr;
+  void *end_addr;
+  int i;
+
+  while ((read = getline(&line, &n, fp)) != -1) {
+
+    line[read - 1] = '\0';
+
+    lfields[0] = strtok(line, " ");
+
+    for (i = 1; i < 5 && lfields[i - 1] != NULL ; i++) {
+      lfields[i] = strdup(strtok(NULL, " "));
+    }
+
+    map = strtok(NULL, " ");
+    if(map != NULL)
+      lfields[5] = strdup(map);
+    else
+      lfields[5] = strdup("Anonymous");
+
+    start = strtok(lfields[0], "-");
+    start_addr = (void *) strtoul(start, &endptr, 16); 
+   
+    if(start_addr == s_heap)
+      lfields[5] = strdup("std_heap");
+    if(start_addr == r_heap)
+      lfields[5] = strdup("raw_heap");
+
+    end = strtok(NULL, "-");
+    end_addr = (void *) strtoul(end, &endptr, 16); 
+   
+    if((addr > start_addr) && ( addr < end_addr)){
+      free(line);
+      fclose(fp);
+      return lfields[5];
+    }
+    
+  }
+
+  free(line);
+  fclose(fp);
+  return "Unknown area";
+
+}
+
 void mmalloc_display_info_heap(xbt_mheap_t h){
 
 }