Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[mc] Handle reference_type and rvalue_reference_type as pointer_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_union_type:
819       if(subtype->byte_size == 0){ /*declaration of the type, need the complete description */
820           subtype = xbt_dict_get_or_null(other_info->types_by_name, subtype->name);
821           switch_types = 1;
822       }
823       elm_size = subtype->byte_size;
824       break;
825     // TODO, just remove the type indirection?
826     case DW_TAG_const_type:
827     case DW_TAG_typedef:
828     case DW_TAG_volatile_type:
829       subsubtype = subtype->subtype;
830       if(subsubtype->byte_size == 0){ /*declaration of the type, need the complete description */
831           subsubtype = xbt_dict_get_or_null(other_info->types_by_name, subtype->name);
832           switch_types = 1;
833       }
834       elm_size = subsubtype->byte_size;
835       break;
836     default : 
837       return 0;
838       break;
839     }
840     for(i=0; i<type->element_count; i++){
841       // TODO, add support for variable stride (DW_AT_byte_stride)
842       if(switch_types)
843         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);
844       else
845         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);
846       if(res == 1)
847         return res;
848     }
849     break;
850   case DW_TAG_reference_type:
851   case DW_TAG_rvalue_reference_type:
852   case DW_TAG_pointer_type:
853     if(type->dw_type_id && ((dw_type_t)xbt_dict_get_or_null(info->types, type->dw_type_id))->type == DW_TAG_subroutine_type){
854       addr_pointed1 = *((void **)(area1)); 
855       addr_pointed2 = *((void **)(area2));
856       return (addr_pointed1 != addr_pointed2);;
857     }else{
858       pointer_level++;
859       if(pointer_level > 1){ /* Array of pointers */
860         for(i=0; i<(area_size/sizeof(void *)); i++){ 
861           addr_pointed1 = *((void **)((char *)area1 + (i*sizeof(void *)))); 
862           addr_pointed2 = *((void **)((char *)area2 + (i*sizeof(void *)))); 
863           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)
864             res =  compare_heap_area(addr_pointed1, addr_pointed2, previous, info, other_info, type->dw_type_id, pointer_level);
865           else
866             res =  (addr_pointed1 != addr_pointed2);
867           if(res == 1)
868             return res;
869         }
870       }else{
871         addr_pointed1 = *((void **)(area1)); 
872         addr_pointed2 = *((void **)(area2));
873         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)
874           return compare_heap_area(addr_pointed1, addr_pointed2, previous, info, other_info, type->dw_type_id, pointer_level);
875         else
876           return  (addr_pointed1 != addr_pointed2);
877       }
878     }
879     break;
880   case DW_TAG_structure_type:
881     if(type->byte_size == 0){ /*declaration of the structure, need the complete description */
882       dw_type_t full_type = xbt_dict_get_or_null(info->types_by_name, type->name);
883       if(full_type){
884         type = full_type;
885       }else{
886         type = xbt_dict_get_or_null(other_info->types_by_name, type->name);
887         switch_types = 1;
888       }
889     }
890     if(area_size != -1 && type->byte_size != area_size){
891       if(area_size>type->byte_size && area_size%type->byte_size == 0){
892         for(i=0; i<(area_size/type->byte_size); i++){
893           if(switch_types)
894             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);
895           else
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, info, other_info, type_id, -1, check_ignore, 0);
897           if(res == 1)
898             return res;
899         }
900       }else{
901         return -1;
902       }
903     }else{
904       cursor = 0;
905       xbt_dynar_foreach(type->members, cursor, member){ 
906         if(switch_types)
907           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);
908         else
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, info, other_info, member->dw_type_id, -1, check_ignore, 0);
910         if(res == 1){
911           return res;
912         }
913       }
914     }
915     break;
916   case DW_TAG_union_type:
917     return compare_heap_area_without_type(state, real_area1, real_area2, area1, area2, previous, info, other_info, type->byte_size, check_ignore);
918     break;
919   default:
920     break;
921   }
922
923   return 0;
924
925 }
926
927 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){
928   dw_type_t type = xbt_dict_get_or_null(info->types, type_id);
929   if(type == NULL){
930     type = xbt_dict_get_or_null(other_info->types, type_id);
931     *switch_type = 1;
932   }
933   switch(type->type){
934   case DW_TAG_structure_type :
935     if(type->byte_size == 0){ /*declaration of the structure, need the complete description */
936       if(*switch_type == 0){
937         dw_type_t full_type = xbt_dict_get_or_null(info->types_by_name, type->name);
938         if(full_type){
939           type = full_type;
940         }else{
941           type = xbt_dict_get_or_null(other_info->types_by_name, type->name);
942           *switch_type = 1;
943         }
944       }else{
945         dw_type_t full_type = xbt_dict_get_or_null(other_info->types_by_name, type->name);
946         if(full_type){
947           type = full_type;
948         }else{
949           type = xbt_dict_get_or_null(info->types_by_name, type->name);
950           *switch_type = 0;
951         }
952       }
953     
954     }
955     if(area_size != -1 && type->byte_size != area_size){
956       if(area_size>type->byte_size && area_size%type->byte_size == 0)
957         return type_id;
958       else
959         return NULL;
960     }else{
961       unsigned int cursor = 0;
962       dw_type_t member;
963       xbt_dynar_foreach(type->members, cursor, member){ 
964         if(member->offset == offset)
965           return member->dw_type_id;
966       }
967       return NULL;
968     }
969     break;
970   default:
971     /* FIXME : other cases ? */
972     return NULL;
973     break;
974   }
975 }
976
977 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){
978
979   struct s_mm_diff* state = mm_diff_info;
980
981   int res_compare;
982   ssize_t block1, frag1, block2, frag2;
983   ssize_t size;
984   int check_ignore = 0;
985
986   void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2, *real_addr_block1, *real_addr_block2,  *real_addr_frag1, *real_addr_frag2;
987   void *area1_to_compare, *area2_to_compare;
988   dw_type_t type = NULL;
989   int type_size = -1;
990   int offset1 =0, offset2 = 0;
991   int new_size1 = -1, new_size2 = -1;
992   char *new_type_id1 = NULL, *new_type_id2 = NULL;
993   int switch_type = 0;
994
995   int match_pairs = 0;
996
997   if(previous == NULL){
998     previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp);
999     match_pairs = 1;
1000   }
1001
1002   block1 = ((char*)area1 - (char*)((xbt_mheap_t)state->s_heap)->heapbase) / BLOCKSIZE + 1;
1003   block2 = ((char*)area2 - (char*)((xbt_mheap_t)state->s_heap)->heapbase) / BLOCKSIZE + 1;
1004
1005   if(is_block_stack((int)block1) && is_block_stack((int)block2)){
1006     add_heap_area_pair(previous, block1, -1, block2, -1);
1007     if(match_pairs){
1008       match_equals(state, previous);
1009       xbt_dynar_free(&previous);
1010     }
1011     return 0;
1012   }
1013
1014   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)){
1015     if(match_pairs){
1016       xbt_dynar_free(&previous);
1017     }
1018     return 1;
1019   }
1020
1021   addr_block1 = ((void*) (((ADDR2UINT(block1)) - 1) * BLOCKSIZE + (char*)state->heapbase1));
1022   addr_block2 = ((void*) (((ADDR2UINT(block2)) - 1) * BLOCKSIZE + (char*)state->heapbase2));
1023
1024   real_addr_block1 = ((void*) (((ADDR2UINT(block1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase));
1025   real_addr_block2 = ((void*) (((ADDR2UINT(block2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)state->s_heap)->heapbase));
1026
1027   if(type_id){
1028     type = xbt_dict_get_or_null(info->types, type_id);
1029     if(type->byte_size == 0){
1030       if(type->subtype == NULL){
1031         dw_type_t full_type = xbt_dict_get_or_null(info->types_by_name, type->name);
1032         if(full_type)
1033           type = full_type;
1034         else
1035           type = xbt_dict_get_or_null(other_info->types_by_name, type->name);
1036       }else{
1037         type = type->subtype;
1038       }
1039     }
1040     if((type->byte_size == DW_TAG_pointer_type) || ((type->type == DW_TAG_base_type) && type->name!=NULL && (!strcmp(type->name, "char"))))
1041       type_size = -1;
1042     else
1043       type_size = type->byte_size;
1044   }
1045   
1046   if((state->heapinfo1[block1].type == -1) && (state->heapinfo2[block2].type == -1)){  /* Free block */
1047
1048     if(match_pairs){
1049       match_equals(state, previous);
1050       xbt_dynar_free(&previous);
1051     }
1052     return 0;
1053
1054   }else if((state->heapinfo1[block1].type == 0) && (state->heapinfo2[block2].type == 0)){ /* Complete block */
1055     
1056     if(state->equals_to1[block1][0] != NULL && state->equals_to2[block2][0] != NULL){
1057       if(equal_blocks(state, block1, block2)){
1058         if(match_pairs){
1059           match_equals(state, previous);
1060           xbt_dynar_free(&previous);
1061         }
1062         return 0;
1063       }
1064     }
1065
1066     if(type_size != -1){
1067       if(type_size != state->heapinfo1[block1].busy_block.busy_size
1068         && type_size != state->heapinfo2[block2].busy_block.busy_size
1069         && type->name!=NULL && !strcmp(type->name, "s_smx_context")){
1070         if(match_pairs){
1071           match_equals(state, previous);
1072           xbt_dynar_free(&previous);
1073         }
1074         return -1;
1075       }
1076     }
1077
1078     if(state->heapinfo1[block1].busy_block.size != state->heapinfo2[block2].busy_block.size){
1079       if(match_pairs){
1080         xbt_dynar_free(&previous);
1081       }
1082       return 1;
1083     }
1084
1085     if(state->heapinfo1[block1].busy_block.busy_size != state->heapinfo2[block2].busy_block.busy_size){
1086       if(match_pairs){
1087         xbt_dynar_free(&previous);
1088       }
1089       return 1;
1090     }
1091
1092     if(!add_heap_area_pair(previous, block1, -1, block2, -1)){
1093       if(match_pairs){
1094         match_equals(state, previous);
1095         xbt_dynar_free(&previous);
1096       }
1097       return 0;
1098     }
1099  
1100     size = state->heapinfo1[block1].busy_block.busy_size;
1101     
1102     if(type_id != NULL){
1103       xbt_free(state->types1[block1][0]);
1104       xbt_free(state->types2[block2][0]);
1105       state->types1[block1][0] = strdup(type_id);
1106       state->types2[block2][0] = strdup(type_id);
1107     }
1108
1109     if(size <= 0){
1110       if(match_pairs){
1111         match_equals(state, previous);
1112         xbt_dynar_free(&previous);
1113       }
1114       return 0;
1115     }
1116
1117     frag1 = -1;
1118     frag2 = -1;
1119
1120     area1_to_compare = addr_block1;
1121     area2_to_compare = addr_block2;
1122
1123     if((state->heapinfo1[block1].busy_block.ignore > 0) && (state->heapinfo2[block2].busy_block.ignore == state->heapinfo1[block1].busy_block.ignore))
1124       check_ignore = state->heapinfo1[block1].busy_block.ignore;
1125       
1126   }else if((state->heapinfo1[block1].type > 0) && (state->heapinfo2[block2].type > 0)){ /* Fragmented block */
1127
1128     frag1 = ((uintptr_t) (ADDR2UINT (area1) % (BLOCKSIZE))) >> state->heapinfo1[block1].type;
1129     frag2 = ((uintptr_t) (ADDR2UINT (area2) % (BLOCKSIZE))) >> state->heapinfo2[block2].type;
1130
1131     addr_frag1 = (void*) ((char *)addr_block1 + (frag1 << state->heapinfo1[block1].type));
1132     addr_frag2 = (void*) ((char *)addr_block2 + (frag2 << state->heapinfo2[block2].type));
1133
1134     real_addr_frag1 = (void*) ((char *)real_addr_block1 + (frag1 << ((xbt_mheap_t)state->s_heap)->heapinfo[block1].type));
1135     real_addr_frag2 = (void*) ((char *)real_addr_block2 + (frag2 << ((xbt_mheap_t)state->s_heap)->heapinfo[block2].type));
1136
1137     if(type_size != -1){
1138       if(state->heapinfo1[block1].busy_frag.frag_size[frag1] == -1 || state->heapinfo2[block2].busy_frag.frag_size[frag2] == -1){
1139         if(match_pairs){
1140           match_equals(state, previous);
1141           xbt_dynar_free(&previous);
1142         }
1143         return -1;
1144       }
1145       if(type_size != state->heapinfo1[block1].busy_frag.frag_size[frag1]|| type_size !=  state->heapinfo2[block2].busy_frag.frag_size[frag2]){
1146         if(match_pairs){
1147           match_equals(state, previous);
1148           xbt_dynar_free(&previous);
1149         }
1150         return -1;
1151       }
1152     }
1153
1154     if(state->equals_to1[block1][frag1] != NULL && state->equals_to2[block2][frag2] != NULL){
1155       if(equal_fragments(state, block1, frag1, block2, frag2)){
1156         if(match_pairs){
1157           match_equals(state, previous);
1158           xbt_dynar_free(&previous);
1159         }
1160         return 0;
1161       }
1162     }
1163
1164     if(state->heapinfo1[block1].busy_frag.frag_size[frag1] != state->heapinfo2[block2].busy_frag.frag_size[frag2]){
1165       if(type_size == -1){
1166          if(match_pairs){
1167           match_equals(state, previous);
1168           xbt_dynar_free(&previous);
1169         }
1170         return -1;
1171       }else{
1172         if(match_pairs){
1173           xbt_dynar_free(&previous);
1174         }
1175         return 1;
1176       }
1177     }
1178       
1179     size = state->heapinfo1[block1].busy_frag.frag_size[frag1];
1180
1181     if(type_id != NULL){
1182       xbt_free(state->types1[block1][frag1]);
1183       xbt_free(state->types2[block2][frag2]);
1184       state->types1[block1][frag1] = strdup(type_id);
1185       state->types2[block2][frag2] = strdup(type_id);
1186     }
1187
1188     if(real_addr_frag1 != area1 || real_addr_frag2 != area2){
1189       offset1 = (char *)area1 - (char *)real_addr_frag1;
1190       offset2 = (char *)area2 - (char *)real_addr_frag2;
1191       if(state->types1[block1][frag1] != NULL && state->types2[block2][frag2] != NULL){
1192         new_type_id1 = get_offset_type(state->types1[block1][frag1], offset1, info, other_info, size, &switch_type);
1193         new_type_id2 = get_offset_type(state->types2[block2][frag2], offset1, info, other_info, size, &switch_type);
1194       }else if(state->types1[block1][frag1] != 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->types1[block1][frag1], offset2, info, other_info, size, &switch_type);
1197       }else if(state->types2[block2][frag2] != NULL){
1198         new_type_id1 = get_offset_type(state->types2[block2][frag2], offset1, info, other_info, size, &switch_type);
1199         new_type_id2 = get_offset_type(state->types2[block2][frag2], offset2, info, other_info, size, &switch_type);
1200       }else{
1201         if(match_pairs){
1202           match_equals(state, previous);
1203           xbt_dynar_free(&previous);
1204         }
1205         return -1;
1206       }   
1207
1208       if(new_type_id1 !=  NULL && new_type_id2 !=  NULL && !strcmp(new_type_id1, new_type_id2)){
1209         if(switch_type){
1210           type = xbt_dict_get_or_null(other_info->types, new_type_id1);
1211           while(type->byte_size == 0 && type->dw_type_id != NULL)
1212             type = xbt_dict_get_or_null(other_info->types, type->dw_type_id);
1213           new_size1 = type->byte_size;
1214           type = xbt_dict_get_or_null(other_info->types, new_type_id2);
1215           while(type->byte_size == 0 && type->dw_type_id != NULL)
1216             type = xbt_dict_get_or_null(other_info->types, type->dw_type_id);
1217           new_size2 = type->byte_size;
1218         }else{
1219           type = xbt_dict_get_or_null(info->types, new_type_id1);
1220           while(type->byte_size == 0 && type->dw_type_id != NULL)
1221             type = xbt_dict_get_or_null(info->types, type->dw_type_id);
1222           new_size1 = type->byte_size;
1223           type = xbt_dict_get_or_null(info->types, new_type_id2);
1224           while(type->byte_size == 0 && type->dw_type_id != NULL)
1225             type = xbt_dict_get_or_null(info->types, type->dw_type_id);
1226           new_size2 = type->byte_size;
1227         }
1228       }else{
1229         if(match_pairs){
1230           match_equals(state, previous);
1231           xbt_dynar_free(&previous);
1232         }
1233         return -1;
1234       }
1235     }
1236
1237     area1_to_compare = (char *)addr_frag1 + offset1;
1238     area2_to_compare = (char *)addr_frag2 + offset2;
1239     
1240     if(new_size1 > 0 && new_size1 == new_size2){
1241       type_id = new_type_id1;
1242       size = new_size1;
1243     }
1244
1245     if(offset1 == 0 && offset2 == 0){
1246       if(!add_heap_area_pair(previous, block1, frag1, block2, frag2)){
1247         if(match_pairs){
1248           match_equals(state, previous);
1249           xbt_dynar_free(&previous);
1250         }
1251         return 0;
1252       }
1253     }
1254
1255     if(size <= 0){
1256       if(match_pairs){
1257         match_equals(state, previous);
1258         xbt_dynar_free(&previous);
1259       }
1260       return 0;
1261     }
1262       
1263     if((state->heapinfo1[block1].busy_frag.ignore[frag1] > 0) && ( state->heapinfo2[block2].busy_frag.ignore[frag2] == state->heapinfo1[block1].busy_frag.ignore[frag1]))
1264       check_ignore = state->heapinfo1[block1].busy_frag.ignore[frag1];
1265     
1266   }else{
1267
1268     if(match_pairs){
1269       xbt_dynar_free(&previous);
1270     }
1271     return 1;
1272
1273   }
1274   
1275
1276   /* Start comparison*/
1277   if(type_id != NULL){
1278     if(switch_type)
1279       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);
1280     else
1281       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);
1282     if(res_compare == 1){
1283       if(match_pairs)
1284         xbt_dynar_free(&previous);
1285       return res_compare;
1286     }
1287   }else{
1288     if(switch_type)
1289       res_compare = compare_heap_area_without_type(state, area1, area2, area1_to_compare, area2_to_compare, previous, other_info, info, size, check_ignore);
1290     else
1291       res_compare = compare_heap_area_without_type(state, area1, area2, area1_to_compare, area2_to_compare, previous, info, other_info, size, check_ignore);
1292     if(res_compare == 1){
1293       if(match_pairs)
1294         xbt_dynar_free(&previous);
1295       return res_compare;
1296     }
1297   }
1298
1299   if(match_pairs){
1300     match_equals(state, previous);
1301     xbt_dynar_free(&previous);
1302   }
1303
1304   return 0;
1305 }
1306
1307 /*********************************************** Miscellaneous ***************************************************/
1308 /****************************************************************************************************************/
1309
1310 // Not used:
1311 static int get_pointed_area_size(void *area, int heap){
1312
1313   struct s_mm_diff *state = mm_diff_info;
1314
1315   int block, frag;
1316   malloc_info *heapinfo;
1317
1318   if(heap == 1)
1319     heapinfo = state->heapinfo1;
1320   else
1321     heapinfo = state->heapinfo2;
1322
1323   block = ((char*)area - (char*)((xbt_mheap_t)state->s_heap)->heapbase) / BLOCKSIZE + 1;
1324
1325   if(((char *)area < (char*)((xbt_mheap_t)state->s_heap)->heapbase)  || (block > state->heapsize1) || (block < 1))
1326     return -1;
1327
1328   if(heapinfo[block].type == -1){ /* Free block */
1329     return -1;  
1330   }else if(heapinfo[block].type == 0){ /* Complete block */
1331     return (int)heapinfo[block].busy_block.busy_size;
1332   }else{
1333     frag = ((uintptr_t) (ADDR2UINT (area) % (BLOCKSIZE))) >> heapinfo[block].type;
1334     return (int)heapinfo[block].busy_frag.frag_size[frag];
1335   }
1336
1337 }
1338
1339 // Not used:
1340 char *get_type_description(mc_object_info_t info, char *type_name){
1341
1342   xbt_dict_cursor_t dict_cursor;
1343   char *type_origin;
1344   dw_type_t type;
1345
1346   xbt_dict_foreach(info->types, dict_cursor, type_origin, type){
1347     if(type->name && (strcmp(type->name, type_name) == 0) && type->byte_size > 0){
1348       xbt_dict_cursor_free(&dict_cursor);
1349       return type_origin;
1350     }
1351   }
1352
1353   xbt_dict_cursor_free(&dict_cursor);
1354   return NULL;
1355 }
1356
1357
1358 #ifndef max
1359 #define max( a, b ) ( ((a) > (b)) ? (a) : (b) )
1360 #endif
1361
1362 // Not used:
1363 int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){
1364
1365   struct s_mm_diff *state = mm_diff_info;
1366
1367   if(heap1 == NULL && heap1 == NULL){
1368     XBT_DEBUG("Malloc descriptors null");
1369     return 0;
1370   }
1371
1372   if(heap1->heaplimit != heap2->heaplimit){
1373     XBT_DEBUG("Different limit of valid info table indices");
1374     return 1;
1375   }
1376
1377   /* Heap information */
1378   state->heaplimit = ((struct mdesc *)heap1)->heaplimit;
1379
1380   state->s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize();
1381
1382   state->heapbase1 = (char *)heap1 + BLOCKSIZE;
1383   state->heapbase2 = (char *)heap2 + BLOCKSIZE;
1384
1385   state->heapinfo1 = (malloc_info *)((char *)heap1 + ((uintptr_t)((char *)heap1->heapinfo - (char *)state->s_heap)));
1386   state->heapinfo2 = (malloc_info *)((char *)heap2 + ((uintptr_t)((char *)heap2->heapinfo - (char *)state->s_heap)));
1387
1388   state->heapsize1 = heap1->heapsize;
1389   state->heapsize2 = heap2->heapsize;
1390
1391   /* Start comparison */
1392   size_t i, j, k;
1393   void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
1394
1395   int distance = 0;
1396
1397   /* Check busy blocks*/
1398
1399   i = 1;
1400
1401   while(i <= state->heaplimit){
1402
1403     addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)state->heapbase1));
1404     addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)state->heapbase2));
1405
1406     if(state->heapinfo1[i].type != state->heapinfo2[i].type){
1407   
1408       distance += BLOCKSIZE;
1409       XBT_DEBUG("Different type of blocks (%zu) : %d - %d -> distance = %d", i, state->heapinfo1[i].type, state->heapinfo2[i].type, distance);
1410       i++;
1411     
1412     }else{
1413
1414       if(state->heapinfo1[i].type == -1){ /* Free block */
1415         i++;
1416         continue;
1417       }
1418
1419       if(state->heapinfo1[i].type == 0){ /* Large block */
1420        
1421         if(state->heapinfo1[i].busy_block.size != state->heapinfo2[i].busy_block.size){
1422           distance += BLOCKSIZE * max(state->heapinfo1[i].busy_block.size, state->heapinfo2[i].busy_block.size);
1423           i += max(state->heapinfo1[i].busy_block.size, state->heapinfo2[i].busy_block.size);
1424           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);
1425           continue;
1426         }
1427
1428         /*if(heapinfo1[i].busy_block.busy_size != heapinfo2[i].busy_block.busy_size){
1429           distance += max(heapinfo1[i].busy_block.busy_size, heapinfo2[i].busy_block.busy_size);
1430           i += max(heapinfo1[i].busy_block.size, heapinfo2[i].busy_block.size);
1431           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);
1432           continue;
1433           }*/
1434
1435         k = 0;
1436
1437         //while(k < (heapinfo1[i].busy_block.busy_size)){
1438         while(k < state->heapinfo1[i].busy_block.size * BLOCKSIZE){
1439           if(memcmp((char *)addr_block1 + k, (char *)addr_block2 + k, 1) != 0){
1440             distance ++;
1441           }
1442           k++;
1443         } 
1444
1445         i++;
1446
1447       }else { /* Fragmented block */
1448
1449         for(j=0; j < (size_t) (BLOCKSIZE >> state->heapinfo1[i].type); j++){
1450
1451           addr_frag1 = (void*) ((char *)addr_block1 + (j << state->heapinfo1[i].type));
1452           addr_frag2 = (void*) ((char *)addr_block2 + (j << state->heapinfo2[i].type));
1453
1454           if(state->heapinfo1[i].busy_frag.frag_size[j] == 0 && state->heapinfo2[i].busy_frag.frag_size[j] == 0){
1455             continue;
1456           }
1457           
1458           
1459           /*if(heapinfo1[i].busy_frag.frag_size[j] != heapinfo2[i].busy_frag.frag_size[j]){
1460             distance += max(heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j]);
1461             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); 
1462             continue;
1463             }*/
1464    
1465           k=0;
1466
1467           //while(k < max(heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j])){
1468           while(k < (BLOCKSIZE / (BLOCKSIZE >> state->heapinfo1[i].type))){
1469             if(memcmp((char *)addr_frag1 + k, (char *)addr_frag2 + k, 1) != 0){
1470               distance ++;
1471             }
1472             k++;
1473           }
1474
1475         }
1476
1477         i++;
1478
1479       }
1480       
1481     }
1482
1483   }
1484
1485   return distance;
1486   
1487 }
1488