X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/28700bafbbef119ee34d7632ed7c61749995dc78..465332a64bce200ef12c8c3ae6b53bec57767415:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index d935b75496..244e01de20 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -31,7 +31,6 @@ int _sg_mc_timeout=0; int _sg_mc_max_depth=1000; int _sg_mc_visited=0; - extern int _sg_init_status; void _mc_cfg_cb_reduce(const char *name, int pos) { if (_sg_init_status && !_sg_do_model_check) { @@ -87,6 +86,8 @@ void _mc_cfg_cb_visited(const char *name, int pos) { mc_state_t mc_current_state = NULL; char mc_replay_mode = FALSE; double *mc_time = NULL; +mc_comparison_times_t mc_comp_times = NULL; +double mc_snapshot_comparison_time; /* Safety */ @@ -123,6 +124,11 @@ static size_t data_bss_ignore_size(void *address); static void MC_get_global_variables(char *elf_file); void MC_do_the_modelcheck_for_real() { + + MC_SET_RAW_MEM; + mc_comp_times = xbt_new0(s_mc_comparison_times_t, 1); + MC_UNSET_RAW_MEM; + if (!_sg_mc_property_file || _sg_mc_property_file[0]=='\0') { if (mc_reduce_kind==e_mc_reduce_unset) mc_reduce_kind=e_mc_reduce_dpor; @@ -176,11 +182,16 @@ void MC_init(){ xbt_dict_t libsimgrid_location_list = MC_get_location_list(libsimgrid_path); MC_get_local_variables(libsimgrid_path, libsimgrid_location_list, &mc_local_variables); + xbt_dict_free(&libsimgrid_location_list); + xbt_dict_free(&binary_location_list); + /* Get .plt section (start and end addresses) for data libsimgrid and data program comparison */ get_libsimgrid_plt_section(); get_binary_plt_section(); MC_ignore_data_bss(&end_raw_heap, sizeof(end_raw_heap)); + MC_ignore_data_bss(&mc_comp_times, sizeof(mc_comp_times)); + MC_ignore_data_bss(&mc_snapshot_comparison_time, sizeof(mc_snapshot_comparison_time)); /* Get global variables */ MC_get_global_variables(xbt_binary_name); @@ -198,6 +209,9 @@ void MC_init(){ MC_ignore_stack("_throw_ctx", "*"); MC_ignore_stack("ctx", "*"); + MC_ignore_stack("next_context", "smx_ctx_sysv_suspend_serial"); + MC_ignore_stack("i", "smx_ctx_sysv_suspend_serial"); + if(raw_mem_set) MC_SET_RAW_MEM; @@ -287,6 +301,7 @@ void MC_exit(void) { xbt_free(mc_time); MC_memory_exit(); + xbt_abort(); } @@ -749,8 +764,10 @@ void MC_ignore_heap(void *address, size_t size){ if(((xbt_mheap_t)std_heap)->heapinfo[region->block].type == 0){ region->fragment = -1; + ((xbt_mheap_t)std_heap)->heapinfo[region->block].busy_block.ignore = 1; }else{ region->fragment = ((uintptr_t) (ADDR2UINT (address) % (BLOCKSIZE))) >> ((xbt_mheap_t)std_heap)->heapinfo[region->block].type; + ((xbt_mheap_t)std_heap)->heapinfo[region->block].busy_frag.ignore[region->fragment] = 1; } } @@ -1034,13 +1051,14 @@ xbt_dict_t MC_get_location_list(const char *elf_file){ char *key = bprintf("%d", (int)strtoul((char *)xbt_dynar_get_as(split, 0, char *), NULL, 16)); xbt_dict_set(location_list, key, loclist, NULL); + xbt_free(key); xbt_dynar_free(&split); } - free(line); - free(command); + xbt_free(line); + xbt_free(command); pclose(fp); return location_list; @@ -1053,10 +1071,13 @@ static dw_frame_t get_frame_by_offset(xbt_dict_t all_variables, unsigned long in dw_frame_t res; xbt_dict_foreach(all_variables, cursor, name, res) { - if(offset >= res->start && offset < res->end) + if(offset >= res->start && offset < res->end){ + xbt_dict_cursor_free(&cursor); return res; + } } + xbt_dict_cursor_free(&cursor); return NULL; } @@ -1163,11 +1184,12 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ xbt_str_rtrim(abstract_origin, ">"); subprogram_name = (char *)xbt_dict_get_or_null(subprograms_origin, abstract_origin); frame = xbt_dict_get_or_null(*all_variables, subprogram_name); + xbt_free(abstract_origin); }else if(strcmp(node_type, "DW_AT_name") == 0){ new_frame = 1; - free(current_frame); + xbt_free(current_frame); frame = xbt_new0(s_dw_frame_t, 1); frame->name = strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *)); frame->variables = xbt_dict_new_homogeneous(NULL); @@ -1193,6 +1215,7 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ xbt_str_rtrim(loc_expr, ")"); frame->frame_base = get_location(NULL, loc_expr); xbt_dynar_free(&split2); + xbt_free(loc_expr); } @@ -1208,8 +1231,8 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ }else if(strcmp(node_type, "DW_AT_MIPS_linkage_name:") == 0){ - free(frame->name); - free(current_frame); + xbt_free(frame->name); + xbt_free(current_frame); frame->name = strdup(xbt_dynar_get_as(split, xbt_dynar_length(split) - 1, char *)); current_frame = strdup(frame->name); xbt_dict_set(subprograms_origin, subprogram_start, frame->name, NULL); @@ -1227,9 +1250,9 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ xbt_dict_set(*all_variables, frame->name, frame, NULL); } - free(subprogram_start); + xbt_free(subprogram_start); if(subprogram_end != NULL){ - free(subprogram_end); + xbt_free(subprogram_end); subprogram_end = NULL; } @@ -1309,6 +1332,7 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ xbt_str_rtrim(loc_expr, ")"); var->location = get_location(NULL, loc_expr); xbt_dynar_free(&split2); + xbt_free(loc_expr); } @@ -1397,8 +1421,8 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ } xbt_dynar_free(&split); - free(line); - free(command); + xbt_free(line); + xbt_free(command); pclose(fp); } @@ -1412,8 +1436,9 @@ static dw_location_t get_location(xbt_dict_t location_list, char *expr){ char *key = bprintf("%d", (int)strtoul(expr, NULL, 16)); loc->type = e_dw_loclist; loc->location.loclist = (xbt_dynar_t)xbt_dict_get_or_null(location_list, key); - if(loc == NULL) + if(loc->location.loclist == NULL) XBT_INFO("Key not found in loclist"); + xbt_free(key); return loc; }else{ @@ -1752,8 +1777,8 @@ static void MC_get_global_variables(char *elf_file){ } - free(command); - free(line); + xbt_free(command); + xbt_free(line); pclose(fp); }