X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ff96c45809a06f045655a0b8203e193349890a1b..41d5f3c8a30bf77b309143b174ea5a616b24c5c2:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index f8757046c7..9b8e3616e6 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -11,6 +11,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, "Logging specific to algorithms for liveness properties verification"); xbt_dynar_t reached_pairs; +xbt_dynar_t visited_pairs; xbt_dynar_t successors; int create_dump(int pair) @@ -40,7 +41,7 @@ int create_dump(int pair) if(wait(&status) < 0) perror("wait"); if(WIFSIGNALED(status) && WCOREDUMP(status)){ - char *core_name = malloc(20); + char *core_name = xbt_malloc(20); sprintf(core_name,"core_%d", pair); rename("core", core_name); free(core_name); @@ -52,7 +53,7 @@ int create_dump(int pair) int reached(xbt_state_t st){ - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_SET_RAW_MEM; @@ -61,7 +62,7 @@ int reached(xbt_state_t st){ new_pair->nb = xbt_dynar_length(reached_pairs) + 1; new_pair->automaton_state = st; new_pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); - new_pair->system_state = MC_take_snapshot_liveness(); + new_pair->system_state = MC_take_snapshot(); /* Get values of propositional symbols */ int res; @@ -70,18 +71,21 @@ int reached(xbt_state_t st){ xbt_propositional_symbol_t ps = NULL; xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ f = (int_f_void_t)ps->function; - res = (*f)(); + res = f(); xbt_dynar_push_as(new_pair->prop_ato, int, res); } MC_UNSET_RAW_MEM; - if(xbt_dynar_is_empty(reached_pairs) || !compare){ + if(xbt_dynar_is_empty(reached_pairs)/* || !compare*/){ MC_SET_RAW_MEM; /* New pair reached */ xbt_dynar_push(reached_pairs, &new_pair); MC_UNSET_RAW_MEM; + + if(raw_mem_set) + MC_SET_RAW_MEM; return 0; @@ -93,7 +97,8 @@ int reached(xbt_state_t st){ mc_pair_reached_t pair_test = NULL; xbt_dynar_foreach(reached_pairs, cursor, pair_test){ - XBT_INFO("Pair reached #%d", pair_test->nb); + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)) + XBT_DEBUG("****** Pair reached #%d ******", pair_test->nb); if(automaton_state_compare(pair_test->automaton_state, st) == 0){ if(propositional_symbols_compare_value(pair_test->prop_ato, new_pair->prop_ato) == 0){ if(snapshot_compare(new_pair->system_state, pair_test->system_state) == 0){ @@ -104,12 +109,12 @@ int reached(xbt_state_t st){ MC_UNSET_RAW_MEM; return 1; - } + } }else{ - XBT_INFO("Different values of propositional symbols"); + XBT_DEBUG("Different values of propositional symbols"); } }else{ - XBT_INFO("Different automaton state"); + XBT_DEBUG("Different automaton state"); } } @@ -120,9 +125,7 @@ int reached(xbt_state_t st){ if(raw_mem_set) MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - + compare = 0; return 0; @@ -133,7 +136,7 @@ int reached(xbt_state_t st){ void set_pair_reached(xbt_state_t st){ - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_SET_RAW_MEM; @@ -142,7 +145,7 @@ void set_pair_reached(xbt_state_t st){ pair->nb = xbt_dynar_length(reached_pairs) + 1; pair->automaton_state = st; pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); - pair->system_state = MC_take_snapshot_liveness(); + pair->system_state = MC_take_snapshot(); /* Get values of propositional symbols */ unsigned int cursor = 0; @@ -152,7 +155,7 @@ void set_pair_reached(xbt_state_t st){ xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ f = (int_f_void_t)ps->function; - res = (*f)(); + res = f(); xbt_dynar_push_as(pair->prop_ato, int, res); } @@ -162,9 +165,92 @@ void set_pair_reached(xbt_state_t st){ if(raw_mem_set) MC_SET_RAW_MEM; - else + +} + +int visited(xbt_state_t st){ + + if(_sg_mc_visited == 0) + return 0; + + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + + MC_SET_RAW_MEM; + + mc_pair_visited_t new_pair = NULL; + new_pair = xbt_new0(s_mc_pair_visited_t, 1); + new_pair->automaton_state = st; + new_pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); + new_pair->system_state = MC_take_snapshot(); + + /* Get values of propositional symbols */ + int res; + int_f_void_t f; + unsigned int cursor = 0; + xbt_propositional_symbol_t ps = NULL; + xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ + f = (int_f_void_t)ps->function; + res = f(); + xbt_dynar_push_as(new_pair->prop_ato, int, res); + } + + MC_UNSET_RAW_MEM; + + if(xbt_dynar_is_empty(visited_pairs)){ + + MC_SET_RAW_MEM; + /* New pair visited */ + xbt_dynar_push(visited_pairs, &new_pair); + MC_UNSET_RAW_MEM; + + if(raw_mem_set) + MC_SET_RAW_MEM; + + return 0; + + }else{ + + MC_SET_RAW_MEM; + + cursor = 0; + mc_pair_visited_t pair_test = NULL; + + xbt_dynar_foreach(visited_pairs, cursor, pair_test){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)) + XBT_DEBUG("****** Pair visited #%d ******", cursor + 1); + if(automaton_state_compare(pair_test->automaton_state, st) == 0){ + if(propositional_symbols_compare_value(pair_test->prop_ato, new_pair->prop_ato) == 0){ + if(snapshot_compare(new_pair->system_state, pair_test->system_state) == 0){ + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + + return 1; + } + }else{ + XBT_DEBUG("Different values of propositional symbols"); + } + }else{ + XBT_DEBUG("Different automaton state"); + } + } + + if(xbt_dynar_length(visited_pairs) == _sg_mc_visited){ + xbt_dynar_remove_at(visited_pairs, 0, NULL); + } + + /* New pair visited */ + xbt_dynar_push(visited_pairs, &new_pair); + MC_UNSET_RAW_MEM; + + if(raw_mem_set) + MC_SET_RAW_MEM; + return 0; + + } } void MC_pair_delete(mc_pair_t pair){ @@ -199,7 +285,7 @@ int MC_automaton_evaluate_label(xbt_exp_label_t l){ xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, p){ if(strcmp(p->pred, l->u.predicat) == 0){ f = (int_f_void_t)p->function; - return (*f)(); + return f(); } } return -1; @@ -215,7 +301,22 @@ int MC_automaton_evaluate_label(xbt_exp_label_t l){ /********************* Double-DFS stateless *******************/ +void pair_visited_free(mc_pair_visited_t pair){ + if(pair){ + xbt_dynar_free(&(pair->prop_ato)); + MC_free_snapshot(pair->system_state); + xbt_free(pair); + } +} + +void pair_visited_free_voidp(void *p){ + pair_visited_free((mc_pair_visited_t) * (void **) p); +} + void pair_stateless_free(mc_pair_stateless_t pair){ + xbt_free(pair->graph_state->system_state); + xbt_free(pair->graph_state->proc_status); + xbt_free(pair->graph_state); xbt_free(pair); } @@ -235,7 +336,6 @@ mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r){ void pair_reached_free(mc_pair_reached_t pair){ if(pair){ - pair->automaton_state = NULL; xbt_dynar_free(&(pair->prop_ato)); MC_free_snapshot(pair->system_state); xbt_free(pair); @@ -248,11 +348,11 @@ void pair_reached_free_voidp(void *p){ void MC_ddfs_init(void){ - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + initial_state_liveness->raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - XBT_INFO("**************************************************"); - XBT_INFO("Double-DFS init"); - XBT_INFO("**************************************************"); + XBT_DEBUG("**************************************************"); + XBT_DEBUG("Double-DFS init"); + XBT_DEBUG("**************************************************"); mc_pair_stateless_t mc_initial_pair = NULL; mc_state_t initial_graph_state = NULL; @@ -271,10 +371,11 @@ void MC_ddfs_init(void){ } reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), pair_reached_free_voidp); + visited_pairs = xbt_dynar_new(sizeof(mc_pair_visited_t), pair_visited_free_voidp); successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL); /* Save the initial state */ - initial_snapshot_liveness = MC_take_snapshot_liveness(); + initial_state_liveness->snapshot = MC_take_snapshot(); MC_UNSET_RAW_MEM; @@ -290,7 +391,7 @@ void MC_ddfs_init(void){ MC_UNSET_RAW_MEM; if(cursor != 0){ - MC_restore_snapshot(initial_snapshot_liveness); + MC_restore_snapshot(initial_state_liveness->snapshot); MC_UNSET_RAW_MEM; } @@ -307,7 +408,7 @@ void MC_ddfs_init(void){ set_pair_reached(state); if(cursor != 0){ - MC_restore_snapshot(initial_snapshot_liveness); + MC_restore_snapshot(initial_state_liveness->snapshot); MC_UNSET_RAW_MEM; } @@ -317,7 +418,7 @@ void MC_ddfs_init(void){ } } - if(raw_mem_set) + if(initial_state_liveness->raw_mem_set) MC_SET_RAW_MEM; else MC_UNSET_RAW_MEM; @@ -328,7 +429,7 @@ void MC_ddfs_init(void){ void MC_ddfs(int search_cycle){ - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + //initial_state_liveness->raw_mem_set = (mmalloc_get_current_heap() == raw_heap); smx_process_t process; mc_pair_stateless_t current_pair = NULL; @@ -344,7 +445,7 @@ void MC_ddfs(int search_cycle){ _mc_property_automaton->current_state = current_pair->automaton_state; - XBT_INFO("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), search_cycle); + XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), search_cycle); mc_stats_pair->visited_pairs++; @@ -361,8 +462,11 @@ void MC_ddfs(int search_cycle){ mc_pair_stateless_t next_pair = NULL; mc_pair_stateless_t pair_succ; + + mc_pair_stateless_t remove_pair; + mc_pair_reached_t remove_pair_reached; - if(xbt_fifo_size(mc_stack_liveness) < MAX_DEPTH_LIVENESS){ + if(xbt_fifo_size(mc_stack_liveness) < _sg_mc_max_depth){ if(current_pair->requests > 0){ @@ -370,9 +474,11 @@ void MC_ddfs(int search_cycle){ /* Debug information */ - req_str = MC_request_to_string(req, value); - XBT_INFO("Execute: %s", req_str); - xbt_free(req_str); + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + req_str = MC_request_to_string(req, value); + XBT_DEBUG("Execute: %s", req_str); + xbt_free(req_str); + } MC_state_set_executed_request(current_pair->graph_state, req, value); @@ -388,6 +494,12 @@ void MC_ddfs(int search_cycle){ next_graph_state = MC_state_pair_new(); /* Get enabled process and insert it in the interleave set of the next graph_state */ + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ + XBT_DEBUG("Process %lu enabled with simcall : %d", process->pid, (&process->simcall)->call); + } + } + xbt_swag_foreach(process, simix_global->process_list){ if(MC_process_is_enabled(process)){ MC_state_interleave_process(next_graph_state, process); @@ -451,90 +563,235 @@ void MC_ddfs(int search_cycle){ }else{ - XBT_INFO("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id); + if(visited(pair_succ->automaton_state)){ + + XBT_DEBUG("Next pair already visited !"); + break; + + }else{ - XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id); - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; + XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; - MC_ddfs(search_cycle); + MC_ddfs(search_cycle); + + } } }else{ - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); + if(visited(pair_succ->automaton_state)){ + + XBT_DEBUG("Next pair already visited !"); + break; + + }else{ + + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); + } } }else{ + + if(visited(pair_succ->automaton_state)){ + + XBT_DEBUG("Next pair already visited !"); + break; + + }else{ - if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ + if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ - XBT_INFO("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id); + XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id); - set_pair_reached(pair_succ->automaton_state); + set_pair_reached(pair_succ->automaton_state); - search_cycle = 1; + search_cycle = 1; - XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); - } + } - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; - MC_ddfs(search_cycle); + MC_ddfs(search_cycle); + + } } - /* Restore system before checking others successors */ if(cursor != (xbt_dynar_length(successors) - 1)) MC_replay_liveness(mc_stack_liveness, 1); - - + } if(MC_state_interleave_size(current_pair->graph_state) > 0){ - XBT_INFO("Backtracking to depth %d", xbt_fifo_size(mc_stack_liveness)); + XBT_DEBUG("Backtracking to depth %d", xbt_fifo_size(mc_stack_liveness)); MC_replay_liveness(mc_stack_liveness, 0); } } + }else{ + + XBT_DEBUG("No more request to execute in this state, search evolution in Büchi Automaton."); + + MC_SET_RAW_MEM; + + /* Create the new expanded graph_state */ + next_graph_state = MC_state_pair_new(); + + xbt_dynar_reset(successors); + + MC_UNSET_RAW_MEM; + + + cursor= 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + + res = MC_automaton_evaluate_label(transition_succ->label); + + if(res == 1){ // enabled transition in automaton + MC_SET_RAW_MEM; + next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state)); + xbt_dynar_push(successors, &next_pair); + MC_UNSET_RAW_MEM; + } + + } + + cursor = 0; + + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + + res = MC_automaton_evaluate_label(transition_succ->label); + + if(res == 2){ // true transition in automaton + MC_SET_RAW_MEM; + next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state)); + xbt_dynar_push(successors, &next_pair); + MC_UNSET_RAW_MEM; + } + + } + + cursor = 0; + + xbt_dynar_foreach(successors, cursor, pair_succ){ + + if(search_cycle == 1){ + + if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ + + if(reached(pair_succ->automaton_state)){ + + XBT_INFO("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness) + 1); + + XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); + XBT_INFO("| ACCEPTANCE CYCLE |"); + XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); + XBT_INFO("Counter-example that violates formula :"); + MC_show_stack_liveness(mc_stack_liveness); + MC_dump_stack_liveness(mc_stack_liveness); + MC_print_statistics_pairs(mc_stats_pair); + xbt_abort(); + + }else{ + + XBT_INFO("Next pair (depth = %d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id); + + XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); + + } + + }else{ + + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); + + } + + + }else{ + + if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ + + set_pair_reached(pair_succ->automaton_state); + + search_cycle = 1; + + XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + + } + + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); + + } + + /* Restore system before checking others successors */ + if(cursor != xbt_dynar_length(successors) - 1) + MC_replay_liveness(mc_stack_liveness, 1); + + } + } }else{ - XBT_INFO("Max depth reached"); - + XBT_WARN("/!\\ Max depth reached ! /!\\ "); + if(current_pair->requests > 0){ + XBT_WARN("/!\\ But, there are still processes to interleave. Model-checker will not be able to ensure the soundness of the verification from now. /!\\ "); + XBT_WARN("Notice : the default value of max depth is 1000 but you can change it with cfg=model-check/max_depth:value."); + } + } - if(xbt_fifo_size(mc_stack_liveness) == MAX_DEPTH_LIVENESS ){ - XBT_INFO("Pair (depth = %d) shifted in stack, maximum depth reached", xbt_fifo_size(mc_stack_liveness) ); + if(xbt_fifo_size(mc_stack_liveness) == _sg_mc_max_depth ){ + XBT_DEBUG("Pair (depth = %d) shifted in stack, maximum depth reached", xbt_fifo_size(mc_stack_liveness) ); }else{ - XBT_INFO("Pair (depth = %d) shifted in stack", xbt_fifo_size(mc_stack_liveness) ); + XBT_DEBUG("Pair (depth = %d) shifted in stack", xbt_fifo_size(mc_stack_liveness) ); } MC_SET_RAW_MEM; - xbt_fifo_shift(mc_stack_liveness); + remove_pair = xbt_fifo_shift(mc_stack_liveness); + xbt_fifo_remove(mc_stack_liveness, remove_pair); + remove_pair = NULL; if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){ - xbt_dynar_pop(reached_pairs, NULL); + remove_pair_reached = xbt_dynar_pop_as(reached_pairs, mc_pair_reached_t); + pair_reached_free(remove_pair_reached); + remove_pair_reached = NULL; } MC_UNSET_RAW_MEM; - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; + /*if(initial_state_liveness->raw_mem_set) + MC_SET_RAW_MEM;*/ }