Logo AND Algorithmique Numérique Distribuée

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