var = (mc_data_bss_ignore_variable_t)xbt_dynar_get_as(mc_data_bss_comparison_ignore, cursor, mc_data_bss_ignore_variable_t);
if(var->address == address)
return var->size;
- if(var->address < address)
- start = cursor + 1;
+ if(var->address < address){
+ if((void *)((char *)var->address + var->size) > address)
+ return (char *)var->address + var->size - (char*)address;
+ else
+ start = cursor + 1;
+ }
if(var->address > address)
end = cursor - 1;
}
static int data_bss_program_region_compare(void *d1, void *d2, size_t size){
- size_t i = 0;
+ size_t i = 0, ignore_size = 0;
int pointer_align;
void *addr_pointed1 = NULL, *addr_pointed2 = NULL;
for(i=0; i<size; i++){
if(memcmp(((char *)d1) + i, ((char *)d2) + i, 1) != 0){
+ if((ignore_size = data_bss_ignore_size((char *)start_data_binary+i)) > 0){
+ i = i + ignore_size;
+ continue;
+ }else if((ignore_size = data_bss_ignore_size((char *)start_bss_binary+i)) > 0){
+ i = i + ignore_size;
+ continue;
+ }
pointer_align = (i / sizeof(void*)) * sizeof(void*);
addr_pointed1 = *((void **)((char *)d1 + pointer_align));
addr_pointed2 = *((void **)((char *)d2 + pointer_align));
int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2, mc_comparison_times_t ct1, mc_comparison_times_t ct2){
- raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+ int raw_mem = (mmalloc_get_current_heap() == raw_heap);
MC_SET_RAW_MEM;
-
+
int errors = 0, i = 0;
if(s1->num_reg != s2->num_reg){
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose)){
XBT_VERB("Different num_reg (s1 = %u, s2 = %u)", s1->num_reg, s2->num_reg);
}
+ if(!raw_mem)
+ MC_UNSET_RAW_MEM;
return 1;
}
xbt_dynar_push_as(ct2->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
xbt_os_timer_free(global_timer);
- if(!raw_mem_set)
+ if(!raw_mem)
MC_UNSET_RAW_MEM;
return 1;
xbt_dynar_push_as(ct2->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
xbt_os_timer_free(global_timer);
- if(!raw_mem_set)
+ if(!raw_mem)
MC_UNSET_RAW_MEM;
return 1;
xbt_dynar_push_as(ct2->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
xbt_os_timer_free(global_timer);
- if(!raw_mem_set)
+ if(!raw_mem)
MC_UNSET_RAW_MEM;
return 1;
}
xbt_dynar_push_as(ct2->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
xbt_os_timer_free(global_timer);
- if(!raw_mem_set)
+ if(!raw_mem)
MC_UNSET_RAW_MEM;
return 1;
}
xbt_dynar_push_as(ct2->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
xbt_os_timer_free(global_timer);
- if(!raw_mem_set)
+ if(!raw_mem)
MC_UNSET_RAW_MEM;
return 1;
}
xbt_dynar_push_as(ct2->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
xbt_os_timer_free(global_timer);
- if(!raw_mem_set)
+ if(!raw_mem)
MC_UNSET_RAW_MEM;
return 1;
}
xbt_os_timer_free(global_timer);
- if(!raw_mem_set)
+ if(!raw_mem)
MC_UNSET_RAW_MEM;
return errors > 0;
while(start <= end){
cursor = (start + end) / 2;
current_var = (mc_stack_ignore_variable_t)xbt_dynar_get_as(mc_stack_comparison_ignore, cursor, mc_stack_ignore_variable_t);
- if(strcmp(current_var->frame, frame) == 0){
+ if(strcmp(current_var->frame, frame) == 0 || strcmp(current_var->frame, "*") == 0){
if(strcmp(current_var->var_name, var_name) == 0)
return 1;
if(strcmp(current_var->var_name, var_name) < 0)
start = cursor + 1;
if(strcmp(current_var->var_name, var_name) > 0)
end = cursor - 1;
- }
- if(strcmp(current_var->frame, frame) < 0)
+ }else if(strcmp(current_var->frame, frame) < 0){
start = cursor + 1;
- if(strcmp(current_var->frame, frame) > 0)
+ }else if(strcmp(current_var->frame, frame) > 0){
end = cursor - 1;
+ }
}
return 0;