X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9a438aff7d4cb341293b1f06c612eadb0fed0606..2ea615a592d67525bb5f8809c352e2c4075521d7:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index 964ef4102d..cec559a6c2 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -8,6 +8,7 @@ #include #include +#include "simgrid/sg_config.h" #include "../surf/surf_private.h" #include "../simix/smx_private.h" #include "../xbt/mmalloc/mmprivate.h" @@ -23,13 +24,19 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, /* Configuration support */ e_mc_reduce_t mc_reduce_kind=e_mc_reduce_unset; +int _sg_do_model_check = 0; +int _sg_mc_checkpoint=0; +char* _sg_mc_property_file=NULL; +int _sg_mc_timeout=0; +int _sg_mc_max_depth=1000; +int _sg_mc_visited=0; -extern int _surf_init_status; +extern int _sg_init_status; void _mc_cfg_cb_reduce(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { + if (_sg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a reduction strategy after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - char *val= xbt_cfg_get_string(_surf_cfg_set, name); + char *val= xbt_cfg_get_string(_sg_cfg_set, name); if (!strcasecmp(val,"none")) { mc_reduce_kind = e_mc_reduce_none; } else if (!strcasecmp(val,"dpor")) { @@ -40,37 +47,37 @@ void _mc_cfg_cb_reduce(const char *name, int pos) { } void _mc_cfg_cb_checkpoint(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { + if (_sg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a checkpointing value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - _surf_mc_checkpoint = xbt_cfg_get_int(_surf_cfg_set, name); + _sg_mc_checkpoint = xbt_cfg_get_int(_sg_cfg_set, name); } void _mc_cfg_cb_property(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { + if (_sg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a property after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - _surf_mc_property_file= xbt_cfg_get_string(_surf_cfg_set, name); + _sg_mc_property_file= xbt_cfg_get_string(_sg_cfg_set, name); } void _mc_cfg_cb_timeout(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { + if (_sg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a value to enable/disable timeout for wait requests after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - _surf_mc_timeout= xbt_cfg_get_int(_surf_cfg_set, name); + _sg_mc_timeout= xbt_cfg_get_int(_sg_cfg_set, name); } void _mc_cfg_cb_max_depth(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { + if (_sg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a max depth value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - _surf_mc_max_depth= xbt_cfg_get_int(_surf_cfg_set, name); + _sg_mc_max_depth= xbt_cfg_get_int(_sg_cfg_set, name); } void _mc_cfg_cb_visited(const char *name, int pos) { - if (_surf_init_status && !_surf_do_model_check) { + if (_sg_init_status && !_sg_do_model_check) { xbt_die("You are specifying a number of stored visited states after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry."); } - _surf_mc_visited= xbt_cfg_get_int(_surf_cfg_set, name); + _sg_mc_visited= xbt_cfg_get_int(_sg_cfg_set, name); } @@ -79,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 */ @@ -115,7 +124,12 @@ 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() { - if (!_surf_mc_property_file || _surf_mc_property_file[0]=='\0') { + + 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; @@ -127,8 +141,8 @@ void MC_do_the_modelcheck_for_real() { if (mc_reduce_kind==e_mc_reduce_unset) mc_reduce_kind=e_mc_reduce_none; - XBT_INFO("Check the liveness property %s",_surf_mc_property_file); - MC_automaton_load(_surf_mc_property_file); + XBT_INFO("Check the liveness property %s",_sg_mc_property_file); + MC_automaton_load(_sg_mc_property_file); MC_modelcheck_liveness(); } } @@ -168,6 +182,9 @@ 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(); @@ -183,10 +200,16 @@ void MC_init(){ MC_ignore_stack("__ex_cleanup", "*"); MC_ignore_stack("__ex_mctx_en", "*"); MC_ignore_stack("__ex_mctx_me", "*"); + MC_ignore_stack("__xbt_ex_ctx_ptr", "*"); MC_ignore_stack("_log_ev", "*"); 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"); + + MC_ignore_data_bss(&mc_comp_times, sizeof(mc_comp_times)); + MC_ignore_data_bss(&mc_snapshot_comparison_time, sizeof(mc_snapshot_comparison_time)); if(raw_mem_set) MC_SET_RAW_MEM; @@ -217,7 +240,7 @@ void MC_modelcheck_safety(void) MC_UNSET_RAW_MEM; - if(_surf_mc_visited > 0){ + if(_sg_mc_visited > 0){ MC_init(); }else{ MC_SET_RAW_MEM; @@ -235,11 +258,11 @@ void MC_modelcheck_safety(void) initial_state_safety->snapshot = MC_take_snapshot(); MC_UNSET_RAW_MEM; + MC_dpor(); + if(raw_mem_set) MC_SET_RAW_MEM; - MC_dpor(); - MC_exit(); } @@ -277,6 +300,7 @@ void MC_exit(void) { xbt_free(mc_time); MC_memory_exit(); + xbt_abort(); } @@ -520,7 +544,7 @@ void MC_dump_stack_safety(xbt_fifo_t stack) MC_show_stack_safety(stack); - if(!_surf_mc_checkpoint){ + if(!_sg_mc_checkpoint){ mc_state_t state; @@ -719,6 +743,15 @@ void MC_automaton_new_propositional_symbol(const char* id, void* fct) { /************ MC_ignore ***********/ +void heap_ignore_region_free(mc_heap_ignore_region_t r){ + if(r) + xbt_free(r); +} + +void heap_ignore_region_free_voidp(void *r){ + heap_ignore_region_free((mc_heap_ignore_region_t) * (void **) r); +} + void MC_ignore_heap(void *address, size_t size){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); @@ -726,23 +759,21 @@ void MC_ignore_heap(void *address, size_t size){ MC_SET_RAW_MEM; if(mc_heap_comparison_ignore == NULL) - mc_heap_comparison_ignore = xbt_dynar_new(sizeof(mc_heap_ignore_region_t), NULL); + mc_heap_comparison_ignore = xbt_dynar_new(sizeof(mc_heap_ignore_region_t), heap_ignore_region_free_voidp); mc_heap_ignore_region_t region = NULL; region = xbt_new0(s_mc_heap_ignore_region_t, 1); region->address = address; region->size = size; - if((address >= std_heap) && (address <= (void*)((char *)std_heap + STD_HEAP_SIZE))){ - - region->block = ((char*)address - (char*)((xbt_mheap_t)std_heap)->heapbase) / BLOCKSIZE + 1; - - if(((xbt_mheap_t)std_heap)->heapinfo[region->block].type == 0){ - region->fragment = -1; - }else{ - region->fragment = ((uintptr_t) (ADDR2UINT (address) % (BLOCKSIZE))) >> ((xbt_mheap_t)std_heap)->heapinfo[region->block].type; - } - + region->block = ((char*)address - (char*)((xbt_mheap_t)std_heap)->heapbase) / BLOCKSIZE + 1; + + 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; } unsigned int cursor = 0; @@ -760,6 +791,48 @@ void MC_ignore_heap(void *address, size_t size){ MC_SET_RAW_MEM; } +void MC_remove_ignore_heap(void *address, size_t size){ + + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + + MC_SET_RAW_MEM; + + unsigned int cursor = 0; + int start = 0; + int end = xbt_dynar_length(mc_heap_comparison_ignore) - 1; + mc_heap_ignore_region_t region; + int ignore_found = 0; + + while(start <= end){ + cursor = (start + end) / 2; + region = (mc_heap_ignore_region_t)xbt_dynar_get_as(mc_heap_comparison_ignore, cursor, mc_heap_ignore_region_t); + if(region->address == address){ + ignore_found = 1; + break; + } + if(region->address < address) + start = cursor + 1; + if(region->address > address){ + if((char * )region->address <= ((char *)address + size)){ + ignore_found = 1; + break; + }else + end = cursor - 1; + } + } + + if(ignore_found == 1){ + xbt_dynar_remove_at(mc_heap_comparison_ignore, cursor, NULL); + MC_remove_ignore_heap(address, size); + } + + MC_UNSET_RAW_MEM; + + if(raw_mem_set) + MC_SET_RAW_MEM; + +} + void MC_ignore_data_bss(void *address, size_t size){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); @@ -769,12 +842,12 @@ void MC_ignore_data_bss(void *address, size_t size){ if(mc_data_bss_comparison_ignore == NULL) mc_data_bss_comparison_ignore = xbt_dynar_new(sizeof(mc_data_bss_ignore_variable_t), NULL); - if(xbt_dynar_is_empty(mc_data_bss_comparison_ignore)){ + mc_data_bss_ignore_variable_t var = NULL; + var = xbt_new0(s_mc_data_bss_ignore_variable_t, 1); + var->address = address; + var->size = size; - mc_data_bss_ignore_variable_t var = NULL; - var = xbt_new0(s_mc_data_bss_ignore_variable_t, 1); - var->address = address; - var->size = size; + if(xbt_dynar_is_empty(mc_data_bss_comparison_ignore)){ xbt_dynar_insert_at(mc_data_bss_comparison_ignore, 0, &var); @@ -799,11 +872,6 @@ void MC_ignore_data_bss(void *address, size_t size){ if(current_var->address > address) end = cursor - 1; } - - mc_data_bss_ignore_variable_t var = NULL; - var = xbt_new0(s_mc_data_bss_ignore_variable_t, 1); - var->address = address; - var->size = size; if(current_var->address < address) xbt_dynar_insert_at(mc_data_bss_comparison_ignore, cursor + 1, &var); @@ -812,12 +880,66 @@ void MC_ignore_data_bss(void *address, size_t size){ } + /* Remove variable from mc_global_variables */ + + if(mc_global_variables != NULL){ + + unsigned int cursor = 0; + int start = 0; + int end = xbt_dynar_length(mc_global_variables) - 1; + global_variable_t current_var; + int var_found; + + while(start <= end){ + cursor = (start + end) / 2; + current_var = (global_variable_t)xbt_dynar_get_as(mc_global_variables, cursor, global_variable_t); + if(current_var->address == var->address){ + var_found = 1; + break; + } + if(current_var->address < address) + start = cursor + 1; + if(current_var->address > address) + end = cursor - 1; + } + + if(var_found) + xbt_dynar_remove_at(mc_global_variables, cursor, NULL); + + } + MC_UNSET_RAW_MEM; if(raw_mem_set) MC_SET_RAW_MEM; } +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){ + 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; +} + + + void MC_ignore_stack(const char *var_name, const char *frame){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); @@ -897,6 +1019,7 @@ void MC_new_stack_area(void *stack, char *name, void* context, size_t size){ region->process_name = strdup(name); region->context = context; region->size = size; + region->block = ((char*)stack - (char*)((xbt_mheap_t)std_heap)->heapbase) / BLOCKSIZE + 1; xbt_dynar_push(stacks_areas, ®ion); MC_UNSET_RAW_MEM; @@ -998,13 +1121,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; @@ -1017,10 +1141,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; } @@ -1127,11 +1254,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); @@ -1157,6 +1285,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); } @@ -1172,8 +1301,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); @@ -1191,9 +1320,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; } @@ -1273,6 +1402,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); } @@ -1361,8 +1491,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); } @@ -1376,8 +1506,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{ @@ -1405,13 +1536,13 @@ static dw_location_t get_location(xbt_dict_t location_list, char *expr){ }else if(strcmp(tok2, "DW_OP_fbreg:") == 0){ dw_location_t new_element = xbt_new0(s_dw_location_t, 1); new_element->type = e_dw_fbregister_op; - new_element->location.fbreg_op = atoi(xbt_dynar_get_as(tokens2, 1, char*)); + new_element->location.fbreg_op = atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*)); xbt_dynar_push(loc->location.compose, &new_element); }else if(strncmp(tok2, "DW_OP_breg", 10) == 0){ dw_location_t new_element = xbt_new0(s_dw_location_t, 1); new_element->type = e_dw_bregister_op; new_element->location.breg_op.reg = atoi(strtok(tok2, "DW_OP_breg")); - new_element->location.breg_op.offset = atoi(xbt_dynar_get_as(tokens2, 1, char*)); + new_element->location.breg_op.offset = atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*)); xbt_dynar_push(loc->location.compose, &new_element); }else if(strncmp(tok2, "DW_OP_lit", 9) == 0){ dw_location_t new_element = xbt_new0(s_dw_location_t, 1); @@ -1421,7 +1552,7 @@ static dw_location_t get_location(xbt_dict_t location_list, char *expr){ }else if(strcmp(tok2, "DW_OP_piece:") == 0){ dw_location_t new_element = xbt_new0(s_dw_location_t, 1); new_element->type = e_dw_piece; - new_element->location.piece = atoi(xbt_dynar_get_as(tokens2, 1, char*)); + new_element->location.piece = atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*)); /*if(strlen(xbt_dynar_get_as(tokens2, 1, char*)) > 1) new_element->location.piece = atoi(xbt_dynar_get_as(tokens2, 1, char*)); else @@ -1430,7 +1561,7 @@ static dw_location_t get_location(xbt_dict_t location_list, char *expr){ }else if(strcmp(tok2, "DW_OP_plus_uconst:") == 0){ dw_location_t new_element = xbt_new0(s_dw_location_t, 1); new_element->type = e_dw_plus_uconst; - new_element->location.plus_uconst = atoi(xbt_dynar_get_as(tokens2, 1, char *)); + new_element->location.plus_uconst = atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char *)); xbt_dynar_push(loc->location.compose, &new_element); }else if(strcmp(tok, "DW_OP_abs") == 0 || strcmp(tok, "DW_OP_and") == 0 || @@ -1450,7 +1581,7 @@ static dw_location_t get_location(xbt_dict_t location_list, char *expr){ }else if(strcmp(tok2, "DW_OP_deref_size:") == 0){ dw_location_t new_element = xbt_new0(s_dw_location_t, 1); new_element->type = e_dw_deref; - new_element->location.deref_size = (unsigned int short) atoi(xbt_dynar_get_as(tokens2, 1, char*)); + new_element->location.deref_size = (unsigned int short) atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*)); /*if(strlen(xbt_dynar_get_as(tokens, ++cursor, char*)) > 1) new_element->location.deref_size = atoi(xbt_dynar_get_as(tokens, cursor, char*)); else @@ -1465,7 +1596,7 @@ static dw_location_t get_location(xbt_dict_t location_list, char *expr){ dw_location_t new_element = xbt_new0(s_dw_location_t, 1); new_element->type = e_dw_uconstant; new_element->location.uconstant.bytes = 1; - new_element->location.uconstant.value = (unsigned long int)(atoi(xbt_dynar_get_as(tokens2, 1, char*))); + new_element->location.uconstant.value = (unsigned long int)(atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*))); /*if(strlen(xbt_dynar_get_as(tokens, ++cursor, char*)) > 1) new_element->location.uconstant.value = (unsigned long int)(atoi(xbt_dynar_get_as(tokens, cursor, char*))); else @@ -1475,7 +1606,7 @@ static dw_location_t get_location(xbt_dict_t location_list, char *expr){ dw_location_t new_element = xbt_new0(s_dw_location_t, 1); new_element->type = e_dw_sconstant; new_element->location.sconstant.bytes = 1; - new_element->location.sconstant.value = (long int)(atoi(xbt_dynar_get_as(tokens2, 1, char*))); + new_element->location.sconstant.value = (long int)(atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*))); xbt_dynar_push(loc->location.compose, &new_element); }else if(strcmp(tok2, "DW_OP_const1u:") == 0 || strcmp(tok2, "DW_OP_const2u:") == 0 || @@ -1484,7 +1615,7 @@ static dw_location_t get_location(xbt_dict_t location_list, char *expr){ dw_location_t new_element = xbt_new0(s_dw_location_t, 1); new_element->type = e_dw_uconstant; new_element->location.uconstant.bytes = tok2[11] - '0'; - new_element->location.uconstant.value = (unsigned long int)(atoi(xbt_dynar_get_as(tokens2, 1, char*))); + new_element->location.uconstant.value = (unsigned long int)(atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*))); /*if(strlen(xbt_dynar_get_as(tokens, ++cursor, char*)) > 1) new_element->location.constant.value = atoi(xbt_dynar_get_as(tokens, cursor, char*)); else @@ -1497,7 +1628,7 @@ static dw_location_t get_location(xbt_dict_t location_list, char *expr){ dw_location_t new_element = xbt_new0(s_dw_location_t, 1); new_element->type = e_dw_sconstant; new_element->location.sconstant.bytes = tok2[11] - '0'; - new_element->location.sconstant.value = (long int)(atoi(xbt_dynar_get_as(tokens2, 1, char*))); + new_element->location.sconstant.value = (long int)(atoi(xbt_dynar_get_as(tokens2, xbt_dynar_length(tokens2) - 1, char*))); xbt_dynar_push(loc->location.compose, &new_element); }else{ dw_location_t new_element = xbt_new0(s_dw_location_t, 1); @@ -1645,31 +1776,6 @@ void print_local_variables(xbt_dict_t list){ } -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){ - 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 void MC_get_global_variables(char *elf_file){ FILE *fp; @@ -1731,17 +1837,41 @@ static void MC_get_global_variables(char *elf_file){ var->size = (size_t)strtoul(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 2, char*), NULL, 16); var->name = strdup(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*)); - if(data_bss_ignore_size(var->address) > 0) + if(data_bss_ignore_size(var->address) > 0){ global_variable_free(var); - else - xbt_dynar_push(mc_global_variables, &var); + }else{ + if(xbt_dynar_is_empty(mc_global_variables)){ + xbt_dynar_push(mc_global_variables, &var); + }else{ + unsigned int cursor = 0; + int start = 0; + int end = xbt_dynar_length(mc_global_variables) - 1; + global_variable_t current_var = NULL; + + while(start <= end){ + cursor = (start + end) / 2; + current_var = (global_variable_t)xbt_dynar_get_as(mc_global_variables, cursor, global_variable_t); + if(current_var->address == var->address) + break; + if(current_var->address < var->address) + start = cursor + 1; + if(current_var->address > var->address) + end = cursor - 1; + } + + if(current_var->address < var->address) + xbt_dynar_insert_at(mc_global_variables, cursor + 1, &var); + else + xbt_dynar_insert_at(mc_global_variables, cursor, &var); + } + } xbt_dynar_free(&line_tokens); } - free(command); - free(line); + xbt_free(command); + xbt_free(line); pclose(fp); }