pointer_align = (i / sizeof(void*)) * sizeof(void*);
addr_pointed1 = *((void **)((char *)d1 + offset + pointer_align));
addr_pointed2 = *((void **)((char *)d2 + offset + pointer_align));
- if((addr_pointed1 > start_plt_libsimgrid && addr_pointed1 < end_plt_libsimgrid) || (addr_pointed2 > start_plt_libsimgrid && addr_pointed2 < end_plt_libsimgrid)){
+ if((addr_pointed1 > start_plt_libsimgrid && addr_pointed1 < end_plt_libsimgrid)
+ || (addr_pointed2 > start_plt_libsimgrid && addr_pointed2 < end_plt_libsimgrid)){
i = current_var->size;
continue;
}else{
- if((addr_pointed1 > std_heap) && ((char *)addr_pointed1 < (char *)std_heap + STD_HEAP_SIZE) && (addr_pointed2 > std_heap) && ((char *)addr_pointed2 < (char *)std_heap + STD_HEAP_SIZE)){
+ if((addr_pointed1 > std_heap) && ((char *)addr_pointed1 < (char *)std_heap + STD_HEAP_SIZE)
+ && (addr_pointed2 > std_heap) && ((char *)addr_pointed2 < (char *)std_heap + STD_HEAP_SIZE)){
res_compare = compare_area(addr_pointed1, addr_pointed2, NULL);
if(res_compare == 1){
#ifdef MC_VERBOSE
return snapshot_compare(s1, s2);
}
-int get_heap_region_index(mc_snapshot_t s){
- int i = 0;
- while(i < s->num_reg){
- switch(s->regions[i]->type){
- case 0:
- return i;
- break;
- default:
- i++;
- break;
- }
- }
- return -1;
-}
-
int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
int raw_mem = (mmalloc_get_current_heap() == raw_heap);
xbt_os_timer_start(timer);
#endif
- int heap_index = 0, data_libsimgrid_index = 0, data_program_index = 0;
- i = 0;
-
- /* Get index of regions */
- while(i < s1->num_reg){
- switch(s1->region_type[i]){
- case 0:
- heap_index = i;
- i++;
- break;
- case 1:
- data_libsimgrid_index = i;
- i++;
- while( i < s1->num_reg && s1->region_type[i] == 1)
- i++;
- break;
- case 2:
- data_program_index = i;
- i++;
- while( i < s1->num_reg && s1->region_type[i] == 2)
- i++;
- break;
- }
- }
-
/* Init heap information used in heap comparison algorithm */
- init_heap_information((xbt_mheap_t)s1->regions[heap_index]->data, (xbt_mheap_t)s2->regions[heap_index]->data, s1->to_ignore, s2->to_ignore);
+ init_heap_information((xbt_mheap_t)s1->regions[0]->data, (xbt_mheap_t)s2->regions[0]->data, s1->to_ignore, s2->to_ignore);
/* Compare binary global variables */
- is_diff = compare_global_variables(s1->region_type[data_program_index], s1->regions[data_program_index]->data, s2->regions[data_program_index]->data);
+ is_diff = compare_global_variables(2, s1->regions[2]->data, s2->regions[2]->data);
if(is_diff != 0){
#ifdef MC_DEBUG
xbt_os_timer_stop(timer);
XBT_VERB("Different global variables in binary");
#endif
+ reset_heap_information();
xbt_os_timer_free(timer);
xbt_os_timer_stop(global_timer);
mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
#endif
/* Compare libsimgrid global variables */
- is_diff = compare_global_variables(s1->region_type[data_libsimgrid_index], s1->regions[data_libsimgrid_index]->data, s2->regions[data_libsimgrid_index]->data);
+ is_diff = compare_global_variables(1, s1->regions[1]->data, s2->regions[1]->data);
if(is_diff != 0){
#ifdef MC_DEBUG
xbt_os_timer_stop(timer);
#ifdef MC_VERBOSE
XBT_VERB("Different global variables in libsimgrid");
#endif
-
+
+ reset_heap_information();
xbt_os_timer_free(timer);
xbt_os_timer_stop(global_timer);
mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
/* Compare heap */
- if(mmalloc_compare_heap((xbt_mheap_t)s1->regions[heap_index]->data, (xbt_mheap_t)s2->regions[heap_index]->data)){
+ if(mmalloc_compare_heap((xbt_mheap_t)s1->regions[0]->data, (xbt_mheap_t)s2->regions[0]->data)){
#ifdef MC_DEBUG
xbt_os_timer_stop(timer);