XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, mc,
"Logging specific to mc_compare");
-static int data_program_region_compare(void *d1, void *d2, size_t size);
-static int data_libsimgrid_region_compare(void *d1, void *d2, size_t size);
+static int data_bss_program_region_compare(void *d1, void *d2, size_t size);
+static int data_bss_libsimgrid_region_compare(void *d1, void *d2, size_t size);
static int heap_region_compare(void *d1, void *d2, size_t size);
static int compare_stack(stack_region_t s1, stack_region_t s2, void *sp1, void *sp2, void *heap1, void *heap2, xbt_dynar_t equals);
static int is_heap_equality(xbt_dynar_t equals, void *a1, void *a2);
static size_t heap_ignore_size(void *address);
+static size_t data_bss_ignore_size(void *address);
static void stack_region_free(stack_region_t s);
static void heap_equality_free(heap_equality_t e);
return 0;
}
-static int data_program_region_compare(void *d1, void *d2, size_t size){
+static size_t data_bss_ignore_size(void *address){
+ unsigned int cursor = 0;
+ int start = 0;
+ int end = xbt_dynar_length(mc_data_bss_comparison_ignore) - 1;
+ mc_data_bss_ignore_variable_t var;
- size_t i = 0;
+ while(start <= end){
+ cursor = (start + end) / 2;
+ 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){
+ 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;
+ }
+
+ return 0;
+}
+
+static int data_bss_program_region_compare(void *d1, void *d2, size_t size){
+
+ 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));
}else{
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose)){
XBT_VERB("Different byte (offset=%zu) (%p - %p) in data program region", i, (char *)d1 + i, (char *)d2 + i);
- XBT_VERB("Addresses pointed : %p - %p\n", addr_pointed1, addr_pointed2);
+ XBT_VERB("Addresses pointed : %p - %p", addr_pointed1, addr_pointed2);
}
return 1;
}
return 0;
}
-static int data_libsimgrid_region_compare(void *d1, void *d2, size_t size){
+static int data_bss_libsimgrid_region_compare(void *d1, void *d2, size_t size){
size_t i = 0, ignore_size = 0;
int pointer_align;
for(i=0; i<size; i++){
if(memcmp(((char *)d1) + i, ((char *)d2) + i, 1) != 0){
- if((ignore_size = heap_ignore_size((char *)start_data_libsimgrid+i)) > 0){
+ if((ignore_size = data_bss_ignore_size((char *)start_data_libsimgrid+i)) > 0){
+ i = i + ignore_size;
+ continue;
+ }else if((ignore_size = data_bss_ignore_size((char *)start_bss_libsimgrid+i)) > 0){
i = i + ignore_size;
continue;
}
continue;
}else{
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose)){
- XBT_VERB("Different byte (offset=%zu) (%p - %p) in data libsimgrid region", i, (char *)d1 + i, (char *)d2 + i);
- XBT_VERB("Addresses pointed : %p - %p\n", addr_pointed1, addr_pointed2);
+ XBT_VERB("Different byte (offset=%zu) (%p - %p) in libsimgrid region", i, (char *)d1 + i, (char *)d2 + i);
+ XBT_VERB("Addresses pointed : %p - %p", addr_pointed1, addr_pointed2);
}
return 1;
}
heap_equality_free((heap_equality_t) * (void **) e);
}
-int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
+int SIMIX_pre_mc_compare_snapshots(smx_simcall_t simcall,
+ mc_snapshot_t s1, mc_snapshot_t s2){
+ return snapshot_compare(s1, s2, NULL, NULL);
+}
+
+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;
}
case 2:
data_program_index = i;
i++;
+ while( i < s1->num_reg && s1->regions[i]->type == 2)
+ i++;
break;
}
}
- /* Compare number of blocks/fragments uses in each heap */
+ if(ct1 != NULL)
+ ct1->nb_comparisons++;
+ if(ct2 != NULL)
+ ct2->nb_comparisons++;
+
+ xbt_os_timer_t global_timer = xbt_os_timer_new();
+ xbt_os_timer_t timer = xbt_os_timer_new();
+
+ xbt_os_timer_start(global_timer);
+
+ if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug))
+ xbt_os_timer_start(timer);
+
+ /* Compare number of blocks/fragments used in each heap */
size_t chunks_used1 = mmalloc_get_chunks_used((xbt_mheap_t)s1->regions[heap_index]->data);
size_t chunks_used2 = mmalloc_get_chunks_used((xbt_mheap_t)s2->regions[heap_index]->data);
if(chunks_used1 != chunks_used2){
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ xbt_os_timer_stop(timer);
+ if(ct1 != NULL)
+ xbt_dynar_push_as(ct1->chunks_used_comparison_times, double, xbt_os_timer_elapsed(timer));
+ if(ct2 != NULL)
+ xbt_dynar_push_as(ct2->chunks_used_comparison_times, double, xbt_os_timer_elapsed(timer));
XBT_DEBUG("Different number of chunks used in each heap : %zu - %zu", chunks_used1, chunks_used2);
errors++;
}else{
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
XBT_VERB("Different number of chunks used in each heap : %zu - %zu", chunks_used1, chunks_used2);
- if(!raw_mem_set)
+
+ xbt_os_timer_free(timer);
+ xbt_os_timer_stop(global_timer);
+ if(ct1 != NULL)
+ xbt_dynar_push_as(ct1->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
+ if(ct2 != NULL)
+ xbt_dynar_push_as(ct2->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
+ xbt_os_timer_free(global_timer);
+
+ if(!raw_mem)
MC_UNSET_RAW_MEM;
+
return 1;
}
+ }else{
+ if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug))
+ xbt_os_timer_stop(timer);
}
+
+ if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug))
+ xbt_os_timer_start(timer);
/* Compare size of stacks */
unsigned int cursor = 0;
void *addr_stack1, *addr_stack2;
void *sp1, *sp2;
size_t size_used1, size_used2;
+ int is_diff = 0;
while(cursor < xbt_dynar_length(stacks_areas)){
addr_stack1 = (char *)s1->regions[heap_index]->data + ((char *)((stack_region_t)xbt_dynar_get_as(stacks_areas, cursor, stack_region_t))->address - (char *)std_heap);
addr_stack2 = (char *)s2->regions[heap_index]->data + ((char *)((stack_region_t)xbt_dynar_get_as(stacks_areas, cursor, stack_region_t))->address - (char *)std_heap);
size_used2 = ((stack_region_t)xbt_dynar_get_as(stacks_areas, cursor, stack_region_t))->size - ((char*)sp2 - (char*)addr_stack2);
if(size_used1 != size_used2){
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ if(is_diff == 0){
+ xbt_os_timer_stop(timer);
+ if(ct1 != NULL)
+ xbt_dynar_push_as(ct1->stacks_sizes_comparison_times, double, xbt_os_timer_elapsed(timer));
+ if(ct2 != NULL)
+ xbt_dynar_push_as(ct2->stacks_sizes_comparison_times, double, xbt_os_timer_elapsed(timer));
+ }
XBT_DEBUG("Different size used in stacks : %zu - %zu", size_used1, size_used2);
errors++;
+ is_diff = 1;
}else{
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
XBT_VERB("Different size used in stacks : %zu - %zu", size_used1, size_used2);
- if(!raw_mem_set)
+
+ xbt_os_timer_free(timer);
+ xbt_os_timer_stop(global_timer);
+ if(ct1 != NULL)
+ xbt_dynar_push_as(ct1->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
+ if(ct2 != NULL)
+ xbt_dynar_push_as(ct2->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
+ xbt_os_timer_free(global_timer);
+
+ if(!raw_mem)
MC_UNSET_RAW_MEM;
+
return 1;
}
}
cursor++;
}
+ if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ if(is_diff == 0)
+ xbt_os_timer_stop(timer);
+ xbt_os_timer_start(timer);
+ }
+
/* Compare program data segment(s) */
+ is_diff = 0;
i = data_program_index;
while(i < s1->num_reg && s1->regions[i]->type == 2){
- if(data_program_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+ if(data_bss_program_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ if(is_diff == 0){
+ xbt_os_timer_stop(timer);
+ if(ct1 != NULL)
+ xbt_dynar_push_as(ct1->program_data_segment_comparison_times, double, xbt_os_timer_elapsed(timer));
+ if(ct2 != NULL)
+ xbt_dynar_push_as(ct2->program_data_segment_comparison_times, double, xbt_os_timer_elapsed(timer));
+ }
XBT_DEBUG("Different memcmp for data in program");
errors++;
+ is_diff = 1;
}else{
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
- XBT_VERB("Different memcmp for data in program");
- if(!raw_mem_set)
+ XBT_VERB("Different memcmp for data in program");
+
+ xbt_os_timer_free(timer);
+ xbt_os_timer_stop(global_timer);
+ if(ct1 != NULL)
+ xbt_dynar_push_as(ct1->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
+ if(ct2 != NULL)
+ xbt_dynar_push_as(ct2->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
+ xbt_os_timer_free(global_timer);
+
+ if(!raw_mem)
MC_UNSET_RAW_MEM;
return 1;
}
i++;
}
+ if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ if(is_diff == 0)
+ xbt_os_timer_stop(timer);
+ xbt_os_timer_start(timer);
+ }
+
/* Compare libsimgrid data segment(s) */
+ is_diff = 0;
i = data_libsimgrid_index;
while(i < s1->num_reg && s1->regions[i]->type == 1){
- if(data_libsimgrid_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+ if(data_bss_libsimgrid_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ if(is_diff == 0){
+ xbt_os_timer_stop(timer);
+ if(ct1 != NULL)
+ xbt_dynar_push_as(ct1->libsimgrid_data_segment_comparison_times, double, xbt_os_timer_elapsed(timer));
+ if(ct2 != NULL)
+ xbt_dynar_push_as(ct2->libsimgrid_data_segment_comparison_times, double, xbt_os_timer_elapsed(timer));
+ }
XBT_DEBUG("Different memcmp for data in libsimgrid");
errors++;
+ is_diff = 1;
}else{
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
XBT_VERB("Different memcmp for data in libsimgrid");
- if(!raw_mem_set)
+
+ xbt_os_timer_free(timer);
+ xbt_os_timer_stop(global_timer);
+ if(ct1 != NULL)
+ xbt_dynar_push_as(ct1->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
+ if(ct2 != NULL)
+ xbt_dynar_push_as(ct2->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
+ xbt_os_timer_free(global_timer);
+
+ if(!raw_mem)
MC_UNSET_RAW_MEM;
return 1;
}
i++;
}
+ if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ if(is_diff == 0)
+ xbt_os_timer_stop(timer);
+ xbt_os_timer_start(timer);
+ }
+
/* Compare heap */
xbt_dynar_t stacks1 = xbt_dynar_new(sizeof(stack_region_t), stack_region_free_voidp);
xbt_dynar_t stacks2 = xbt_dynar_new(sizeof(stack_region_t), stack_region_free_voidp);
if(mmalloc_compare_heap((xbt_mheap_t)s1->regions[heap_index]->data, (xbt_mheap_t)s2->regions[heap_index]->data, &stacks1, &stacks2, &equals)){
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ xbt_os_timer_stop(timer);
+ if(ct1 != NULL)
+ xbt_dynar_push_as(ct1->heap_comparison_times, double, xbt_os_timer_elapsed(timer));
+ if(ct2 != NULL)
+ xbt_dynar_push_as(ct2->heap_comparison_times, double, xbt_os_timer_elapsed(timer));
XBT_DEBUG("Different heap (mmalloc_compare)");
errors++;
}else{
+ xbt_os_timer_free(timer);
xbt_dynar_free(&stacks1);
xbt_dynar_free(&stacks2);
xbt_dynar_free(&equals);
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
XBT_VERB("Different heap (mmalloc_compare)");
- if(!raw_mem_set)
+
+ xbt_os_timer_stop(global_timer);
+ if(ct1 != NULL)
+ xbt_dynar_push_as(ct1->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
+ if(ct2 != NULL)
+ xbt_dynar_push_as(ct2->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
+ xbt_os_timer_free(global_timer);
+
+ if(!raw_mem)
MC_UNSET_RAW_MEM;
return 1;
}
+ }else{
+ if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug))
+ xbt_os_timer_stop(timer);
}
+ if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug))
+ xbt_os_timer_start(timer);
+
/* Stacks comparison */
cursor = 0;
stack_region_t stack_region1, stack_region2;
int diff = 0, diff_local = 0;
+ is_diff = 0;
while(cursor < xbt_dynar_length(stacks1)){
stack_region1 = (stack_region_t)(xbt_dynar_get_as(stacks1, cursor, stack_region_t));
diff_local = compare_local_variables(((mc_snapshot_stack_t)xbt_dynar_get_as(s1->stacks, cursor, mc_snapshot_stack_t))->local_variables->data, ((mc_snapshot_stack_t)xbt_dynar_get_as(s2->stacks, cursor, mc_snapshot_stack_t))->local_variables->data, equals);
if(diff_local > 0){
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ if(is_diff == 0){
+ xbt_os_timer_stop(timer);
+ if(ct1 != NULL)
+ xbt_dynar_push_as(ct1->stacks_comparison_times, double, xbt_os_timer_elapsed(timer));
+ if(ct2 != NULL)
+ xbt_dynar_push_as(ct2->stacks_comparison_times, double, xbt_os_timer_elapsed(timer));
+ }
XBT_DEBUG("Different local variables between stacks %d", cursor + 1);
errors++;
+ is_diff = 1;
}else{
xbt_dynar_free(&stacks1);
xbt_dynar_free(&stacks2);
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
XBT_VERB("Different local variables between stacks %d", cursor + 1);
- if(!raw_mem_set)
+ xbt_os_timer_free(timer);
+ xbt_os_timer_stop(global_timer);
+ if(ct1 != NULL)
+ xbt_dynar_push_as(ct1->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
+ if(ct2 != NULL)
+ xbt_dynar_push_as(ct2->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
+ xbt_os_timer_free(global_timer);
+
+ if(!raw_mem)
MC_UNSET_RAW_MEM;
return 1;
xbt_dynar_free(&stacks1);
xbt_dynar_free(&stacks2);
xbt_dynar_free(&equals);
- if(!raw_mem_set)
+
+ if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug))
+ xbt_os_timer_free(timer);
+
+ if(!XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ xbt_os_timer_stop(global_timer);
+ if(ct1 != NULL)
+ xbt_dynar_push_as(ct1->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
+ if(ct2 != NULL)
+ xbt_dynar_push_as(ct2->snapshot_comparison_times, double, xbt_os_timer_elapsed(global_timer));
+ }
+ xbt_os_timer_free(global_timer);
+
+ 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;
