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;
+
+ 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)
+ 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;
int pointer_align;
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 = heap_ignore_size((char *)start_bss_libsimgrid+i)) > 0){
+ }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("Different byte (offset=%zu) (%p - %p) in libsimgrid region", i, (char *)d1 + i, (char *)d2 + i);
XBT_VERB("Addresses pointed : %p - %p\n", addr_pointed1, addr_pointed2);
}
return 1;
case 2:
data_program_index = i;
i++;
+ while( i < s1->num_reg && s1->regions[i]->type == 2)
+ i++;
break;
}
}
+ 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);
}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);
+
+ xbt_os_timer_free(timer);
+ xbt_os_timer_stop(global_timer);
+ xbt_dynar_push_as(initial_state_liveness->snapshot_comparison_times, double, xbt_os_timer_elapsed(timer));
+ xbt_os_timer_free(global_timer);
+
if(!raw_mem_set)
MC_UNSET_RAW_MEM;
+
return 1;
}
}
+ if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ xbt_os_timer_stop(timer);
+ xbt_dynar_push_as(initial_state_liveness->chunks_used_comparison_times, double, xbt_os_timer_elapsed(timer));
+
+ XBT_DEBUG("Chunks used comparison : %f", xbt_os_timer_elapsed(timer));
+
+ xbt_os_timer_start(timer);
+ }
+
/* Compare size of stacks */
unsigned int cursor = 0;
void *addr_stack1, *addr_stack2;
}else{
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
XBT_VERB("Different size used in stacks : %zu - %zu", size_used1, size_used2);
+
+ xbt_os_timer_free(timer);
+ xbt_os_timer_stop(global_timer);
+ xbt_dynar_push_as(initial_state_liveness->snapshot_comparison_times, double, xbt_os_timer_elapsed(timer));
+ xbt_os_timer_free(global_timer);
+
if(!raw_mem_set)
MC_UNSET_RAW_MEM;
return 1;
cursor++;
}
+ if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ xbt_os_timer_stop(timer);
+ xbt_dynar_push_as(initial_state_liveness->stacks_sizes_comparison_times, double, xbt_os_timer_elapsed(timer));
+
+ XBT_DEBUG("Stacks sizes comparison : %f", xbt_os_timer_elapsed(timer));
+
+ xbt_os_timer_start(timer);
+ }
+
/* Compare program data segment(s) */
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)){
XBT_DEBUG("Different memcmp for data in program");
errors++;
}else{
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
- XBT_VERB("Different memcmp for data in program");
+ XBT_VERB("Different memcmp for data in program");
+
+ xbt_os_timer_free(timer);
+ xbt_os_timer_stop(global_timer);
+ xbt_dynar_push_as(initial_state_liveness->snapshot_comparison_times, double, xbt_os_timer_elapsed(timer));
+ xbt_os_timer_free(global_timer);
+
if(!raw_mem_set)
MC_UNSET_RAW_MEM;
return 1;
i++;
}
+ if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ xbt_os_timer_stop(timer);
+ xbt_dynar_push_as(initial_state_liveness->program_data_segment_comparison_times, double, xbt_os_timer_elapsed(timer));
+
+ XBT_DEBUG("Program data segment comparison : %f", xbt_os_timer_elapsed(timer));
+
+ xbt_os_timer_start(timer);
+ }
+
/* Compare libsimgrid data segment(s) */
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)){
XBT_DEBUG("Different memcmp for data in libsimgrid");
errors++;
}else{
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
XBT_VERB("Different memcmp for data in libsimgrid");
+
+ xbt_os_timer_free(timer);
+ xbt_os_timer_stop(global_timer);
+ xbt_dynar_push_as(initial_state_liveness->snapshot_comparison_times, double, xbt_os_timer_elapsed(timer));
+ xbt_os_timer_free(global_timer);
+
if(!raw_mem_set)
MC_UNSET_RAW_MEM;
return 1;
i++;
}
+ if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ xbt_os_timer_stop(timer);
+ xbt_dynar_push_as(initial_state_liveness->libsimgrid_data_segment_comparison_times, double, xbt_os_timer_elapsed(timer));
+
+ XBT_DEBUG("Libsimgrid data segment comparison : %f", xbt_os_timer_elapsed(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);
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)");
+
+ xbt_os_timer_stop(global_timer);
+ xbt_dynar_push_as(initial_state_liveness->snapshot_comparison_times, double, xbt_os_timer_elapsed(timer));
+ xbt_os_timer_free(global_timer);
+
if(!raw_mem_set)
MC_UNSET_RAW_MEM;
return 1;
}
}
+ if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ xbt_os_timer_stop(timer);
+ xbt_dynar_push_as(initial_state_liveness->heap_comparison_times, double, xbt_os_timer_elapsed(timer));
+
+ XBT_DEBUG("Heap comparison : %f", xbt_os_timer_elapsed(timer));
+
+ xbt_os_timer_start(timer);
+ }
+
/* Stacks comparison */
cursor = 0;
stack_region_t stack_region1, stack_region2;
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
XBT_VERB("Different local variables between stacks %d", cursor + 1);
+ xbt_os_timer_free(timer);
+ xbt_os_timer_stop(global_timer);
+ xbt_dynar_push_as(initial_state_liveness->snapshot_comparison_times, double, xbt_os_timer_elapsed(timer));
+ xbt_os_timer_free(global_timer);
+
if(!raw_mem_set)
MC_UNSET_RAW_MEM;
xbt_dynar_free(&stacks1);
xbt_dynar_free(&stacks2);
xbt_dynar_free(&equals);
+
+ if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ xbt_os_timer_stop(timer);
+ xbt_dynar_push_as(initial_state_liveness->stacks_comparison_times, double, xbt_os_timer_elapsed(timer));
+
+ XBT_DEBUG("Stacks comparison : %f", xbt_os_timer_elapsed(timer));
+
+ xbt_os_timer_free(timer);
+ }
+
+ xbt_os_timer_stop(global_timer);
+ xbt_dynar_push_as(initial_state_liveness->snapshot_comparison_times, double, xbt_os_timer_elapsed(timer));
+ xbt_os_timer_free(global_timer);
+
if(!raw_mem_set)
MC_UNSET_RAW_MEM;