X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/86942626354f3a1b1df9404a9324a9dbfb955c9a..7f06482332409f552ac19d126fa69520ade79fcb:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index 9fdfaa7190..561d3653b9 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -42,8 +42,10 @@ static int is_reached_acceptance_pair(mc_pair_t pair){ if(xbt_dynar_is_empty(acceptance_pairs)){ MC_SET_RAW_MEM; - if(pair->graph_state->system_state == NULL) + if(pair->graph_state->system_state == NULL){ pair->graph_state->system_state = MC_take_snapshot(); + pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap); + } xbt_dynar_push(acceptance_pairs, &pair); MC_UNSET_RAW_MEM; @@ -56,9 +58,11 @@ static int is_reached_acceptance_pair(mc_pair_t pair){ MC_SET_RAW_MEM; - if(pair->graph_state->system_state == NULL) + if(pair->graph_state->system_state == NULL){ pair->graph_state->system_state = MC_take_snapshot(); - + pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap); + } + size_t current_bytes_used = pair->heap_bytes_used; int current_nb_processes = pair->nb_processes; @@ -79,14 +83,14 @@ static int is_reached_acceptance_pair(mc_pair_t pair){ nb_processes_test = pair_test->nb_processes; if(nb_processes_test < current_nb_processes) start = cursor + 1; - if(nb_processes_test > current_nb_processes) + else if(nb_processes_test > current_nb_processes) end = cursor - 1; - if(nb_processes_test == current_nb_processes){ + else if(nb_processes_test == current_nb_processes){ if(bytes_used_test < current_bytes_used) start = cursor + 1; - if(bytes_used_test > current_bytes_used) + else if(bytes_used_test > current_bytes_used) end = cursor - 1; - if(bytes_used_test == current_bytes_used){ + else if(bytes_used_test == current_bytes_used){ same_processes_and_bytes_not_found = 0; if(xbt_automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){ if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, pair->atomic_propositions) == 0){ @@ -148,7 +152,8 @@ static int is_reached_acceptance_pair(mc_pair_t pair){ if(bytes_used_test < current_bytes_used) xbt_dynar_insert_at(acceptance_pairs, cursor + 1, &pair); else - xbt_dynar_insert_at(acceptance_pairs, cursor, &pair); + xbt_dynar_insert_at(acceptance_pairs, cursor, &pair); + MC_UNSET_RAW_MEM; @@ -169,8 +174,10 @@ static void set_acceptance_pair_reached(mc_pair_t pair){ if(xbt_dynar_is_empty(acceptance_pairs)){ MC_SET_RAW_MEM; - if(pair->graph_state->system_state == NULL) + if(pair->graph_state->system_state == NULL){ pair->graph_state->system_state = MC_take_snapshot(); + pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap); + } xbt_dynar_push(acceptance_pairs, &pair); MC_UNSET_RAW_MEM; @@ -178,8 +185,10 @@ static void set_acceptance_pair_reached(mc_pair_t pair){ MC_SET_RAW_MEM; - if(pair->graph_state->system_state == NULL) + if(pair->graph_state->system_state == NULL){ pair->graph_state->system_state = MC_take_snapshot(); + pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap); + } size_t current_bytes_used = pair->heap_bytes_used; int current_nb_processes = pair->nb_processes; @@ -227,9 +236,20 @@ static void set_acceptance_pair_reached(mc_pair_t pair){ static void remove_acceptance_pair(mc_pair_t pair){ - int index = xbt_dynar_search_or_negative(acceptance_pairs, pair); - if(index != -1) - xbt_dynar_remove_at(acceptance_pairs, index, NULL); + unsigned int cursor = 0; + mc_pair_t pair_test; + int pair_found = 0; + + xbt_dynar_foreach(acceptance_pairs, cursor, pair_test){ + if(pair_test->num == pair->num){ + pair_found = 1; + break; + } + } + + if(pair_found) + xbt_dynar_remove_at(acceptance_pairs, cursor, NULL); + pair->acceptance_removed = 1; if(pair->stack_removed && pair->acceptance_removed){ @@ -290,18 +310,17 @@ static int is_visited_pair(mc_pair_t pair){ nb_processes_test = pair_test->nb_processes; if(nb_processes_test < current_nb_processes) start = cursor + 1; - if(nb_processes_test > current_nb_processes) + else if(nb_processes_test > current_nb_processes) end = cursor - 1; - if(nb_processes_test == current_nb_processes){ + else if(nb_processes_test == current_nb_processes){ if(bytes_used_test < current_bytes_used) start = cursor + 1; - if(bytes_used_test > current_bytes_used) + else if(bytes_used_test > current_bytes_used) end = cursor - 1; - if(bytes_used_test == current_bytes_used){ + else if(bytes_used_test == current_bytes_used){ same_processes_and_bytes_not_found = 0; if(xbt_automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){ if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, pair->atomic_propositions) == 0){ - XBT_DEBUG("Pair %d", pair_test->num); if(snapshot_compare(pair->graph_state->system_state, pair_test->graph_state->system_state) == 0){ xbt_dynar_remove_at(visited_pairs, cursor, NULL); xbt_dynar_insert_at(visited_pairs, cursor, &pair); @@ -316,8 +335,6 @@ static int is_visited_pair(mc_pair_t pair){ MC_pair_delete(pair_test); } } - - XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", pair->num, pair_test->num); if(raw_mem_set) MC_SET_RAW_MEM; else @@ -335,7 +352,6 @@ static int is_visited_pair(mc_pair_t pair){ break; if(xbt_automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){ if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, pair->atomic_propositions) == 0){ - XBT_DEBUG("Pair %d", pair_test->num); if(snapshot_compare(pair->graph_state->system_state, pair_test->graph_state->system_state) == 0){ xbt_dynar_remove_at(visited_pairs, previous_cursor, NULL); xbt_dynar_insert_at(visited_pairs, previous_cursor, &pair); @@ -350,7 +366,6 @@ static int is_visited_pair(mc_pair_t pair){ MC_pair_delete(pair_test); } } - XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", pair->num, pair_test->num); if(raw_mem_set) MC_SET_RAW_MEM; else @@ -369,7 +384,6 @@ static int is_visited_pair(mc_pair_t pair){ break; if(xbt_automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){ if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, pair->atomic_propositions) == 0){ - XBT_DEBUG("Pair %d", pair_test->num); if(snapshot_compare(pair->graph_state->system_state, pair_test->graph_state->system_state) == 0){ xbt_dynar_remove_at(visited_pairs, next_cursor, NULL); xbt_dynar_insert_at(visited_pairs, next_cursor, &pair); @@ -384,7 +398,6 @@ static int is_visited_pair(mc_pair_t pair){ MC_pair_delete(pair_test); } } - XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", pair->num, pair_test->num); if(raw_mem_set) MC_SET_RAW_MEM; else @@ -424,11 +437,6 @@ static int is_visited_pair(mc_pair_t pair){ } - /*cursor = 0; - xbt_dynar_foreach(visited_pairs, cursor, pair_test){ - fprintf(stderr, "Visited pair %d, nb_processes %d and heap_bytes_used %zu\n", pair_test->num, pair_test->nb_processes, pair_test->heap_bytes_used); - }*/ - MC_UNSET_RAW_MEM; if(raw_mem_set) @@ -440,32 +448,29 @@ static int is_visited_pair(mc_pair_t pair){ } -static int MC_automaton_evaluate_label(xbt_automaton_exp_label_t l){ +static int MC_automaton_evaluate_label(xbt_automaton_exp_label_t l, xbt_dynar_t atomic_propositions_values){ switch(l->type){ case 0 : { - int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp); - int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp); + int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp, atomic_propositions_values); + int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp, atomic_propositions_values); return (left_res || right_res); } case 1 : { - int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp); - int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp); + int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp, atomic_propositions_values); + int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp, atomic_propositions_values); return (left_res && right_res); } case 2 : { - int res = MC_automaton_evaluate_label(l->u.exp_not); + int res = MC_automaton_evaluate_label(l->u.exp_not, atomic_propositions_values); return (!res); } case 3 : { unsigned int cursor = 0; xbt_automaton_propositional_symbol_t p = NULL; - int_f_void_t f; 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(); - } + if(strcmp(p->pred, l->u.predicat) == 0) + return (int)xbt_dynar_get_as(atomic_propositions_values, cursor, int); } return -1; } @@ -501,6 +506,7 @@ void MC_ddfs_init(void){ successors = xbt_dynar_new(sizeof(mc_pair_t), NULL); initial_state_liveness->snapshot = MC_take_snapshot(); + initial_state_liveness->prev_pair = 0; MC_UNSET_RAW_MEM; @@ -525,17 +531,19 @@ void MC_ddfs_init(void){ } initial_pair->requests = MC_state_interleave_size(initial_pair->graph_state); + initial_pair->search_cycle = 0; xbt_fifo_unshift(mc_stack_liveness, initial_pair); MC_UNSET_RAW_MEM; + MC_ddfs(); + if(cursor != 0){ MC_restore_snapshot(initial_state_liveness->snapshot); MC_UNSET_RAW_MEM; } - - MC_ddfs(0); + }else if(automaton_state->type == 2){ /* Acceptance automaton state */ @@ -554,19 +562,20 @@ void MC_ddfs_init(void){ } initial_pair->requests = MC_state_interleave_size(initial_pair->graph_state); + initial_pair->search_cycle = 1; xbt_fifo_unshift(mc_stack_liveness, initial_pair); MC_UNSET_RAW_MEM; set_acceptance_pair_reached(initial_pair); + + MC_ddfs(); if(cursor != 0){ MC_restore_snapshot(initial_state_liveness->snapshot); MC_UNSET_RAW_MEM; } - - MC_ddfs(1); } } @@ -579,7 +588,7 @@ void MC_ddfs_init(void){ } -void MC_ddfs(int search_cycle){ +void MC_ddfs(){ smx_process_t process; mc_pair_t current_pair = NULL; @@ -587,15 +596,13 @@ void MC_ddfs(int search_cycle){ if(xbt_fifo_size(mc_stack_liveness) == 0) return; - /* Get current pair */ current_pair = (mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness)); /* Update current state in buchi automaton */ _mc_property_automaton->current_state = current_pair->automaton_state; - - XBT_DEBUG("********************* ( 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), current_pair->search_cycle); mc_stats->visited_pairs++; @@ -606,373 +613,315 @@ void MC_ddfs(int search_cycle){ xbt_automaton_transition_t transition_succ; unsigned int cursor = 0; int res; - int reached_num; + int reached_num, visited_num; + int new_pair = 0; mc_pair_t next_pair = NULL; - mc_pair_t pair_succ; + xbt_dynar_t prop_values = NULL; if(xbt_fifo_size(mc_stack_liveness) < _sg_mc_max_depth){ if(current_pair->requests > 0){ - while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ - - /* Debug information */ - - 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); - } + if(current_pair->search_cycle){ - MC_state_set_executed_request(current_pair->graph_state, req, value); - mc_stats->executed_transitions++; + if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){ + + if((reached_num = is_reached_acceptance_pair(current_pair)) != -1){ + + XBT_INFO("Pair %d already reached (equal to pair %d) !", current_pair->num, reached_num); + + MC_SET_RAW_MEM; + xbt_fifo_shift(mc_stack_liveness); + if(dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_state_liveness->prev_pair, reached_num, initial_state_liveness->prev_req); + MC_UNSET_RAW_MEM; - /* Answer the request */ - SIMIX_simcall_pre(req, value); + 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(mc_stats); + xbt_abort(); - /* Wait for requests (schedules processes) */ - MC_wait_for_requests(); + } + } + } - MC_SET_RAW_MEM; + if((visited_num = is_visited_pair(current_pair)) != -1){ - xbt_dynar_reset(successors); + XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", current_pair->num, visited_num); + MC_SET_RAW_MEM; + if(dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_state_liveness->prev_pair, visited_num, initial_state_liveness->prev_req); MC_UNSET_RAW_MEM; + + + }else{ + while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ - cursor= 0; - xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + MC_SET_RAW_MEM; + if(dot_output != NULL){ + if(initial_state_liveness->prev_pair != 0 && initial_state_liveness->prev_pair != current_pair->num){ + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_state_liveness->prev_pair, current_pair->num, initial_state_liveness->prev_req); + xbt_free(initial_state_liveness->prev_req); + } + initial_state_liveness->prev_pair = current_pair->num; + } + MC_UNSET_RAW_MEM; - res = MC_automaton_evaluate_label(transition_succ->label); + /* Debug information */ + 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); + } - if(res == 1){ // enabled transition in automaton + MC_SET_RAW_MEM; + if(dot_output != NULL){ + initial_state_liveness->prev_req = MC_request_get_dot_output(req, value); + if(current_pair->search_cycle) + fprintf(dot_output, "%d [shape=doublecircle];\n", current_pair->num); + } + MC_UNSET_RAW_MEM; + + MC_state_set_executed_request(current_pair->graph_state, req, value); + mc_stats->executed_transitions++; - MC_SET_RAW_MEM; + /* Answer the request */ + SIMIX_simcall_pre(req, value); + + /* Wait for requests (schedules processes) */ + MC_wait_for_requests(); - next_pair = MC_pair_new(); - next_pair->graph_state = MC_state_new(); - next_pair->automaton_state = transition_succ->dst; - next_pair->atomic_propositions = get_atomic_propositions_values(); + MC_SET_RAW_MEM; + prop_values = get_atomic_propositions_values(); + MC_UNSET_RAW_MEM; + + /* Evaluate enabled transition according to atomic propositions values */ + cursor= 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - /* 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)){ - MC_state_interleave_process(next_pair->graph_state, process); - } - } + res = MC_automaton_evaluate_label(transition_succ->label, prop_values); - next_pair->requests = MC_state_interleave_size(next_pair->graph_state); - - xbt_dynar_push(successors, &next_pair); + if(res == 1){ // enabled transition in automaton - MC_UNSET_RAW_MEM; - } + if(new_pair) + MC_replay_liveness(mc_stack_liveness, 1); - } + MC_SET_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 = MC_pair_new(); - next_pair->graph_state = MC_state_new(); - next_pair->automaton_state = transition_succ->dst; - next_pair->atomic_propositions = get_atomic_propositions_values(); + next_pair = MC_pair_new(); + next_pair->graph_state = MC_state_new(); + next_pair->automaton_state = transition_succ->dst; + next_pair->atomic_propositions = get_atomic_propositions_values(); - /* 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)){ - MC_state_interleave_process(next_pair->graph_state, process); + /* 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)){ + MC_state_interleave_process(next_pair->graph_state, process); + } } - } - next_pair->requests = MC_state_interleave_size(next_pair->graph_state); + next_pair->requests = MC_state_interleave_size(next_pair->graph_state); + + if(next_pair->automaton_state->type == 1 || next_pair->automaton_state->type == 2 || current_pair->search_cycle) + next_pair->search_cycle = 1; - xbt_dynar_push(successors, &next_pair); - - MC_UNSET_RAW_MEM; - } + xbt_fifo_unshift(mc_stack_liveness, next_pair); - } + if(mc_stats->expanded_pairs%1000000 == 0) + XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs); - cursor = 0; - - xbt_dynar_foreach(successors, cursor, pair_succ){ + MC_UNSET_RAW_MEM; - if(search_cycle == 1){ + new_pair = 1; - if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ - - if((reached_num = is_reached_acceptance_pair(pair_succ)) != -1){ - - XBT_INFO("Next pair (depth = %d, %u interleave) already reached (equal to state %d) !", xbt_fifo_size(mc_stack_liveness) + 1, MC_state_interleave_size(pair_succ->graph_state), reached_num); + MC_ddfs(); - 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(mc_stats); - xbt_abort(); + } - }else{ + } - if(is_visited_pair(pair_succ) != -1){ + /* Then, evaluate true transitions (always true, whatever atomic propositions values) */ + cursor = 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + + res = MC_automaton_evaluate_label(transition_succ->label, prop_values); + + if(res == 2){ // true transition in automaton - XBT_DEBUG("Next pair already visited !"); - continue; + if(new_pair) + MC_replay_liveness(mc_stack_liveness, 1); - }else{ - - 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; - - MC_ddfs(search_cycle); - + MC_SET_RAW_MEM; + + next_pair = MC_pair_new(); + next_pair->graph_state = MC_state_new(); + next_pair->automaton_state = transition_succ->dst; + next_pair->atomic_propositions = get_atomic_propositions_values(); + + /* 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)){ + MC_state_interleave_process(next_pair->graph_state, process); } - } - }else{ - - if(is_visited_pair(pair_succ) != -1){ - - XBT_DEBUG("Next pair already visited !"); - continue; - - }else{ - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); - } - - } - - }else{ - - if(is_visited_pair(pair_succ) != -1){ - - XBT_DEBUG("Next pair already visited !"); - continue; + next_pair->requests = MC_state_interleave_size(next_pair->graph_state); - }else{ - - if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ + if(next_pair->automaton_state->type == 1 || next_pair->automaton_state->type == 2 || current_pair->search_cycle) + next_pair->search_cycle = 1; - XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id); - - set_acceptance_pair_reached(pair_succ); + xbt_fifo_unshift(mc_stack_liveness, next_pair); - search_cycle = 1; + if(mc_stats->expanded_pairs%1000000 == 0) + XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs); + + MC_UNSET_RAW_MEM; - } + new_pair = 1; - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); + MC_ddfs(); } - + } - /* 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_DEBUG("Backtracking to depth %d", xbt_fifo_size(mc_stack_liveness)); + MC_replay_liveness(mc_stack_liveness, 0); + } + } - if(MC_state_interleave_size(current_pair->graph_state) > 0){ - XBT_DEBUG("Backtracking to depth %d", xbt_fifo_size(mc_stack_liveness)); - MC_replay_liveness(mc_stack_liveness, 0); - } } - }else{ mc_stats->executed_transitions++; - XBT_DEBUG("No more request to execute in this state, search evolution in Büchi Automaton."); - - MC_SET_RAW_MEM; - - xbt_dynar_reset(successors); - - MC_UNSET_RAW_MEM; + XBT_DEBUG("No request to execute in this state, search evolution in Büchi Automaton."); + if(current_pair->search_cycle){ - 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 + if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){ - MC_SET_RAW_MEM; + if((reached_num = is_reached_acceptance_pair(current_pair)) != -1){ + + XBT_INFO("Pair %d already reached (equal to pair %d) !", current_pair->num, reached_num); + + MC_SET_RAW_MEM; + xbt_fifo_shift(mc_stack_liveness); + MC_UNSET_RAW_MEM; - next_pair = MC_pair_new(); - next_pair->graph_state = MC_state_new(); - next_pair->automaton_state = transition_succ->dst; - next_pair->atomic_propositions = get_atomic_propositions_values(); - - /* 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)){ - MC_state_interleave_process(next_pair->graph_state, process); - } - } + 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(mc_stats); + xbt_abort(); - next_pair->requests = MC_state_interleave_size(next_pair->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; + if((visited_num = is_visited_pair(current_pair)) != -1){ - next_pair = MC_pair_new(); - next_pair->graph_state = MC_state_new(); - next_pair->automaton_state = transition_succ->dst; - next_pair->atomic_propositions = get_atomic_propositions_values(); - - /* 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)){ - MC_state_interleave_process(next_pair->graph_state, process); - } - } + XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", current_pair->num, visited_num); + + }else{ + + MC_SET_RAW_MEM; + prop_values = get_atomic_propositions_values(); + MC_UNSET_RAW_MEM; - next_pair->requests = MC_state_interleave_size(next_pair->graph_state); - - xbt_dynar_push(successors, &next_pair); - - MC_UNSET_RAW_MEM; - } + /* Evaluate enabled transition according to atomic propositions values */ + cursor= 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - } + res = MC_automaton_evaluate_label(transition_succ->label, prop_values); - cursor = 0; - - xbt_dynar_foreach(successors, cursor, pair_succ){ + if(res == 1){ // enabled transition in automaton - if(search_cycle == 1){ + if(new_pair) + MC_replay_liveness(mc_stack_liveness, 1); - if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ + MC_SET_RAW_MEM; - if((reached_num = is_reached_acceptance_pair(pair_succ)) != -1){ - - XBT_INFO("Next pair (depth = %d) already reached (equal to state %d)!", xbt_fifo_size(mc_stack_liveness) + 1, reached_num); - - 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(mc_stats); - xbt_abort(); - - }else{ - - if(is_visited_pair(pair_succ) != -1){ - - XBT_DEBUG("Next pair already visited !"); - break; - - }else{ - - XBT_INFO("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; - - MC_ddfs(search_cycle); + next_pair = MC_pair_new(); + next_pair->graph_state = MC_state_new(); + next_pair->automaton_state = transition_succ->dst; + next_pair->atomic_propositions = get_atomic_propositions_values(); + next_pair->requests = MC_state_interleave_size(next_pair->graph_state); - } + if(next_pair->automaton_state->type == 1 || next_pair->automaton_state->type == 2 || current_pair->search_cycle) + next_pair->search_cycle = 1; + + xbt_fifo_unshift(mc_stack_liveness, next_pair); - } + if(mc_stats->expanded_pairs%1000 == 0) + XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs); - }else{ - - if(is_visited_pair(pair_succ) != -1){ - - XBT_DEBUG("Next pair already visited !"); - break; - - }else{ + if(dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", current_pair->num, next_pair->num, ""); - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); + MC_UNSET_RAW_MEM; + + new_pair = 1; + + MC_ddfs(); - } - } - - }else{ + } + + /* Then, evaluate true transitions (always true, whatever atomic propositions values) */ + cursor = 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - if(is_visited_pair(pair_succ) != -1){ + res = MC_automaton_evaluate_label(transition_succ->label, prop_values); + + if(res == 2){ // true transition in automaton + + if(new_pair) + MC_replay_liveness(mc_stack_liveness, 1); - XBT_DEBUG("Next pair already visited !"); - break; + MC_SET_RAW_MEM; - }else{ + next_pair = MC_pair_new(); + next_pair->graph_state = MC_state_new(); + next_pair->automaton_state = transition_succ->dst; + next_pair->atomic_propositions = get_atomic_propositions_values(); + next_pair->requests = MC_state_interleave_size(next_pair->graph_state); + + if(next_pair->automaton_state->type == 1 || next_pair->automaton_state->type == 2 || current_pair->search_cycle) + next_pair->search_cycle = 1; - if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ + xbt_fifo_unshift(mc_stack_liveness, next_pair); - set_acceptance_pair_reached(pair_succ); - - search_cycle = 1; - - } + if(mc_stats->expanded_pairs%1000 == 0) + XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs); + + if(dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", current_pair->num, next_pair->num, ""); - 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); + new_pair = 1; + + MC_ddfs(); - } + } + } + } } }else{ @@ -980,22 +929,24 @@ void MC_ddfs(int search_cycle){ XBT_WARN("/!\\ Max depth reached ! /!\\ "); if(MC_state_interleave_size(current_pair->graph_state) > 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(_sg_mc_max_depth == 1000) + 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) == _sg_mc_max_depth ){ - XBT_DEBUG("Pair (depth = %d) shifted in stack, maximum depth reached", xbt_fifo_size(mc_stack_liveness) ); + XBT_DEBUG("Pair %d (depth = %d) shifted in stack, maximum depth reached", current_pair->num, xbt_fifo_size(mc_stack_liveness) ); }else{ - XBT_DEBUG("Pair (depth = %d) shifted in stack", xbt_fifo_size(mc_stack_liveness) ); + XBT_DEBUG("Pair %d (depth = %d) shifted in stack", current_pair->num, xbt_fifo_size(mc_stack_liveness) ); } MC_SET_RAW_MEM; - xbt_fifo_remove(mc_stack_liveness, current_pair); + xbt_dynar_free(&prop_values); + current_pair = xbt_fifo_shift(mc_stack_liveness); current_pair->stack_removed = 1; - if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){ + if(current_pair->search_cycle){ remove_acceptance_pair(current_pair); }else{ if(_sg_mc_visited == 0)