return 0;
}
-static int compare_global_variables(int region_type, void *d1, void *d2){
+static int compare_global_variables(int region_type, void *d1, void *d2, xbt_dynar_t equals){
unsigned int cursor = 0;
size_t offset;
global_variable_t current_var;
int pointer_align;
void *addr_pointed1 = NULL, *addr_pointed2 = NULL;
+ int res_compare = 0;
if(region_type == 1){ /* libsimgrid */
xbt_dynar_foreach(mc_global_variables, cursor, current_var){
i = current_var->size;
continue;
}else{
- if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose)){
- XBT_VERB("Different global variable in libsimgrid : %s", current_var->name);
+ 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, equals);
+ if(res_compare == 1){
+ #ifdef MC_VERBOSE
+ XBT_VERB("Different global variable in libsimgrid : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
+ #endif
+ return 1;
+ }
+ }else{
+ #ifdef MC_VERBOSE
+ XBT_VERB("Different global variable in libsimgrid : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
+ #endif
+ return 1;
}
- return 1;
+
}
}
i++;
i = current_var->size;
continue;
}else{
- if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose)){
- XBT_VERB("Different global variable in binary : %s", current_var->name);
+ 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, equals);
+ if(res_compare == 1){
+ #ifdef MC_VERBOSE
+ XBT_VERB("Different global variable in binary : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
+ #endif
+ return 1;
+ }
+ }else{
+ #ifdef MC_VERBOSE
+ XBT_VERB("Different global variable in binary : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
+ #endif
+ return 1;
}
- return 1;
}
}
i++;
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);
+ return snapshot_compare(s1, s2);
}
-int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2, mc_comparison_times_t ct1, mc_comparison_times_t ct2){
-
- 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;
- }
-
- int heap_index = 0, data_libsimgrid_index = 0, data_program_index = 0;
-
- /* Get index of regions */
- while(i < s1->num_reg){
- switch(s1->regions[i]->type){
+int get_heap_region_index(mc_snapshot_t s){
+ int i = 0;
+ while(i < s->num_reg){
+ switch(s->regions[i]->type){
case 0:
- heap_index = i;
- i++;
+ return i;
break;
- case 1:
- data_libsimgrid_index = i;
+ default:
i++;
- while( i < s1->num_reg && s1->regions[i]->type == 1)
- i++;
- break;
- case 2:
- data_program_index = i;
- i++;
- while( i < s1->num_reg && s1->regions[i]->type == 2)
- i++;
break;
}
}
+ return -1;
+}
+
+int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
- if(ct1 != NULL)
- ct1->nb_comparisons++;
- if(ct2 != NULL)
- ct2->nb_comparisons++;
+ int raw_mem = (mmalloc_get_current_heap() == raw_heap);
+
+ MC_SET_RAW_MEM;
+
+ int errors = 0;
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))
+ #ifdef MC_DEBUG
xbt_os_timer_start(timer);
+ #endif
- /* 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)){
+ /* Compare number of processes */
+ if(s1->nb_processes != s2->nb_processes){
+ #ifdef MC_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);
+ mc_comp_times->nb_processes_comparison_time = xbt_os_timer_elapsed(timer);
+ XBT_DEBUG("Different number of processes : %d - %d", s1->nb_processes, s2->nb_processes);
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);
+ #else
+ #ifdef MC_VERBOSE
+ XBT_VERB("Different number of processes : %d - %d", s1->nb_processes, s2->nb_processes);
+ #endif
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));
+ mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
xbt_os_timer_free(global_timer);
if(!raw_mem)
MC_UNSET_RAW_MEM;
return 1;
- }
+ #endif
+ }
+
+ #ifdef MC_DEBUG
+ xbt_os_timer_start(timer);
+ #endif
+
+ /* Compare number of bytes used in each heap */
+ if(s1->heap_bytes_used != s2->heap_bytes_used){
+ #ifdef MC_DEBUG
+ xbt_os_timer_stop(timer);
+ mc_comp_times->bytes_used_comparison_time = xbt_os_timer_elapsed(timer);
+ XBT_DEBUG("Different number of bytes used in each heap : %zu - %zu", s1->heap_bytes_used, s2->heap_bytes_used);
+ errors++;
+ #else
+ #ifdef MC_VERBOSE
+ XBT_VERB("Different number of bytes used in each heap : %zu - %zu", s1->heap_bytes_used, s2->heap_bytes_used);
+ #endif
+
+ xbt_os_timer_free(timer);
+ xbt_os_timer_stop(global_timer);
+ mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
+ xbt_os_timer_free(global_timer);
+
+ if(!raw_mem)
+ MC_UNSET_RAW_MEM;
+
+ return 1;
+ #endif
}else{
- if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug))
+ #ifdef MC_DEBUG
xbt_os_timer_stop(timer);
+ #endif
}
- if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug))
+ #ifdef MC_DEBUG
xbt_os_timer_start(timer);
-
+ #endif
+
/* Compare size of stacks */
- unsigned int cursor = 0;
- void *addr_stack1, *addr_stack2;
- void *sp1, *sp2;
+ int i = 0;
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);
- sp1 = ((mc_snapshot_stack_t)xbt_dynar_get_as(s1->stacks, cursor, mc_snapshot_stack_t))->stack_pointer;
- sp2 = ((mc_snapshot_stack_t)xbt_dynar_get_as(s2->stacks, cursor, mc_snapshot_stack_t))->stack_pointer;
- size_used1 = ((stack_region_t)xbt_dynar_get_as(stacks_areas, cursor, stack_region_t))->size - ((char*)sp1 - (char*)addr_stack1);
- size_used2 = ((stack_region_t)xbt_dynar_get_as(stacks_areas, cursor, stack_region_t))->size - ((char*)sp2 - (char*)addr_stack2);
+ while(i < xbt_dynar_length(s1->stacks)){
+ size_used1 = s1->stack_sizes[i];
+ size_used2 = s2->stack_sizes[i];
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);
+ #ifdef MC_DEBUG
+ if(is_diff == 0){
+ xbt_os_timer_stop(timer);
+ mc_comp_times->stacks_sizes_comparison_time = xbt_os_timer_elapsed(timer);
+ }
+ XBT_DEBUG("Different size used in stacks : %zu - %zu", size_used1, size_used2);
+ errors++;
+ is_diff = 1;
+ #else
+ #ifdef MC_VERBOSE
+ XBT_VERB("Different size used in stacks : %zu - %zu", size_used1, size_used2);
+ #endif
- 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);
+ xbt_os_timer_free(timer);
+ xbt_os_timer_stop(global_timer);
+ mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
+ xbt_os_timer_free(global_timer);
- if(!raw_mem)
- MC_UNSET_RAW_MEM;
+ if(!raw_mem)
+ MC_UNSET_RAW_MEM;
- return 1;
- }
+ return 1;
+ #endif
}
- cursor++;
+ i++;
}
- if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ #ifdef MC_DEBUG
if(is_diff == 0)
xbt_os_timer_stop(timer);
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);
+
+ xbt_dynar_t equals = xbt_dynar_new(sizeof(heap_equality_t), heap_equality_free_voidp);
+
/* Compare binary global variables */
- is_diff = compare_global_variables(s1->regions[data_program_index]->type, s1->regions[data_program_index]->data, s2->regions[data_program_index]->data);
+ is_diff = compare_global_variables(s1->region_type[data_program_index], s1->regions[data_program_index]->data, s2->regions[data_program_index]->data, equals);
if(is_diff != 0){
- if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ #ifdef MC_DEBUG
xbt_os_timer_stop(timer);
- if(ct1 != NULL)
- xbt_dynar_push_as(ct1->binary_global_variables_comparison_times, double, xbt_os_timer_elapsed(timer));
- if(ct2 != NULL)
- xbt_dynar_push_as(ct2->binary_global_variables_comparison_times, double, xbt_os_timer_elapsed(timer));
+ mc_comp_times->binary_global_variables_comparison_time = xbt_os_timer_elapsed(timer);
XBT_DEBUG("Different global variables in binary");
errors++;
- }else{
- if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
+ #else
+ #ifdef MC_VERBOSE
XBT_VERB("Different global variables in binary");
+ #endif
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));
+ mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
xbt_os_timer_free(global_timer);
if(!raw_mem)
MC_UNSET_RAW_MEM;
+
return 1;
- }
+ #endif
}
- if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ #ifdef MC_VERBOSE
if(is_diff == 0)
xbt_os_timer_stop(timer);
xbt_os_timer_start(timer);
- }
+ #endif
/* Compare libsimgrid global variables */
- is_diff = compare_global_variables(s1->regions[data_libsimgrid_index]->type, s1->regions[data_libsimgrid_index]->data, s2->regions[data_libsimgrid_index]->data);
+ is_diff = compare_global_variables(s1->region_type[data_libsimgrid_index], s1->regions[data_libsimgrid_index]->data, s2->regions[data_libsimgrid_index]->data, equals);
if(is_diff != 0){
- if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ #ifdef MC_DEBUG
xbt_os_timer_stop(timer);
- if(ct1 != NULL)
- xbt_dynar_push_as(ct1->libsimgrid_global_variables_comparison_times, double, xbt_os_timer_elapsed(timer));
- if(ct2 != NULL)
- xbt_dynar_push_as(ct2->libsimgrid_global_variables_comparison_times, double, xbt_os_timer_elapsed(timer));
+ mc_comp_times->libsimgrid_global_variables_comparison_time = xbt_os_timer_elapsed(timer);
XBT_DEBUG("Different global variables in libsimgrid");
errors++;
- }else{
- if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
+ #else
+ #ifdef MC_VERBOSE
XBT_VERB("Different global variables in libsimgrid");
+ #endif
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));
+ mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
xbt_os_timer_free(global_timer);
if(!raw_mem)
MC_UNSET_RAW_MEM;
+
return 1;
- }
+ #endif
}
- if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+ #ifdef MC_DEBUG
if(is_diff == 0)
xbt_os_timer_stop(timer);
xbt_os_timer_start(timer);
- }
+ #endif
/* 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);
- xbt_dynar_t equals = xbt_dynar_new(sizeof(heap_equality_t), heap_equality_free_voidp);
-
- void *heap1 = s1->regions[heap_index]->data, *heap2 = s2->regions[heap_index]->data;
- if(mmalloc_compare_heap((xbt_mheap_t)s1->regions[heap_index]->data, (xbt_mheap_t)s2->regions[heap_index]->data, &stacks1, &stacks2, &equals)){
+ 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)){
+ #ifdef MC_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));
+ mc_comp_times->heap_comparison_time = xbt_os_timer_elapsed(timer);
XBT_DEBUG("Different heap (mmalloc_compare)");
errors++;
- }else{
+ #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))
+ #ifdef MC_VERBOSE
XBT_VERB("Different heap (mmalloc_compare)");
+ #endif
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));
+ mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
xbt_os_timer_free(global_timer);
if(!raw_mem)
MC_UNSET_RAW_MEM;
+
return 1;
- }
+ #endif
}else{
- if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug))
+ #ifdef MC_DEBUG
xbt_os_timer_stop(timer);
+ #endif
}
- if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug))
+ #ifdef MC_DEBUG
xbt_os_timer_start(timer);
+ #endif
/* Stacks comparison */
- cursor = 0;
- stack_region_t stack_region1, stack_region2;
- int diff = 0, diff_local = 0;
+ unsigned int cursor = 0;
+ int 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));
- stack_region2 = (stack_region_t)(xbt_dynar_get_as(stacks2, cursor, stack_region_t));
- sp1 = ((mc_snapshot_stack_t)xbt_dynar_get_as(s1->stacks, cursor, mc_snapshot_stack_t))->stack_pointer;
- sp2 = ((mc_snapshot_stack_t)xbt_dynar_get_as(s2->stacks, cursor, mc_snapshot_stack_t))->stack_pointer;
- diff = compare_stack(stack_region1, stack_region2, sp1, sp2, heap1, heap2, equals);
-
- if(diff > 0){ /* Differences may be due to padding */
- 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);
- xbt_dynar_free(&equals);
-
- 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);
- 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;
+ 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){
+ #ifdef MC_DEBUG
+ if(is_diff == 0){
+ xbt_os_timer_stop(timer);
+ mc_comp_times->stacks_comparison_time = 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);
+ xbt_dynar_free(&equals);
+
+ #ifdef MC_VERBOSE
+ XBT_VERB("Different local variables between stacks %d", cursor + 1);
+ #endif
+
+ xbt_os_timer_free(timer);
+ xbt_os_timer_stop(global_timer);
+ mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
+ xbt_os_timer_free(global_timer);
+
+ if(!raw_mem)
+ MC_UNSET_RAW_MEM;
+
+ return 1;
+ #endif
}
cursor++;
}
xbt_dynar_free(&stacks1);
xbt_dynar_free(&stacks2);
xbt_dynar_free(&equals);
+
+ xbt_os_timer_free(timer);
- 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)){
+ #ifdef MC_VERBOSE
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));
- }
+ mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
+ #endif
+
xbt_os_timer_free(global_timer);
+ #ifdef MC_DEBUG
+ print_comparison_times();
+ #endif
+
if(!raw_mem)
MC_UNSET_RAW_MEM;
s_tokens2 = xbt_str_split(xbt_dynar_get_as(tokens2, cursor, char *), "=");
if(xbt_dynar_length(s_tokens1) > 1 && xbt_dynar_length(s_tokens2) > 1){
if((strcmp(xbt_dynar_get_as(s_tokens1, 0, char *), "ip") == 0) && (strcmp(xbt_dynar_get_as(s_tokens2, 0, char *), "ip") == 0)){
+ xbt_free(ip1);
+ xbt_free(ip2);
ip1 = strdup(xbt_dynar_get_as(s_tokens1, 1, char *));
ip2 = strdup(xbt_dynar_get_as(s_tokens2, 1, char *));
- /*if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
- XBT_VERB("Instruction pointer : %s, Instruction pointer : %s", ip1, ip2);*/
}
if(strcmp(xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *)) != 0){
/* Ignore this variable ? */
addr2 = (void *) strtoul(xbt_dynar_get_as(s_tokens2, 1, char *), NULL, 16);
if(is_heap_equality(heap_equals, addr1, addr2) == 0){
if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
- XBT_VERB("Variable %s is different between stacks : %s - %s", xbt_dynar_get_as(s_tokens1, 0, char *), xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *));
+ XBT_VERB("Variable %s is different between stacks in %s : %s - %s", xbt_dynar_get_as(s_tokens1, 0, char *), ip1, xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *));
xbt_dynar_free(&s_tokens1);
xbt_dynar_free(&s_tokens2);
+ xbt_dynar_free(&tokens1);
+ xbt_dynar_free(&tokens2);
+ xbt_free(ip1);
+ xbt_free(ip2);
return 1;
}
}
}
xbt_dynar_free(&s_tokens1);
xbt_dynar_free(&s_tokens2);
+
cursor++;
}
+ xbt_free(ip1);
+ xbt_free(ip2);
xbt_dynar_free(&tokens1);
xbt_dynar_free(&tokens2);
return 0;
}
int MC_compare_snapshots(void *s1, void *s2){
+
+ MC_ignore_stack("self", "simcall_BODY_mc_snapshot");
return simcall_mc_compare_snapshots(s1, s2);
}
+
+void print_comparison_times(){
+ XBT_DEBUG("*** Comparison times ***");
+ XBT_DEBUG("- Nb processes : %f", mc_comp_times->nb_processes_comparison_time);
+ XBT_DEBUG("- Nb bytes used : %f", mc_comp_times->bytes_used_comparison_time);
+ XBT_DEBUG("- Stacks sizes : %f", mc_comp_times->stacks_sizes_comparison_time);
+ XBT_DEBUG("- Binary global variables : %f", mc_comp_times->binary_global_variables_comparison_time);
+ XBT_DEBUG("- Libsimgrid global variables : %f", mc_comp_times->libsimgrid_global_variables_comparison_time);
+ XBT_DEBUG("- Heap : %f", mc_comp_times->heap_comparison_time);
+ XBT_DEBUG("- Stacks : %f", mc_comp_times->stacks_comparison_time);
+}
