Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[mc] Handle DW_TAG_class_type as DW_TAG_structure_type (C++)
[simgrid.git] / src / xbt / mmalloc / mm_diff.c
1 /* mm_diff - Memory snapshooting and comparison                             */
2
3 /* Copyright (c) 2008-2013. The SimGrid Team.
4  * All rights reserved.                                                     */
5
6 /* This program is free software; you can redistribute it and/or modify it
7  * under the terms of the license (GNU LGPL) which comes with this package. */
8
9 #include "xbt/ex_interface.h" /* internals of backtrace setup */
10 #include "xbt/str.h"
11 #include "mc/mc.h"
12 #include "xbt/mmalloc.h"
13 #include "mc/datatypes.h"
14 #include "mc/mc_private.h"
15
16 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt,
17                                 "Logging specific to mm_diff in mmalloc");
18
19 xbt_dynar_t mc_heap_comparison_ignore;
20 xbt_dynar_t stacks_areas;
21 void *maestro_stack_start, *maestro_stack_end;
22
23
24 /********************************* Backtrace ***********************************/
25 /******************************************************************************/
26
27 static void mmalloc_backtrace_block_display(void* heapinfo, int block){
28
29   /* xbt_ex_t e; */
30
31   /* if (((malloc_info *)heapinfo)[block].busy_block.bt_size == 0) { */
32   /*   fprintf(stderr, "No backtrace available for that block, sorry.\n"); */
33   /*   return; */
34   /* } */
35
36   /* memcpy(&e.bt,&(((malloc_info *)heapinfo)[block].busy_block.bt),sizeof(void*)*XBT_BACKTRACE_SIZE); */
37   /* e.used = ((malloc_info *)heapinfo)[block].busy_block.bt_size; */
38
39   /* xbt_ex_setup_backtrace(&e); */
40   /* if (e.used == 0) { */
41   /*   fprintf(stderr, "(backtrace not set)\n"); */
42   /* } else if (e.bt_strings == NULL) { */
43   /*   fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet"); */
44   /* } else { */
45   /*   int i; */
46
47   /*   fprintf(stderr, "Backtrace of where the block %d was malloced (%d frames):\n", block ,e.used); */
48   /*   for (i = 0; i < e.used; i++)       /\* no need to display "xbt_backtrace_display" *\/{ */
49   /*     fprintf(stderr, "%d ---> %s\n",i, e.bt_strings[i] + 4); */
50   /*   } */
51   /* } */
52 }
53
54 static void mmalloc_backtrace_fragment_display(void* heapinfo, int block, int frag){
55
56   /* xbt_ex_t e; */
57
58   /* memcpy(&e.bt,&(((malloc_info *)heapinfo)[block].busy_frag.bt[frag]),sizeof(void*)*XBT_BACKTRACE_SIZE); */
59   /* e.used = XBT_BACKTRACE_SIZE; */
60
61   /* xbt_ex_setup_backtrace(&e); */
62   /* if (e.used == 0) { */
63   /*   fprintf(stderr, "(backtrace not set)\n"); */
64   /* } else if (e.bt_strings == NULL) { */
65   /*   fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet"); */
66   /* } else { */
67   /*   int i; */
68
69   /*   fprintf(stderr, "Backtrace of where the fragment %d in block %d was malloced (%d frames):\n", frag, block ,e.used); */
70   /*   for (i = 0; i < e.used; i++)       /\* no need to display "xbt_backtrace_display" *\/{ */
71   /*     fprintf(stderr, "%d ---> %s\n",i, e.bt_strings[i] + 4); */
72   /*   } */
73   /* } */
74
75 }
76
77 static void mmalloc_backtrace_display(void *addr){
78
79   /* size_t block, frag_nb; */
80   /* int type; */
81   
82   /* xbt_mheap_t heap = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit(); */
83
84   /* block = (((char*) (addr) - (char*) heap -> heapbase) / BLOCKSIZE + 1); */
85
86   /* type = heap->heapinfo[block].type; */
87
88   /* switch(type){ */
89   /* case -1 : /\* Free block *\/ */
90   /*   fprintf(stderr, "Asked to display the backtrace of a block that is free. I'm puzzled\n"); */
91   /*   xbt_abort(); */
92   /*   break;  */
93   /* case 0: /\* Large block *\/ */
94   /*   mmalloc_backtrace_block_display(heap->heapinfo, block); */
95   /*   break; */
96   /* default: /\* Fragmented block *\/ */
97   /*   frag_nb = RESIDUAL(addr, BLOCKSIZE) >> type; */
98   /*   if(heap->heapinfo[block].busy_frag.frag_size[frag_nb] == -1){ */
99   /*     fprintf(stderr , "Asked to display the backtrace of a fragment that is free. I'm puzzled\n"); */
100   /*     xbt_abort(); */
101   /*   } */
102   /*   mmalloc_backtrace_fragment_display(heap->heapinfo, block, frag_nb); */
103   /*   break; */
104   /* } */
105 }
106
107
108 static int compare_backtrace(int b1, int f1, int b2, int f2){
109   /*int i = 0;
110   if(f1 != -1){
111     for(i=0; i< XBT_BACKTRACE_SIZE; i++){
112       if(heapinfo1[b1].busy_frag.bt[f1][i] != heapinfo2[b2].busy_frag.bt[f2][i]){
113         //mmalloc_backtrace_fragment_display((void*)heapinfo1, b1, f1);
114         //mmalloc_backtrace_fragment_display((void*)heapinfo2, b2, f2);
115         return 1;
116       }
117     }
118   }else{
119     for(i=0; i< heapinfo1[b1].busy_block.bt_size; i++){
120       if(heapinfo1[b1].busy_block.bt[i] != heapinfo2[b2].busy_block.bt[i]){
121         //mmalloc_backtrace_block_display((void*)heapinfo1, b1);
122         //mmalloc_backtrace_block_display((void*)heapinfo2, b2);
123         return 1;
124       }
125     }
126     }*/
127   return 0;
128 }
129
130
131 /*********************************** Heap comparison ***********************************/
132 /***************************************************************************************/
133
134 typedef char* type_name;
135
136 struct s_mm_diff {
137   void *s_heap, *heapbase1, *heapbase2;
138   malloc_info *heapinfo1, *heapinfo2;
139   size_t heaplimit, heapsize1, heapsize2;
140   xbt_dynar_t to_ignore1, to_ignore2;
141   heap_area_t **equals_to1, **equals_to2;
142   type_name **types1, **types2;
143 };
144
145 __thread struct s_mm_diff* mm_diff_info = NULL;
146
147 /*********************************** Free functions ************************************/
148
149 static void heap_area_pair_free(heap_area_pair_t pair){
150   xbt_free(pair);
151   pair = NULL;
152 }
153
154 static void heap_area_pair_free_voidp(void *d){
155   heap_area_pair_free((heap_area_pair_t) * (void **) d);
156 }
157
158 static void heap_area_free(heap_area_t area){
159   xbt_free(area);
160   area = NULL;
161 }
162
163 /************************************************************************************/
164
165 static heap_area_t new_heap_area(int block, int fragment){
166   heap_area_t area = NULL;
167   area = xbt_new0(s_heap_area_t, 1);
168   area->block = block;
169   area->fragment = fragment;
170   return area;
171 }
172
173  
174 static int is_new_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int block2, int fragment2){
175   
176   unsigned int cursor = 0;
177   heap_area_pair_t current_pair;
178
179   xbt_dynar_foreach(list, cursor, current_pair){
180     if(current_pair->block1 == block1 && current_pair->block2 == block2 && current_pair->fragment1 == fragment1 && current_pair->fragment2 == fragment2)
181       return 0; 
182   }
183   
184   return 1;
185 }
186
187 static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int block2, int fragment2){
188
189   if(is_new_heap_area_pair(list, block1, fragment1, block2, fragment2)){
190     heap_area_pair_t pair = NULL;
191     pair = xbt_new0(s_heap_area_pair_t, 1);
192     pair->block1 = block1;
193     pair->fragment1 = fragment1;
194     pair->block2 = block2;
195     pair->fragment2 = fragment2;
196     
197     xbt_dynar_push(list, &pair); 
198
199     return 1;
200   }
201
202   return 0;
203 }
204
205 static ssize_t heap_comparison_ignore_size(xbt_dynar_t ignore_list, void *address){
206
207   unsigned int cursor = 0;
208   int start = 0;
209   int end = xbt_dynar_length(ignore_list) - 1;
210   mc_heap_ignore_region_t region;
211
212   while(start <= end){
213     cursor = (start + end) / 2;
214     region = (mc_heap_ignore_region_t)xbt_dynar_get_as(ignore_list, cursor, mc_heap_ignore_region_t);
215     if(region->address == address)
216       return region->size;
217     if(region->address < address)
218       start = cursor + 1;
219     if(region->address > address)
220       end = cursor - 1;   
221   }
222
223   return -1;
224 }
225
226 static int is_stack(void *address){
227   unsigned int cursor = 0;
228   stack_region_t stack;
229
230   xbt_dynar_foreach(stacks_areas, cursor, stack){
231     if(address == stack->address)
232       return 1;
233   }
234
235   return 0;
236 }
237
238 static int is_block_stack(int block){
239   unsigned int cursor = 0;
240   stack_region_t stack;
241
242   xbt_dynar_foreach(stacks_areas, cursor, stack){
243     if(block == stack->block)
244       return 1;
245   }
246
247   return 0;
248 }
249
250 static void match_equals(struct s_mm_diff *state, xbt_dynar_t list){
251
252   unsigned int cursor = 0;
253   heap_area_pair_t current_pair;
254   heap_area_t previous_area;
255
256   xbt_dynar_foreach(list, cursor, current_pair){
257
258     if(current_pair->fragment1 != -1){
259
260       if(state->equals_to1[current_pair->block1][current_pair->fragment1] != NULL){
261         previous_area = state->equals_to1[current_pair->block1][current_pair->fragment1];
262         heap_area_free(state->equals_to2[previous_area->block][previous_area->fragment]);
263         state->equals_to2[previous_area->block][previous_area->fragment] = NULL;
264         heap_area_free(previous_area);
265       }
266       if(state->equals_to2[current_pair->block2][current_pair->fragment2] != NULL){
267         previous_area = state->equals_to2[current_pair->block2][current_pair->fragment2];
268         heap_area_free(state->equals_to1[previous_area->block][previous_area->fragment]);
269         state->equals_to1[previous_area->block][previous_area->fragment] = NULL;
270         heap_area_free(previous_area);
271       }
272
273       state->equals_to1[current_pair->block1][current_pair->fragment1] = new_heap_area(current_pair->block2, current_pair->fragment2);
274       state->equals_to2[current_pair->block2][current_pair->fragment2] = new_heap_area(current_pair->block1, current_pair->fragment1);
275       
276     }else{
277
278       if(state->equals_to1[current_pair->block1][0] != NULL){
279         previous_area = state->equals_to1[current_pair->block1][0];
280         heap_area_free(state->equals_to2[previous_area->block][0]);
281         state->equals_to2[previous_area->block][0] = NULL;
282         heap_area_free(previous_area);
283       }
284       if(state->equals_to2[current_pair->block2][0] != NULL){
285         previous_area = state->equals_to2[current_pair->block2][0];
286         heap_area_free(state->equals_to1[previous_area->block][0]);
287         state->equals_to1[previous_area->block][0] = NULL;
288         heap_area_free(previous_area);
289       }
290
291       state->equals_to1[current_pair->block1][0] = new_heap_area(current_pair->block2, current_pair->fragment2);
292       state->equals_to2[current_pair->block2][0] = new_heap_area(current_pair->block1, current_pair->fragment1);
293
294     }
295
296   }
297 }
298
299 static int equal_blocks(struct s_mm_diff *state, int b1, int b2){
300   
301   if(state->equals_to1[b1][0]->block == b2 && state->equals_to2[b2][0]->block == b1)
302     return 1;
303
304   return 0;
305 }
306
307 static int equal_fragments(struct s_mm_diff *state, int b1, int f1, int b2, int f2){
308   
309   if(state->equals_to1[b1][f1]->block == b2
310     && state->equals_to1[b1][f1]->fragment == f2
311     && state->equals_to2[b2][f2]->block == b1
312     && state->equals_to2[b2][f2]->fragment == f1)
313     return 1;
314
315   return 0;
316 }
317
318 int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, xbt_dynar_t i2){
319   if(mm_diff_info==NULL) {
320     mm_diff_info = xbt_new0(struct s_mm_diff, 1);
321   }
322   struct s_mm_diff *state = mm_diff_info;
323
324   if((((struct mdesc *)heap1)->heaplimit != ((struct mdesc *)heap2)->heaplimit)
325     || ((((struct mdesc *)heap1)->heapsize != ((struct mdesc *)heap2)->heapsize) ))
326     return -1;
327
328   int i, j;
329
330   state->heaplimit = ((struct mdesc *)heap1)->heaplimit;
331
332   state->s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize();
333
334   state->heapbase1 = (char *)heap1 + BLOCKSIZE;
335   state->heapbase2 = (char *)heap2 + BLOCKSIZE;
336
337   state->heapinfo1 = (malloc_info *)((char *)heap1 + ((uintptr_t)((char *)((struct mdesc *)heap1)->heapinfo - (char *)state->s_heap)));
338   state->heapinfo2 = (malloc_info *)((char *)heap2 + ((uintptr_t)((char *)((struct mdesc *)heap2)->heapinfo - (char *)state->s_heap)));
339
340   state->heapsize1 = heap1->heapsize;
341   state->heapsize2 = heap2->heapsize;
342
343   state->to_ignore1 = i1;
344   state-> to_ignore2 = i2;
345
346   state->equals_to1 = malloc(state->heaplimit * sizeof(heap_area_t *));
347   state->types1 = malloc(state->heaplimit * sizeof(type_name *));
348   for(i=0; i<=state->heaplimit; i++){
349     state->equals_to1[i] = malloc(MAX_FRAGMENT_PER_BLOCK * sizeof(heap_area_t));
350     state->types1[i] = malloc(MAX_FRAGMENT_PER_BLOCK * sizeof(type_name));
351     for(j=0; j<MAX_FRAGMENT_PER_BLOCK; j++){
352       state->equals_to1[i][j] = NULL;
353       state->types1[i][j] = NULL;
354     }      
355   }
356
357   state->equals_to2 = malloc(state->heaplimit * sizeof(heap_area_t *));
358   state->types2 = malloc(state->heaplimit * sizeof(type_name *));
359   for(i=0; i<=state->heaplimit; i++){
360     state->equals_to2[i] = malloc(MAX_FRAGMENT_PER_BLOCK * sizeof(heap_area_t));
361     state->types2[i] = malloc(MAX_FRAGMENT_PER_BLOCK * sizeof(type_name));
362     for(j=0; j<MAX_FRAGMENT_PER_BLOCK; j++){
363       state->equals_to2[i][j] = NULL;
364       state->types2[i][j] = NULL;
365     }
366   }
367
368   if(MC_is_active()){
369     MC_ignore_global_variable("mm_diff_info");
370   }
371
372   return 0;
373
374 }
375
376 void reset_heap_information(){
377
378   struct s_mm_diff *state = mm_diff_info;
379
380   size_t i = 0, j;
381
382   for(i=0; i<=state->heaplimit; i++){
383     for(j=0; j<MAX_FRAGMENT_PER_BLOCK;j++){
384       heap_area_free(state->equals_to1[i][j]);
385       state->equals_to1[i][j] = NULL;
386       heap_area_free(state->equals_to2[i][j]);
387       state-> equals_to2[i][j] = NULL;
388       xbt_free(state->types1[i][j]);
389       state->types1[i][j] = NULL;
390       xbt_free(state->types2[i][j]);
391       state->types2[i][j] = NULL;
392     }
393     free(state->equals_to1[i]);
394     free(state->equals_to2[i]);
395     free(state->types1[i]);
396     free(state->types2[i]);
397   }
398
399   free(state->equals_to1);
400   free(state->equals_to2);
401   free(state->types1);
402   free(state->types2);
403
404   state->s_heap = NULL, state->heapbase1 = NULL, state->heapbase2 = NULL;
405   state->heapinfo1 = NULL, state->heapinfo2 = NULL;
406   state->heaplimit = 0, state->heapsize1 = 0, state->heapsize2 = 0;
407   state->to_ignore1 = NULL, state->to_ignore2 = NULL;
408   state->equals_to1 = NULL, state->equals_to2 = NULL;
409   state->types1 = NULL, state->types2 = NULL;
410
411 }
412
413 int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, mc_object_info_t info, mc_object_info_t other_info){
414
415   struct s_mm_diff *state = mm_diff_info;
416
417   if(heap1 == NULL && heap2 == NULL){
418     XBT_DEBUG("Malloc descriptors null");
419     return 0;
420   }
421
422   /* Start comparison */
423   size_t i1, i2, j1, j2, k;
424   void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
425   int nb_diff1 = 0, nb_diff2 = 0;
426
427   xbt_dynar_t previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp);
428
429   int equal, res_compare = 0;
430
431   /* Check busy blocks*/
432
433   i1 = 1;
434
435   while(i1 <= state->heaplimit){
436
437     if(state->heapinfo1[i1].type == -1){ /* Free block */
438       i1++;
439       continue;
440     }
441
442     addr_block1 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase));
443
444     if(state->heapinfo1[i1].type == 0){  /* Large block */
445       
446       if(is_stack(addr_block1)){
447         for(k=0; k < state->heapinfo1[i1].busy_block.size; k++)
448           state->equals_to1[i1+k][0] = new_heap_area(i1, -1);
449         for(k=0; k < state->heapinfo2[i1].busy_block.size; k++)
450           state->equals_to2[i1+k][0] = new_heap_area(i1, -1);
451         i1 += state->heapinfo1[i1].busy_block.size;
452         continue;
453       }
454
455       if(state->equals_to1[i1][0] != NULL){
456         i1++;
457         continue;
458       }
459     
460       i2 = 1;
461       equal = 0;
462       res_compare = 0;
463   
464       /* Try first to associate to same block in the other heap */
465       if(state->heapinfo2[i1].type == state->heapinfo1[i1].type){
466
467         if(state->equals_to2[i1][0] == NULL){
468
469           addr_block2 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase));
470         
471           res_compare = compare_heap_area(addr_block1, addr_block2, NULL, info, other_info, NULL, 0);
472         
473           if(res_compare != 1){
474             for(k=1; k < state->heapinfo2[i1].busy_block.size; k++)
475               state->equals_to2[i1+k][0] = new_heap_area(i1, -1);
476             for(k=1; k < state->heapinfo1[i1].busy_block.size; k++)
477               state->equals_to1[i1+k][0] = new_heap_area(i1, -1);
478             equal = 1;
479             i1 += state->heapinfo1[i1].busy_block.size;
480           }
481         
482           xbt_dynar_reset(previous);
483         
484         }
485         
486       }
487
488       while(i2 <= state->heaplimit && !equal){
489
490         addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase));
491            
492         if(i2 == i1){
493           i2++;
494           continue;
495         }
496
497         if(state->heapinfo2[i2].type != 0){
498           i2++;
499           continue;
500         }
501     
502         if(state->equals_to2[i2][0] != NULL){
503           i2++;
504           continue;
505         }
506           
507         res_compare = compare_heap_area(addr_block1, addr_block2, NULL, info, other_info, NULL, 0);
508         
509         if(res_compare != 1 ){
510           for(k=1; k < state->heapinfo2[i2].busy_block.size; k++)
511             state->equals_to2[i2+k][0] = new_heap_area(i1, -1);
512           for(k=1; k < state->heapinfo1[i1].busy_block.size; k++)
513             state->equals_to1[i1+k][0] = new_heap_area(i2, -1);
514           equal = 1;
515           i1 += state->heapinfo1[i1].busy_block.size;
516         }
517
518         xbt_dynar_reset(previous);
519
520         i2++;
521
522       }
523
524       if(!equal){
525         XBT_DEBUG("Block %zu not found (size_used = %zu, addr = %p)", i1, state->heapinfo1[i1].busy_block.busy_size, addr_block1);
526         i1 = state->heaplimit + 1;
527         nb_diff1++;
528           //i1++;
529       }
530       
531     }else{ /* Fragmented block */
532
533       for(j1=0; j1 < (size_t) (BLOCKSIZE >> state->heapinfo1[i1].type); j1++){
534
535         if(state->heapinfo1[i1].busy_frag.frag_size[j1] == -1) /* Free fragment */
536           continue;
537
538         if(state->equals_to1[i1][j1] != NULL)
539           continue;
540
541         addr_frag1 = (void*) ((char *)addr_block1 + (j1 << state->heapinfo1[i1].type));
542
543         i2 = 1;
544         equal = 0;
545         
546         /* Try first to associate to same fragment in the other heap */
547         if(state->heapinfo2[i1].type == state->heapinfo1[i1].type){
548
549           if(state->equals_to2[i1][j1] == NULL){
550
551             addr_block2 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase));
552             addr_frag2 = (void*) ((char *)addr_block2 + (j1 << ((xbt_mheap_t)state->s_heap)->heapinfo[i1].type));
553
554             res_compare = compare_heap_area(addr_frag1, addr_frag2, NULL, info, other_info, NULL, 0);
555
556             if(res_compare !=  1)
557               equal = 1;
558         
559             xbt_dynar_reset(previous);
560
561           }
562
563         }
564
565         while(i2 <= state->heaplimit && !equal){
566
567           if(state->heapinfo2[i2].type <= 0){
568             i2++;
569             continue;
570           }
571
572           for(j2=0; j2 < (size_t) (BLOCKSIZE >> state->heapinfo2[i2].type); j2++){
573
574             if(i2 == i1 && j2 == j1)
575               continue;
576            
577             if(state->equals_to2[i2][j2] != NULL)
578               continue;
579                           
580             addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase));
581             addr_frag2 = (void*) ((char *)addr_block2 + (j2 <<((xbt_mheap_t)state->s_heap)->heapinfo[i2].type));
582
583             res_compare = compare_heap_area(addr_frag1, addr_frag2, NULL, info, other_info, NULL, 0);
584             
585             if(res_compare != 1){
586               equal = 1;
587               xbt_dynar_reset(previous);
588               break;
589             }
590
591             xbt_dynar_reset(previous);
592
593           }
594
595           i2++;
596
597         }
598
599         if(!equal){
600           XBT_DEBUG("Block %zu, fragment %zu not found (size_used = %zd, address = %p)\n", i1, j1, state->heapinfo1[i1].busy_frag.frag_size[j1], addr_frag1);
601           i2 = state->heaplimit + 1;
602           i1 = state->heaplimit + 1;
603           nb_diff1++;
604           break;
605         }
606
607       }
608
609       i1++;
610       
611     }
612
613   }
614
615   /* All blocks/fragments are equal to another block/fragment ? */
616   size_t i = 1, j = 0;
617   void *real_addr_frag1 = NULL, *real_addr_block1 = NULL, *real_addr_block2 = NULL, *real_addr_frag2 = NULL;
618  
619   while(i<=state->heaplimit){
620     if(state->heapinfo1[i].type == 0){
621       if(i1 == state->heaplimit){
622         if(state->heapinfo1[i].busy_block.busy_size > 0){
623           if(state->equals_to1[i][0] == NULL){
624             if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){
625               addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)state->heapbase1));
626               XBT_DEBUG("Block %zu (%p) not found (size used = %zu)", i, addr_block1, state->heapinfo1[i].busy_block.busy_size);
627               //mmalloc_backtrace_block_display((void*)heapinfo1, i);
628             }
629             nb_diff1++;
630           }
631         }
632       }
633     }
634     if(state->heapinfo1[i].type > 0){
635       addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)state->heapbase1));
636       real_addr_block1 =  ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)((struct mdesc *)state->s_heap)->heapbase));
637       for(j=0; j < (size_t) (BLOCKSIZE >> state->heapinfo1[i].type); j++){
638         if(i1== state->heaplimit){
639           if(state->heapinfo1[i].busy_frag.frag_size[j] > 0){
640             if(state->equals_to1[i][j] == NULL){
641               if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){
642                 addr_frag1 = (void*) ((char *)addr_block1 + (j << state->heapinfo1[i].type));
643                 real_addr_frag1 = (void*) ((char *)real_addr_block1 + (j << ((struct mdesc *)state->s_heap)->heapinfo[i].type));
644                 XBT_DEBUG("Block %zu, Fragment %zu (%p - %p) not found (size used = %zd)", i, j, addr_frag1, real_addr_frag1, state->heapinfo1[i].busy_frag.frag_size[j]);
645                 //mmalloc_backtrace_fragment_display((void*)heapinfo1, i, j);
646               }
647               nb_diff1++;
648             }
649           }
650         }
651       }
652     }
653     i++; 
654   }
655
656   if(i1 == state->heaplimit)
657     XBT_DEBUG("Number of blocks/fragments not found in heap1 : %d", nb_diff1);
658
659   i = 1;
660
661   while(i<=state->heaplimit){
662     if(state->heapinfo2[i].type == 0){
663       if(i1 == state->heaplimit){
664         if(state->heapinfo2[i].busy_block.busy_size > 0){
665           if(state->equals_to2[i][0] == NULL){
666             if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){
667               addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)state->heapbase2));
668               XBT_DEBUG("Block %zu (%p) not found (size used = %zu)", i, addr_block2, state->heapinfo2[i].busy_block.busy_size);
669               //mmalloc_backtrace_block_display((void*)heapinfo2, i);
670             }
671             nb_diff2++;
672           }
673         }
674       }
675     }
676     if(state->heapinfo2[i].type > 0){
677       addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)state->heapbase2));
678       real_addr_block2 =  ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)((struct mdesc *)state->s_heap)->heapbase));
679       for(j=0; j < (size_t) (BLOCKSIZE >> state->heapinfo2[i].type); j++){
680         if(i1 == state->heaplimit){
681           if(state->heapinfo2[i].busy_frag.frag_size[j] > 0){
682             if(state->equals_to2[i][j] == NULL){
683               if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){
684                 addr_frag2 = (void*) ((char *)addr_block2 + (j << state->heapinfo2[i].type));
685                 real_addr_frag2 = (void*) ((char *)real_addr_block2 + (j << ((struct mdesc *)state->s_heap)->heapinfo[i].type));
686                 XBT_DEBUG( "Block %zu, Fragment %zu (%p - %p) not found (size used = %zd)", i, j, addr_frag2, real_addr_frag2, state->heapinfo2[i].busy_frag.frag_size[j]);
687                 //mmalloc_backtrace_fragment_display((void*)heapinfo2, i, j);
688               }
689               nb_diff2++;
690             }
691           }
692         }
693       }
694     }
695     i++; 
696   }
697
698   if(i1 == state->heaplimit)
699     XBT_DEBUG("Number of blocks/fragments not found in heap2 : %d", nb_diff2);
700
701   xbt_dynar_free(&previous);
702   real_addr_frag1 = NULL, real_addr_block1 = NULL, real_addr_block2 = NULL, real_addr_frag2 = NULL;
703
704   return ((nb_diff1 > 0) || (nb_diff2 > 0));
705 }
706
707 static int compare_heap_area_without_type(struct s_mm_diff *state, void *real_area1, void *real_area2, void *area1, void *area2, xbt_dynar_t previous, mc_object_info_t info, mc_object_info_t other_info, int size, int check_ignore){
708
709   int i = 0;
710   void *addr_pointed1, *addr_pointed2;
711   int pointer_align, res_compare;
712   ssize_t ignore1, ignore2;
713
714   while(i<size){
715
716     if(check_ignore > 0){
717       if((ignore1 = heap_comparison_ignore_size(state->to_ignore1, (char *)real_area1 + i)) != -1){
718         if((ignore2 = heap_comparison_ignore_size(state->to_ignore2, (char *)real_area2 + i))  == ignore1){
719           if(ignore1 == 0){
720             check_ignore--;
721             return 0;
722           }else{
723             i = i + ignore2;
724             check_ignore--;
725             continue;
726           }
727         }
728       }
729     }
730
731     if(memcmp(((char *)area1) + i, ((char *)area2) + i, 1) != 0){
732
733       pointer_align = (i / sizeof(void*)) * sizeof(void*);
734       addr_pointed1 = *((void **)((char *)area1 + pointer_align));
735       addr_pointed2 = *((void **)((char *)area2 + pointer_align));
736       
737       if(addr_pointed1 > maestro_stack_start && addr_pointed1 < maestro_stack_end && addr_pointed2 > maestro_stack_start && addr_pointed2 < maestro_stack_end){
738         i = pointer_align + sizeof(void *);
739         continue;
740       }else if((addr_pointed1 > state->s_heap) && ((char *)addr_pointed1 < (char *)state->s_heap + STD_HEAP_SIZE)
741                && (addr_pointed2 > state->s_heap) && ((char *)addr_pointed2 < (char *)state->s_heap + STD_HEAP_SIZE)){
742         res_compare = compare_heap_area(addr_pointed1, addr_pointed2, previous, info, other_info, NULL, 0);
743         if(res_compare == 1){
744           return res_compare;
745         }
746         i = pointer_align + sizeof(void *);
747         continue;
748       }else{
749         return 1;
750       }
751       
752     }
753     
754     i++;
755
756   }
757
758   return 0;
759  
760 }
761
762 // area_size is either a byte_size or an elements_count?&
763 static int compare_heap_area_with_type(struct s_mm_diff *state, void *real_area1, void *real_area2, void *area1, void *area2,
764                                        xbt_dynar_t previous, mc_object_info_t info, mc_object_info_t other_info, char *type_id,
765                                        int area_size, int check_ignore, int pointer_level){
766
767   if(is_stack(real_area1) && is_stack(real_area2))
768     return 0;
769
770   ssize_t ignore1, ignore2;
771
772   if((check_ignore > 0) && ((ignore1 = heap_comparison_ignore_size(state->to_ignore1, real_area1)) > 0) && ((ignore2 = heap_comparison_ignore_size(state->to_ignore2, real_area2))  == ignore1)){
773     return 0;
774   }
775   
776   dw_type_t type = xbt_dict_get_or_null(info->types, type_id);
777   dw_type_t subtype, subsubtype;
778   int res, elm_size, i, switch_types = 0;
779   unsigned int cursor = 0;
780   dw_type_t member;
781   void *addr_pointed1, *addr_pointed2;;
782
783   switch(type->type){
784   case DW_TAG_base_type:
785     if(type->name!=NULL && strcmp(type->name, "char") == 0){ /* String, hence random (arbitrary ?) size */
786       if(real_area1 == real_area2)
787         return -1;
788       else
789         return (memcmp(area1, area2, area_size) != 0);
790     }else{
791       if(area_size != -1 && type->byte_size != area_size)
792         return -1;
793       else{
794         return  (memcmp(area1, area2, type->byte_size) != 0);
795       }
796     }
797     break;
798   case DW_TAG_enumeration_type:
799     if(area_size != -1 && type->byte_size != area_size)
800       return -1;
801     else
802       return (memcmp(area1, area2, type->byte_size) != 0);
803     break;
804   case DW_TAG_typedef:
805   case DW_TAG_const_type:
806   case DW_TAG_volatile_type:
807     return compare_heap_area_with_type(state, real_area1, real_area2, area1, area2, previous, info, other_info, type->dw_type_id, area_size, check_ignore, pointer_level);
808     break;
809   case DW_TAG_array_type:
810     subtype = xbt_dict_get_or_null(info->types, type->dw_type_id);
811     switch(subtype->type){
812     case DW_TAG_base_type:
813     case DW_TAG_enumeration_type:
814     case DW_TAG_pointer_type:
815     case DW_TAG_reference_type:
816     case DW_TAG_rvalue_reference_type:
817     case DW_TAG_structure_type:
818     case DW_TAG_class_type:
819     case DW_TAG_union_type:
820       if(subtype->byte_size == 0){ /*declaration of the type, need the complete description */
821           subtype = xbt_dict_get_or_null(other_info->types_by_name, subtype->name);
822           switch_types = 1;
823       }
824       elm_size = subtype->byte_size;
825       break;
826     // TODO, just remove the type indirection?
827     case DW_TAG_const_type:
828     case DW_TAG_typedef:
829     case DW_TAG_volatile_type:
830       subsubtype = subtype->subtype;
831       if(subsubtype->byte_size == 0){ /*declaration of the type, need the complete description */
832           subsubtype = xbt_dict_get_or_null(other_info->types_by_name, subtype->name);
833           switch_types = 1;
834       }
835       elm_size = subsubtype->byte_size;
836       break;
837     default : 
838       return 0;
839       break;
840     }
841     for(i=0; i<type->element_count; i++){
842       // TODO, add support for variable stride (DW_AT_byte_stride)
843       if(switch_types)
844         res = compare_heap_area_with_type(state, (char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, other_info, info, type->dw_type_id, subtype->byte_size, check_ignore, pointer_level);
845       else
846         res = compare_heap_area_with_type(state, (char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, info, other_info, type->dw_type_id, subtype->byte_size, check_ignore, pointer_level);
847       if(res == 1)
848         return res;
849     }
850     break;
851   case DW_TAG_reference_type:
852   case DW_TAG_rvalue_reference_type:
853   case DW_TAG_pointer_type:
854     if(type->dw_type_id && ((dw_type_t)xbt_dict_get_or_null(info->types, type->dw_type_id))->type == DW_TAG_subroutine_type){
855       addr_pointed1 = *((void **)(area1)); 
856       addr_pointed2 = *((void **)(area2));
857       return (addr_pointed1 != addr_pointed2);;
858     }else{
859       pointer_level++;
860       if(pointer_level > 1){ /* Array of pointers */
861         for(i=0; i<(area_size/sizeof(void *)); i++){ 
862           addr_pointed1 = *((void **)((char *)area1 + (i*sizeof(void *)))); 
863           addr_pointed2 = *((void **)((char *)area2 + (i*sizeof(void *)))); 
864           if(addr_pointed1 > state->s_heap && (char *)addr_pointed1 < (char*) state->s_heap + STD_HEAP_SIZE && addr_pointed2 > state->s_heap && (char *)addr_pointed2 < (char*) state->s_heap + STD_HEAP_SIZE)
865             res =  compare_heap_area(addr_pointed1, addr_pointed2, previous, info, other_info, type->dw_type_id, pointer_level);
866           else
867             res =  (addr_pointed1 != addr_pointed2);
868           if(res == 1)
869             return res;
870         }
871       }else{
872         addr_pointed1 = *((void **)(area1)); 
873         addr_pointed2 = *((void **)(area2));
874         if(addr_pointed1 > state->s_heap && (char *)addr_pointed1 < (char*) state->s_heap + STD_HEAP_SIZE && addr_pointed2 > state->s_heap && (char *)addr_pointed2 < (char*) state->s_heap + STD_HEAP_SIZE)
875           return compare_heap_area(addr_pointed1, addr_pointed2, previous, info, other_info, type->dw_type_id, pointer_level);
876         else
877           return  (addr_pointed1 != addr_pointed2);
878       }
879     }
880     break;
881   case DW_TAG_structure_type:
882   case DW_TAG_class_type:
883     if(type->byte_size == 0){ /*declaration of the structure, need the complete description */
884       dw_type_t full_type = xbt_dict_get_or_null(info->types_by_name, type->name);
885       if(full_type){
886         type = full_type;
887       }else{
888         type = xbt_dict_get_or_null(other_info->types_by_name, type->name);
889         switch_types = 1;
890       }
891     }
892     if(area_size != -1 && type->byte_size != area_size){
893       if(area_size>type->byte_size && area_size%type->byte_size == 0){
894         for(i=0; i<(area_size/type->byte_size); i++){
895           if(switch_types)
896             res = compare_heap_area_with_type(state, (char *)real_area1 + (i*type->byte_size), (char *)real_area2 + (i*type->byte_size), (char *)area1 + (i*type->byte_size), (char *)area2 + (i*type->byte_size), previous, other_info, info, type_id, -1, check_ignore, 0);
897           else
898             res = compare_heap_area_with_type(state, (char *)real_area1 + (i*type->byte_size), (char *)real_area2 + (i*type->byte_size), (char *)area1 + (i*type->byte_size), (char *)area2 + (i*type->byte_size), previous, info, other_info, type_id, -1, check_ignore, 0);
899           if(res == 1)
900             return res;
901         }
902       }else{
903         return -1;
904       }
905     }else{
906       cursor = 0;
907       xbt_dynar_foreach(type->members, cursor, member){ 
908         if(switch_types)
909           res = compare_heap_area_with_type(state, (char *)real_area1 + member->offset, (char *)real_area2 + member->offset, (char *)area1 + member->offset, (char *)area2 + member->offset, previous, other_info, info, member->dw_type_id, -1, check_ignore, 0);
910         else
911           res = compare_heap_area_with_type(state, (char *)real_area1 + member->offset, (char *)real_area2 + member->offset, (char *)area1 + member->offset, (char *)area2 + member->offset, previous, info, other_info, member->dw_type_id, -1, check_ignore, 0);
912         if(res == 1){
913           return res;
914         }
915       }
916     }
917     break;
918   case DW_TAG_union_type:
919     return compare_heap_area_without_type(state, real_area1, real_area2, area1, area2, previous, info, other_info, type->byte_size, check_ignore);
920     break;
921   default:
922     break;
923   }
924
925   return 0;
926
927 }
928
929 static char* get_offset_type(char* type_id, int offset, mc_object_info_t info, mc_object_info_t other_info, int area_size, int *switch_type){
930   dw_type_t type = xbt_dict_get_or_null(info->types, type_id);
931   if(type == NULL){
932     type = xbt_dict_get_or_null(other_info->types, type_id);
933     *switch_type = 1;
934   }
935   switch(type->type){
936   case DW_TAG_structure_type :
937   case DW_TAG_class_type:
938     if(type->byte_size == 0){ /*declaration of the structure, need the complete description */
939       if(*switch_type == 0){
940         dw_type_t full_type = xbt_dict_get_or_null(info->types_by_name, type->name);
941         if(full_type){
942           type = full_type;
943         }else{
944           type = xbt_dict_get_or_null(other_info->types_by_name, type->name);
945           *switch_type = 1;
946         }
947       }else{
948         dw_type_t full_type = xbt_dict_get_or_null(other_info->types_by_name, type->name);
949         if(full_type){
950           type = full_type;
951         }else{
952           type = xbt_dict_get_or_null(info->types_by_name, type->name);
953           *switch_type = 0;
954         }
955       }
956     
957     }
958     if(area_size != -1 && type->byte_size != area_size){
959       if(area_size>type->byte_size && area_size%type->byte_size == 0)
960         return type_id;
961       else
962         return NULL;
963     }else{
964       unsigned int cursor = 0;
965       dw_type_t member;
966       xbt_dynar_foreach(type->members, cursor, member){ 
967         if(member->offset == offset)
968           return member->dw_type_id;
969       }
970       return NULL;
971     }
972     break;
973   default:
974     /* FIXME : other cases ? */
975     return NULL;
976     break;
977   }
978 }
979
980 int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, mc_object_info_t info, mc_object_info_t other_info, char *type_id, int pointer_level){
981
982   struct s_mm_diff* state = mm_diff_info;
983
984   int res_compare;
985   ssize_t block1, frag1, block2, frag2;
986   ssize_t size;
987   int check_ignore = 0;
988
989   void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2, *real_addr_block1, *real_addr_block2,  *real_addr_frag1, *real_addr_frag2;
990   void *area1_to_compare, *area2_to_compare;
991   dw_type_t type = NULL;
992   int type_size = -1;
993   int offset1 =0, offset2 = 0;
994   int new_size1 = -1, new_size2 = -1;
995   char *new_type_id1 = NULL, *new_type_id2 = NULL;
996   int switch_type = 0;
997
998   int match_pairs = 0;
999
1000   if(previous == NULL){
1001     previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp);
1002     match_pairs = 1;
1003   }
1004
1005   block1 = ((char*)area1 - (char*)((xbt_mheap_t)state->s_heap)->heapbase) / BLOCKSIZE + 1;
1006   block2 = ((char*)area2 - (char*)((xbt_mheap_t)state->s_heap)->heapbase) / BLOCKSIZE + 1;
1007
1008   if(is_block_stack((int)block1) && is_block_stack((int)block2)){
1009     add_heap_area_pair(previous, block1, -1, block2, -1);
1010     if(match_pairs){
1011       match_equals(state, previous);
1012       xbt_dynar_free(&previous);
1013     }
1014     return 0;
1015   }
1016
1017   if(((char *)area1 < (char*)((xbt_mheap_t)state->s_heap)->heapbase)  || (block1 > state->heapsize1) || (block1 < 1) || ((char *)area2 < (char*)((xbt_mheap_t)state->s_heap)->heapbase) || (block2 > state->heapsize2) || (block2 < 1)){
1018     if(match_pairs){
1019       xbt_dynar_free(&previous);
1020     }
1021     return 1;
1022   }
1023
1024   addr_block1 = ((void*) (((ADDR2UINT(block1)) - 1) * BLOCKSIZE + (char*)state->heapbase1));
1025   addr_block2 = ((void*) (((ADDR2UINT(block2)) - 1) * BLOCKSIZE + (char*)state->heapbase2));
1026
1027   real_addr_block1 = ((void*) (((ADDR2UINT(block1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase));
1028   real_addr_block2 = ((void*) (((ADDR2UINT(block2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase));
1029
1030   if(type_id){
1031     type = xbt_dict_get_or_null(info->types, type_id);
1032     if(type->byte_size == 0){
1033       if(type->subtype == NULL){
1034         dw_type_t full_type = xbt_dict_get_or_null(info->types_by_name, type->name);
1035         if(full_type)
1036           type = full_type;
1037         else
1038           type = xbt_dict_get_or_null(other_info->types_by_name, type->name);
1039       }else{
1040         type = type->subtype;
1041       }
1042     }
1043     if((type->type == DW_TAG_pointer_type) || ((type->type == DW_TAG_base_type) && type->name!=NULL && (!strcmp(type->name, "char"))))
1044       type_size = -1;
1045     else
1046       type_size = type->byte_size;
1047   }
1048   
1049   if((state->heapinfo1[block1].type == -1) && (state->heapinfo2[block2].type == -1)){  /* Free block */
1050
1051     if(match_pairs){
1052       match_equals(state, previous);
1053       xbt_dynar_free(&previous);
1054     }
1055     return 0;
1056
1057   }else if((state->heapinfo1[block1].type == 0) && (state->heapinfo2[block2].type == 0)){ /* Complete block */
1058     
1059     if(state->equals_to1[block1][0] != NULL && state->equals_to2[block2][0] != NULL){
1060       if(equal_blocks(state, block1, block2)){
1061         if(match_pairs){
1062           match_equals(state, previous);
1063           xbt_dynar_free(&previous);
1064         }
1065         return 0;
1066       }
1067     }
1068
1069     if(type_size != -1){
1070       if(type_size != state->heapinfo1[block1].busy_block.busy_size
1071         && type_size != state->heapinfo2[block2].busy_block.busy_size
1072         && type->name!=NULL && !strcmp(type->name, "s_smx_context")){
1073         if(match_pairs){
1074           match_equals(state, previous);
1075           xbt_dynar_free(&previous);
1076         }
1077         return -1;
1078       }
1079     }
1080
1081     if(state->heapinfo1[block1].busy_block.size != state->heapinfo2[block2].busy_block.size){
1082       if(match_pairs){
1083         xbt_dynar_free(&previous);
1084       }
1085       return 1;
1086     }
1087
1088     if(state->heapinfo1[block1].busy_block.busy_size != state->heapinfo2[block2].busy_block.busy_size){
1089       if(match_pairs){
1090         xbt_dynar_free(&previous);
1091       }
1092       return 1;
1093     }
1094
1095     if(!add_heap_area_pair(previous, block1, -1, block2, -1)){
1096       if(match_pairs){
1097         match_equals(state, previous);
1098         xbt_dynar_free(&previous);
1099       }
1100       return 0;
1101     }
1102  
1103     size = state->heapinfo1[block1].busy_block.busy_size;
1104     
1105     if(type_id != NULL){
1106       xbt_free(state->types1[block1][0]);
1107       xbt_free(state->types2[block2][0]);
1108       state->types1[block1][0] = strdup(type_id);
1109       state->types2[block2][0] = strdup(type_id);
1110     }
1111
1112     if(size <= 0){
1113       if(match_pairs){
1114         match_equals(state, previous);
1115         xbt_dynar_free(&previous);
1116       }
1117       return 0;
1118     }
1119
1120     frag1 = -1;
1121     frag2 = -1;
1122
1123     area1_to_compare = addr_block1;
1124     area2_to_compare = addr_block2;
1125
1126     if((state->heapinfo1[block1].busy_block.ignore > 0) && (state->heapinfo2[block2].busy_block.ignore == state->heapinfo1[block1].busy_block.ignore))
1127       check_ignore = state->heapinfo1[block1].busy_block.ignore;
1128       
1129   }else if((state->heapinfo1[block1].type > 0) && (state->heapinfo2[block2].type > 0)){ /* Fragmented block */
1130
1131     frag1 = ((uintptr_t) (ADDR2UINT (area1) % (BLOCKSIZE))) >> state->heapinfo1[block1].type;
1132     frag2 = ((uintptr_t) (ADDR2UINT (area2) % (BLOCKSIZE))) >> state->heapinfo2[block2].type;
1133
1134     addr_frag1 = (void*) ((char *)addr_block1 + (frag1 << state->heapinfo1[block1].type));
1135     addr_frag2 = (void*) ((char *)addr_block2 + (frag2 << state->heapinfo2[block2].type));
1136
1137     real_addr_frag1 = (void*) ((char *)real_addr_block1 + (frag1 << ((xbt_mheap_t)state->s_heap)->heapinfo[block1].type));
1138     real_addr_frag2 = (void*) ((char *)real_addr_block2 + (frag2 << ((xbt_mheap_t)state->s_heap)->heapinfo[block2].type));
1139
1140     if(type_size != -1){
1141       if(state->heapinfo1[block1].busy_frag.frag_size[frag1] == -1 || state->heapinfo2[block2].busy_frag.frag_size[frag2] == -1){
1142         if(match_pairs){
1143           match_equals(state, previous);
1144           xbt_dynar_free(&previous);
1145         }
1146         return -1;
1147       }
1148       if(type_size != state->heapinfo1[block1].busy_frag.frag_size[frag1]|| type_size !=  state->heapinfo2[block2].busy_frag.frag_size[frag2]){
1149         if(match_pairs){
1150           match_equals(state, previous);
1151           xbt_dynar_free(&previous);
1152         }
1153         return -1;
1154       }
1155     }
1156
1157     if(state->equals_to1[block1][frag1] != NULL && state->equals_to2[block2][frag2] != NULL){
1158       if(equal_fragments(state, block1, frag1, block2, frag2)){
1159         if(match_pairs){
1160           match_equals(state, previous);
1161           xbt_dynar_free(&previous);
1162         }
1163         return 0;
1164       }
1165     }
1166
1167     if(state->heapinfo1[block1].busy_frag.frag_size[frag1] != state->heapinfo2[block2].busy_frag.frag_size[frag2]){
1168       if(type_size == -1){
1169          if(match_pairs){
1170           match_equals(state, previous);
1171           xbt_dynar_free(&previous);
1172         }
1173         return -1;
1174       }else{
1175         if(match_pairs){
1176           xbt_dynar_free(&previous);
1177         }
1178         return 1;
1179       }
1180     }
1181       
1182     size = state->heapinfo1[block1].busy_frag.frag_size[frag1];
1183
1184     if(type_id != NULL){
1185       xbt_free(state->types1[block1][frag1]);
1186       xbt_free(state->types2[block2][frag2]);
1187       state->types1[block1][frag1] = strdup(type_id);
1188       state->types2[block2][frag2] = strdup(type_id);
1189     }
1190
1191     if(real_addr_frag1 != area1 || real_addr_frag2 != area2){
1192       offset1 = (char *)area1 - (char *)real_addr_frag1;
1193       offset2 = (char *)area2 - (char *)real_addr_frag2;
1194       if(state->types1[block1][frag1] != NULL && state->types2[block2][frag2] != NULL){
1195         new_type_id1 = get_offset_type(state->types1[block1][frag1], offset1, info, other_info, size, &switch_type);
1196         new_type_id2 = get_offset_type(state->types2[block2][frag2], offset1, info, other_info, size, &switch_type);
1197       }else if(state->types1[block1][frag1] != NULL){
1198         new_type_id1 = get_offset_type(state->types1[block1][frag1], offset1, info, other_info, size, &switch_type);
1199         new_type_id2 = get_offset_type(state->types1[block1][frag1], offset2, info, other_info, size, &switch_type);
1200       }else if(state->types2[block2][frag2] != NULL){
1201         new_type_id1 = get_offset_type(state->types2[block2][frag2], offset1, info, other_info, size, &switch_type);
1202         new_type_id2 = get_offset_type(state->types2[block2][frag2], offset2, info, other_info, size, &switch_type);
1203       }else{
1204         if(match_pairs){
1205           match_equals(state, previous);
1206           xbt_dynar_free(&previous);
1207         }
1208         return -1;
1209       }   
1210
1211       if(new_type_id1 !=  NULL && new_type_id2 !=  NULL && !strcmp(new_type_id1, new_type_id2)){
1212         if(switch_type){
1213           type = xbt_dict_get_or_null(other_info->types, new_type_id1);
1214           while(type->byte_size == 0 && type->dw_type_id != NULL)
1215             type = xbt_dict_get_or_null(other_info->types, type->dw_type_id);
1216           new_size1 = type->byte_size;
1217           type = xbt_dict_get_or_null(other_info->types, new_type_id2);
1218           while(type->byte_size == 0 && type->dw_type_id != NULL)
1219             type = xbt_dict_get_or_null(other_info->types, type->dw_type_id);
1220           new_size2 = type->byte_size;
1221         }else{
1222           type = xbt_dict_get_or_null(info->types, new_type_id1);
1223           while(type->byte_size == 0 && type->dw_type_id != NULL)
1224             type = xbt_dict_get_or_null(info->types, type->dw_type_id);
1225           new_size1 = type->byte_size;
1226           type = xbt_dict_get_or_null(info->types, new_type_id2);
1227           while(type->byte_size == 0 && type->dw_type_id != NULL)
1228             type = xbt_dict_get_or_null(info->types, type->dw_type_id);
1229           new_size2 = type->byte_size;
1230         }
1231       }else{
1232         if(match_pairs){
1233           match_equals(state, previous);
1234           xbt_dynar_free(&previous);
1235         }
1236         return -1;
1237       }
1238     }
1239
1240     area1_to_compare = (char *)addr_frag1 + offset1;
1241     area2_to_compare = (char *)addr_frag2 + offset2;
1242     
1243     if(new_size1 > 0 && new_size1 == new_size2){
1244       type_id = new_type_id1;
1245       size = new_size1;
1246     }
1247
1248     if(offset1 == 0 && offset2 == 0){
1249       if(!add_heap_area_pair(previous, block1, frag1, block2, frag2)){
1250         if(match_pairs){
1251           match_equals(state, previous);
1252           xbt_dynar_free(&previous);
1253         }
1254         return 0;
1255       }
1256     }
1257
1258     if(size <= 0){
1259       if(match_pairs){
1260         match_equals(state, previous);
1261         xbt_dynar_free(&previous);
1262       }
1263       return 0;
1264     }
1265       
1266     if((state->heapinfo1[block1].busy_frag.ignore[frag1] > 0) && ( state->heapinfo2[block2].busy_frag.ignore[frag2] == state->heapinfo1[block1].busy_frag.ignore[frag1]))
1267       check_ignore = state->heapinfo1[block1].busy_frag.ignore[frag1];
1268     
1269   }else{
1270
1271     if(match_pairs){
1272       xbt_dynar_free(&previous);
1273     }
1274     return 1;
1275
1276   }
1277   
1278
1279   /* Start comparison*/
1280   if(type_id != NULL){
1281     if(switch_type)
1282       res_compare = compare_heap_area_with_type(state, area1, area2, area1_to_compare, area2_to_compare, previous, other_info, info, type_id, size, check_ignore, pointer_level);
1283     else
1284       res_compare = compare_heap_area_with_type(state, area1, area2, area1_to_compare, area2_to_compare, previous, info, other_info, type_id, size, check_ignore, pointer_level);
1285     if(res_compare == 1){
1286       if(match_pairs)
1287         xbt_dynar_free(&previous);
1288       return res_compare;
1289     }
1290   }else{
1291     if(switch_type)
1292       res_compare = compare_heap_area_without_type(state, area1, area2, area1_to_compare, area2_to_compare, previous, other_info, info, size, check_ignore);
1293     else
1294       res_compare = compare_heap_area_without_type(state, area1, area2, area1_to_compare, area2_to_compare, previous, info, other_info, size, check_ignore);
1295     if(res_compare == 1){
1296       if(match_pairs)
1297         xbt_dynar_free(&previous);
1298       return res_compare;
1299     }
1300   }
1301
1302   if(match_pairs){
1303     match_equals(state, previous);
1304     xbt_dynar_free(&previous);
1305   }
1306
1307   return 0;
1308 }
1309
1310 /*********************************************** Miscellaneous ***************************************************/
1311 /****************************************************************************************************************/
1312
1313 // Not used:
1314 static int get_pointed_area_size(void *area, int heap){
1315
1316   struct s_mm_diff *state = mm_diff_info;
1317
1318   int block, frag;
1319   malloc_info *heapinfo;
1320
1321   if(heap == 1)
1322     heapinfo = state->heapinfo1;
1323   else
1324     heapinfo = state->heapinfo2;
1325
1326   block = ((char*)area - (char*)((xbt_mheap_t)state->s_heap)->heapbase) / BLOCKSIZE + 1;
1327
1328   if(((char *)area < (char*)((xbt_mheap_t)state->s_heap)->heapbase)  || (block > state->heapsize1) || (block < 1))
1329     return -1;
1330
1331   if(heapinfo[block].type == -1){ /* Free block */
1332     return -1;  
1333   }else if(heapinfo[block].type == 0){ /* Complete block */
1334     return (int)heapinfo[block].busy_block.busy_size;
1335   }else{
1336     frag = ((uintptr_t) (ADDR2UINT (area) % (BLOCKSIZE))) >> heapinfo[block].type;
1337     return (int)heapinfo[block].busy_frag.frag_size[frag];
1338   }
1339
1340 }
1341
1342 // Not used:
1343 char *get_type_description(mc_object_info_t info, char *type_name){
1344
1345   xbt_dict_cursor_t dict_cursor;
1346   char *type_origin;
1347   dw_type_t type;
1348
1349   xbt_dict_foreach(info->types, dict_cursor, type_origin, type){
1350     if(type->name && (strcmp(type->name, type_name) == 0) && type->byte_size > 0){
1351       xbt_dict_cursor_free(&dict_cursor);
1352       return type_origin;
1353     }
1354   }
1355
1356   xbt_dict_cursor_free(&dict_cursor);
1357   return NULL;
1358 }
1359
1360
1361 #ifndef max
1362 #define max( a, b ) ( ((a) > (b)) ? (a) : (b) )
1363 #endif
1364
1365 // Not used:
1366 int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){
1367
1368   struct s_mm_diff *state = mm_diff_info;
1369
1370   if(heap1 == NULL && heap1 == NULL){
1371     XBT_DEBUG("Malloc descriptors null");
1372     return 0;
1373   }
1374
1375   if(heap1->heaplimit != heap2->heaplimit){
1376     XBT_DEBUG("Different limit of valid info table indices");
1377     return 1;
1378   }
1379
1380   /* Heap information */
1381   state->heaplimit = ((struct mdesc *)heap1)->heaplimit;
1382
1383   state->s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize();
1384
1385   state->heapbase1 = (char *)heap1 + BLOCKSIZE;
1386   state->heapbase2 = (char *)heap2 + BLOCKSIZE;
1387
1388   state->heapinfo1 = (malloc_info *)((char *)heap1 + ((uintptr_t)((char *)heap1->heapinfo - (char *)state->s_heap)));
1389   state->heapinfo2 = (malloc_info *)((char *)heap2 + ((uintptr_t)((char *)heap2->heapinfo - (char *)state->s_heap)));
1390
1391   state->heapsize1 = heap1->heapsize;
1392   state->heapsize2 = heap2->heapsize;
1393
1394   /* Start comparison */
1395   size_t i, j, k;
1396   void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
1397
1398   int distance = 0;
1399
1400   /* Check busy blocks*/
1401
1402   i = 1;
1403
1404   while(i <= state->heaplimit){
1405
1406     addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)state->heapbase1));
1407     addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)state->heapbase2));
1408
1409     if(state->heapinfo1[i].type != state->heapinfo2[i].type){
1410   
1411       distance += BLOCKSIZE;
1412       XBT_DEBUG("Different type of blocks (%zu) : %d - %d -> distance = %d", i, state->heapinfo1[i].type, state->heapinfo2[i].type, distance);
1413       i++;
1414     
1415     }else{
1416
1417       if(state->heapinfo1[i].type == -1){ /* Free block */
1418         i++;
1419         continue;
1420       }
1421
1422       if(state->heapinfo1[i].type == 0){ /* Large block */
1423        
1424         if(state->heapinfo1[i].busy_block.size != state->heapinfo2[i].busy_block.size){
1425           distance += BLOCKSIZE * max(state->heapinfo1[i].busy_block.size, state->heapinfo2[i].busy_block.size);
1426           i += max(state->heapinfo1[i].busy_block.size, state->heapinfo2[i].busy_block.size);
1427           XBT_DEBUG("Different larger of cluster at block %zu : %zu - %zu -> distance = %d", i, state->heapinfo1[i].busy_block.size, state->heapinfo2[i].busy_block.size, distance);
1428           continue;
1429         }
1430
1431         /*if(heapinfo1[i].busy_block.busy_size != heapinfo2[i].busy_block.busy_size){
1432           distance += max(heapinfo1[i].busy_block.busy_size, heapinfo2[i].busy_block.busy_size);
1433           i += max(heapinfo1[i].busy_block.size, heapinfo2[i].busy_block.size);
1434           XBT_DEBUG("Different size used oin large cluster at block %zu : %zu - %zu -> distance = %d", i, heapinfo1[i].busy_block.busy_size, heapinfo2[i].busy_block.busy_size, distance);
1435           continue;
1436           }*/
1437
1438         k = 0;
1439
1440         //while(k < (heapinfo1[i].busy_block.busy_size)){
1441         while(k < state->heapinfo1[i].busy_block.size * BLOCKSIZE){
1442           if(memcmp((char *)addr_block1 + k, (char *)addr_block2 + k, 1) != 0){
1443             distance ++;
1444           }
1445           k++;
1446         } 
1447
1448         i++;
1449
1450       }else { /* Fragmented block */
1451
1452         for(j=0; j < (size_t) (BLOCKSIZE >> state->heapinfo1[i].type); j++){
1453
1454           addr_frag1 = (void*) ((char *)addr_block1 + (j << state->heapinfo1[i].type));
1455           addr_frag2 = (void*) ((char *)addr_block2 + (j << state->heapinfo2[i].type));
1456
1457           if(state->heapinfo1[i].busy_frag.frag_size[j] == 0 && state->heapinfo2[i].busy_frag.frag_size[j] == 0){
1458             continue;
1459           }
1460           
1461           
1462           /*if(heapinfo1[i].busy_frag.frag_size[j] != heapinfo2[i].busy_frag.frag_size[j]){
1463             distance += max(heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j]);
1464             XBT_DEBUG("Different size used in fragment %zu in block %zu : %d - %d -> distance = %d", j, i, heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j], distance); 
1465             continue;
1466             }*/
1467    
1468           k=0;
1469
1470           //while(k < max(heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j])){
1471           while(k < (BLOCKSIZE / (BLOCKSIZE >> state->heapinfo1[i].type))){
1472             if(memcmp((char *)addr_frag1 + k, (char *)addr_frag2 + k, 1) != 0){
1473               distance ++;
1474             }
1475             k++;
1476           }
1477
1478         }
1479
1480         i++;
1481
1482       }
1483       
1484     }
1485
1486   }
1487
1488   return distance;
1489   
1490 }
1491