X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7d4a9a7e27436e76b10c1b1f9ce794655dc070a2..84c0bdd5d7ca6061f968338a071501e4d4d9a084:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index bdd6c2d031..562eb37978 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2013 Da SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -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,6 +24,13 @@ 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; +char *_sg_mc_dot_output_file = NULL; extern int _sg_init_status; void _mc_cfg_cb_reduce(const char *name, int pos) { @@ -43,52 +51,59 @@ void _mc_cfg_cb_checkpoint(const char *name, int pos) { 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(_sg_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 (_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(_sg_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 (_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(_sg_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 (_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(_sg_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 (_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(_sg_cfg_set, name); + _sg_mc_visited= xbt_cfg_get_int(_sg_cfg_set, name); } +void _mc_cfg_cb_dot_output(const char *name, int pos) { + if (_sg_init_status && !_sg_do_model_check) { + xbt_die("You are specifying a file name for a dot output of graph state 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."); + } + _sg_mc_dot_output_file= xbt_cfg_get_string(_sg_cfg_set, name); +} /* MC global data structures */ 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; +mc_stats_t mc_stats = NULL; /* Safety */ xbt_fifo_t mc_stack_safety = NULL; -mc_stats_t mc_stats = NULL; mc_global_t initial_state_safety = NULL; /* Liveness */ -mc_stats_pair_t mc_stats_pair = NULL; xbt_fifo_t mc_stack_liveness = NULL; mc_global_t initial_state_liveness = NULL; int compare; @@ -104,6 +119,9 @@ xbt_dynar_t mc_data_bss_comparison_ignore; extern xbt_dynar_t mc_heap_comparison_ignore; extern xbt_dynar_t stacks_areas; +FILE *dot_output = NULL; +const char* colors[10]; + xbt_automaton_t _mc_property_automaton = NULL; /* Static functions */ @@ -115,7 +133,15 @@ 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_dot_output_file != NULL) && (_sg_mc_dot_output_file[0]!='\0')) + MC_init_dot_output(); + + 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 +153,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(); } } @@ -142,13 +168,6 @@ void MC_init(){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - mc_time = xbt_new0(double, simix_process_maxpid); - - /* mc_time refers to clock for each process -> ignore it for heap comparison */ - int i; - for(i = 0; i ignore it for heap comparison */ + MC_ignore_heap(mc_time, simix_process_maxpid * sizeof(double)); + /* Initialize the data structures that must be persistent across every iteration of the model-checker (in RAW memory) */ @@ -219,7 +271,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; @@ -237,11 +289,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(); } @@ -250,15 +302,22 @@ void MC_modelcheck_liveness(){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_init(); + + mc_time = xbt_new0(double, simix_process_maxpid); + + /* mc_time refers to clock for each process -> ignore it for heap comparison */ + MC_ignore_heap(mc_time, simix_process_maxpid * sizeof(double)); MC_SET_RAW_MEM; - + /* Initialize statistics */ - mc_stats_pair = xbt_new0(s_mc_stats_pair_t, 1); + mc_stats = xbt_new0(s_mc_stats_t, 1); + mc_stats->state_size = 1; /* Create exploration stack */ mc_stack_liveness = xbt_fifo_new(); + /* Create the initial state */ initial_state_liveness = xbt_new0(s_mc_global_t, 1); MC_UNSET_RAW_MEM; @@ -266,7 +325,7 @@ void MC_modelcheck_liveness(){ MC_ddfs_init(); /* We're done */ - MC_print_statistics_pairs(mc_stats_pair); + MC_print_statistics(mc_stats); xbt_free(mc_time); if(raw_mem_set) @@ -277,15 +336,28 @@ void MC_modelcheck_liveness(){ void MC_exit(void) { + MC_SET_RAW_MEM; + if((_sg_mc_dot_output_file != NULL) && (_sg_mc_dot_output_file[0]!='\0')){ + fprintf(dot_output, "}\n"); + fclose(dot_output); + } + MC_UNSET_RAW_MEM; + xbt_free(mc_time); MC_memory_exit(); + xbt_abort(); +} + +int SIMIX_pre_mc_random(smx_simcall_t simcall){ + + return simcall->mc_value; } -int MC_random(int min, int max) +int MC_random(void) { /*FIXME: return mc_current_state->executed_transition->random.value;*/ - return 0; + return simcall_mc_random(); } /** @@ -334,11 +406,12 @@ void MC_replay(xbt_fifo_t stack, int start) { int raw_mem = (mmalloc_get_current_heap() == raw_heap); - int value, i = 1; + int value, i = 1, count = 1; char *req_str; smx_simcall_t req = NULL, saved_req = NULL; xbt_fifo_item_t item, start_item; mc_state_t state; + smx_process_t process = NULL; XBT_DEBUG("**** Begin Replay ****"); @@ -358,6 +431,19 @@ void MC_replay(xbt_fifo_t stack, int start) } } + MC_SET_RAW_MEM; + xbt_dict_reset(first_enabled_state); + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ + char *key = bprintf("%lu", process->pid); + char *data = bprintf("%d", count); + xbt_dict_set(first_enabled_state, key, data, NULL); + xbt_free(key); + } + } + MC_UNSET_RAW_MEM; + + /* Traverse the stack from the state at position start and re-execute the transitions */ for (item = start_item; item != xbt_fifo_get_first_item(stack); @@ -366,6 +452,12 @@ void MC_replay(xbt_fifo_t stack, int start) state = (mc_state_t) xbt_fifo_get_item_content(item); saved_req = MC_state_get_executed_request(state, &value); + MC_SET_RAW_MEM; + char *key = bprintf("%lu", saved_req->issuer->pid); + xbt_dict_remove(first_enabled_state, key); + xbt_free(key); + MC_UNSET_RAW_MEM; + if(saved_req){ /* because we got a copy of the executed request, we have to fetch the real one, pointed by the request field of the issuer process */ @@ -378,14 +470,32 @@ void MC_replay(xbt_fifo_t stack, int start) xbt_free(req_str); } } - + SIMIX_simcall_pre(req, value); MC_wait_for_requests(); + + count++; + + MC_SET_RAW_MEM; + /* Insert in dict all enabled processes */ + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process) /*&& !MC_state_process_is_done(state, process)*/){ + char *key = bprintf("%lu", process->pid); + if(xbt_dict_get_or_null(first_enabled_state, key) == NULL){ + char *data = bprintf("%d", count); + xbt_dict_set(first_enabled_state, key, data, NULL); + } + xbt_free(key); + } + } + MC_UNSET_RAW_MEM; /* Update statistics */ mc_stats->visited_states++; mc_stats->executed_transitions++; + } + XBT_DEBUG("**** End Replay ****"); if(raw_mem) @@ -406,7 +516,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) smx_simcall_t req = NULL, saved_req = NULL; xbt_fifo_item_t item; mc_state_t state; - mc_pair_stateless_t pair; + mc_pair_t pair; int depth = 1; XBT_DEBUG("**** Begin Replay ****"); @@ -425,7 +535,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) while(depth <= xbt_fifo_size(stack)){ - pair = (mc_pair_stateless_t) xbt_fifo_get_item_content(item); + pair = (mc_pair_t) xbt_fifo_get_item_content(item); state = (mc_state_t) pair->graph_state; if(pair->requests > 0){ @@ -455,7 +565,8 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) depth++; /* Update statistics */ - mc_stats_pair->visited_pairs++; + mc_stats->visited_pairs++; + mc_stats->executed_transitions++; item = xbt_fifo_get_prev_item(item); } @@ -467,7 +578,7 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) item != xbt_fifo_get_first_item(stack); item = xbt_fifo_get_prev_item(item)) { - pair = (mc_pair_stateless_t) xbt_fifo_get_item_content(item); + pair = (mc_pair_t) xbt_fifo_get_item_content(item); state = (mc_state_t) pair->graph_state; if(pair->requests > 0){ @@ -497,7 +608,8 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack) depth++; /* Update statistics */ - mc_stats_pair->visited_pairs++; + mc_stats->visited_pairs++; + mc_stats->executed_transitions++; } } @@ -522,7 +634,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; @@ -578,13 +690,13 @@ void MC_show_deadlock(smx_simcall_t req) void MC_show_stack_liveness(xbt_fifo_t stack){ int value; - mc_pair_stateless_t pair; + mc_pair_t pair; xbt_fifo_item_t item; smx_simcall_t req; char *req_str = NULL; for (item = xbt_fifo_get_last_item(stack); - (item ? (pair = (mc_pair_stateless_t) (xbt_fifo_get_item_content(item))) + (item ? (pair = (mc_pair_t) (xbt_fifo_get_item_content(item))) : (NULL)); item = xbt_fifo_get_prev_item(item)) { req = MC_state_get_executed_request(pair->graph_state, &value); if(req){ @@ -603,11 +715,11 @@ void MC_dump_stack_liveness(xbt_fifo_t stack){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - mc_pair_stateless_t pair; + mc_pair_t pair; MC_SET_RAW_MEM; - while ((pair = (mc_pair_stateless_t) xbt_fifo_pop(stack)) != NULL) - pair_stateless_free(pair); + while ((pair = (mc_pair_t) xbt_fifo_pop(stack)) != NULL) + MC_pair_delete(pair); MC_UNSET_RAW_MEM; if(raw_mem_set) @@ -618,26 +730,14 @@ void MC_dump_stack_liveness(xbt_fifo_t stack){ void MC_print_statistics(mc_stats_t stats) { - //XBT_INFO("State space size ~= %lu", stats->state_size); - XBT_INFO("Expanded states = %lu", stats->expanded_states); - XBT_INFO("Visited states = %lu", stats->visited_states); + if(stats->expanded_pairs == 0){ + XBT_INFO("Expanded states = %lu", stats->expanded_states); + XBT_INFO("Visited states = %lu", stats->visited_states); + }else{ + XBT_INFO("Expanded pairs = %lu", stats->expanded_pairs); + XBT_INFO("Visited pairs = %lu", stats->visited_pairs); + } XBT_INFO("Executed transitions = %lu", stats->executed_transitions); - XBT_INFO("Expanded / Visited = %lf", - (double) stats->visited_states / stats->expanded_states); - /*XBT_INFO("Exploration coverage = %lf", - (double)stats->expanded_states / stats->state_size); */ -} - -void MC_print_statistics_pairs(mc_stats_pair_t stats) -{ - XBT_INFO("Expanded pairs = %lu", stats->expanded_pairs); - XBT_INFO("Visited pairs = %lu", stats->visited_pairs); - //XBT_INFO("Executed transitions = %lu", stats->executed_transitions); - XBT_INFO("Expanded / Visited = %lf", - (double) stats->visited_pairs / stats->expanded_pairs); - - if(mmalloc_get_current_heap() == raw_heap) - MC_UNSET_RAW_MEM; } void MC_assert(int prop) @@ -661,7 +761,7 @@ static void MC_assert_pair(int prop){ //XBT_INFO("Counter-example execution trace:"); MC_show_stack_liveness(mc_stack_liveness); //MC_dump_snapshot_stack(mc_snapshot_stack); - MC_print_statistics_pairs(mc_stats_pair); + MC_print_statistics(mc_stats); xbt_abort(); } } @@ -710,7 +810,7 @@ void MC_automaton_new_propositional_symbol(const char* id, void* fct) { if (_mc_property_automaton == NULL) _mc_property_automaton = xbt_automaton_new(); - xbt_new_propositional_symbol(_mc_property_automaton,id,fct); + xbt_automaton_propositional_symbol_new(_mc_property_automaton,id,fct); MC_UNSET_RAW_MEM; @@ -721,40 +821,67 @@ void MC_automaton_new_propositional_symbol(const char* id, void* fct) { /************ MC_ignore ***********/ +void heap_ignore_region_free(mc_heap_ignore_region_t 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); 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_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; + } + + if(mc_heap_comparison_ignore == NULL){ + mc_heap_comparison_ignore = xbt_dynar_new(sizeof(mc_heap_ignore_region_t), heap_ignore_region_free_voidp); + xbt_dynar_push(mc_heap_comparison_ignore, ®ion); + if(!raw_mem_set) + MC_UNSET_RAW_MEM; + return; } unsigned int cursor = 0; - mc_heap_ignore_region_t current_region; - xbt_dynar_foreach(mc_heap_comparison_ignore, cursor, current_region){ + mc_heap_ignore_region_t current_region = NULL; + int start = 0; + int end = xbt_dynar_length(mc_heap_comparison_ignore) - 1; + + while(start <= end){ + cursor = (start + end) / 2; + current_region = (mc_heap_ignore_region_t)xbt_dynar_get_as(mc_heap_comparison_ignore, cursor, mc_heap_ignore_region_t); + if(current_region->address == address){ + heap_ignore_region_free(region); + if(!raw_mem_set) + MC_UNSET_RAW_MEM; + return; + } + if(current_region->address < address) + start = cursor + 1; if(current_region->address > address) - break; + end = cursor - 1; } - xbt_dynar_insert_at(mc_heap_comparison_ignore, cursor, ®ion); + if(current_region->address < address) + xbt_dynar_insert_at(mc_heap_comparison_ignore, cursor + 1, ®ion); + else + xbt_dynar_insert_at(mc_heap_comparison_ignore, cursor, ®ion); MC_UNSET_RAW_MEM; @@ -762,6 +889,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); @@ -771,12 +940,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); @@ -801,11 +970,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); @@ -814,13 +978,67 @@ 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; } -void MC_ignore_stack(const char *var_name, const char *frame){ +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_name){ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); @@ -834,7 +1052,7 @@ void MC_ignore_stack(const char *var_name, const char *frame){ mc_stack_ignore_variable_t var = NULL; var = xbt_new0(s_mc_stack_ignore_variable_t, 1); var->var_name = strdup(var_name); - var->frame = strdup(frame); + var->frame = strdup(frame_name); xbt_dynar_insert_at(mc_stack_comparison_ignore, 0, &var); @@ -848,7 +1066,7 @@ void MC_ignore_stack(const char *var_name, const char *frame){ 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_name) == 0){ if(strcmp(current_var->var_name, var_name) == 0){ MC_UNSET_RAW_MEM; if(raw_mem_set) @@ -860,24 +1078,36 @@ void MC_ignore_stack(const char *var_name, const char *frame){ if(strcmp(current_var->var_name, var_name) > 0) end = cursor - 1; } - if(strcmp(current_var->frame, frame) < 0) + if(strcmp(current_var->frame, frame_name) < 0) start = cursor + 1; - if(strcmp(current_var->frame, frame) > 0) + if(strcmp(current_var->frame, frame_name) > 0) end = cursor - 1; } mc_stack_ignore_variable_t var = NULL; var = xbt_new0(s_mc_stack_ignore_variable_t, 1); var->var_name = strdup(var_name); - var->frame = strdup(frame); + var->frame = strdup(frame_name); - if(strcmp(current_var->frame, frame) < 0) + if(strcmp(current_var->frame, frame_name) < 0) xbt_dynar_insert_at(mc_stack_comparison_ignore, cursor + 1, &var); else xbt_dynar_insert_at(mc_stack_comparison_ignore, cursor, &var); } + /* Remove variable from mc_local_variables */ + + if(mc_local_variables != NULL){ + + if(strcmp(frame_name, "*") != 0){ + dw_frame_t frame = xbt_dict_get_or_null(mc_local_variables, frame_name); + if(frame != NULL) + xbt_dict_remove(frame->variables, var_name); + } + + } + MC_UNSET_RAW_MEM; if(raw_mem_set) @@ -899,6 +1129,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; @@ -929,7 +1160,7 @@ xbt_dict_t MC_get_location_list(const char *elf_file){ int cursor_remove; xbt_dynar_t split = NULL; - while ((read = getline(&line, &n, fp)) != -1) { + while ((read = xbt_getline(&line, &n, fp)) != -1) { /* Wipeout the new line character */ line[read - 1] = '\0'; @@ -988,7 +1219,7 @@ xbt_dict_t MC_get_location_list(const char *elf_file){ xbt_dynar_free(&split); free(loc_expr); - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); if(read != -1){ line[read - 1] = '\0'; xbt_str_strip_spaces(line); @@ -1000,13 +1231,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; @@ -1019,10 +1251,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; } @@ -1049,12 +1284,12 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ int new_frame = 0, new_variable = 0; dw_frame_t variable_frame, subroutine_frame = NULL; - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); while (read != -1) { if(n == 0){ - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); continue; } @@ -1062,7 +1297,7 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ line[read - 1] = '\0'; if(strlen(line) == 0){ - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); continue; } @@ -1070,7 +1305,7 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ xbt_str_strip_spaces(line); if(line[0] != '<'){ - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); continue; } @@ -1088,12 +1323,12 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ subprogram_start = strdup(strtok(NULL, "<")); xbt_str_rtrim(subprogram_start, ">:"); - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); while(read != -1){ if(n == 0){ - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); continue; } @@ -1101,7 +1336,7 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ line[read - 1] = '\0'; if(strlen(line) == 0){ - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); continue; } @@ -1129,11 +1364,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); @@ -1159,6 +1395,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); } @@ -1174,15 +1411,15 @@ 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); } - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); } @@ -1193,11 +1430,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); - if(subprogram_end != NULL){ - free(subprogram_end); - subprogram_end = NULL; - } + xbt_free(subprogram_start); + xbt_free(subprogram_end); + subprogram_end = NULL; }else if(strcmp(node_type, "(DW_TAG_variable)") == 0){ /* New variable */ @@ -1208,12 +1443,12 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ origin = strdup(strtok(NULL, "<")); xbt_str_rtrim(origin, ">:"); - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); while(read != -1){ if(n == 0){ - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); continue; } @@ -1221,7 +1456,7 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ line[read - 1] = '\0'; if(strlen(line) == 0){ - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); continue; } @@ -1275,6 +1510,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); } @@ -1286,7 +1522,7 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ } - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); } @@ -1305,7 +1541,7 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ origin = strdup(strtok(NULL, "<")); xbt_str_rtrim(origin, ">:"); - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); while(read != -1){ @@ -1313,12 +1549,12 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ line[read - 1] = '\0'; if(n == 0){ - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); continue; } if(strlen(line) == 0){ - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); continue; } @@ -1350,21 +1586,21 @@ void MC_get_local_variables(const char *elf_file, xbt_dict_t location_list, xbt_ subroutine_frame->high_pc = (void *)strtoul(xbt_dynar_get_as(split, 3, char *), NULL, 16); } - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); } }else{ - read = getline(&line, &n, fp); + read = xbt_getline(&line, &n, fp); } } xbt_dynar_free(&split); - free(line); - free(command); + xbt_free(line); + xbt_free(command); pclose(fp); } @@ -1378,8 +1614,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{ @@ -1407,13 +1644,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); @@ -1423,7 +1660,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 @@ -1432,7 +1669,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 || @@ -1452,7 +1689,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 @@ -1467,7 +1704,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 @@ -1477,7 +1714,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 || @@ -1486,7 +1723,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 @@ -1499,7 +1736,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); @@ -1647,31 +1884,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; @@ -1697,7 +1909,7 @@ static void MC_get_global_variables(char *elf_file){ int type = strcmp(elf_file, xbt_binary_name); /* 0 = binary, other = libsimgrid */ - while ((read = getline(&line, &n, fp)) != -1){ + while ((read = xbt_getline(&line, &n, fp)) != -1){ if(n == 0) continue; @@ -1718,7 +1930,6 @@ static void MC_get_global_variables(char *elf_file){ || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), ".data") == 0) || (strcmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), ".bss") == 0) || (strncmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "stderr", 6) == 0) - || (strncmp(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 1, char*), "counter", 7) == 0) || ((size_t)strtoul(xbt_dynar_get_as(line_tokens, xbt_dynar_length(line_tokens) - 2, char*), NULL, 16) == 0)) continue; @@ -1734,17 +1945,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); }