X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0ddad0a8665a95e6f16b6f765efca789459a818d..7641e1b61b13d593d2eb86fc7cbcb6c8bcb89d8d:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index 32e8b3b308..74086a1842 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -70,11 +70,8 @@ int reached(xbt_automaton_t a){ xbt_dynar_foreach(reached_pairs, cursor, pair_test){ if(automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){ - //XBT_DEBUG("Same automaton state"); if(xbt_dynar_compare(pair_test->prop_ato, pair->prop_ato, propositional_symbols_compare_value) == 0){ - //XBT_DEBUG("Same values of propositional symbols"); if(snapshot_compare(pair_test->system_state, pair->system_state) == 0){ - //XBT_DEBUG("Same system state"); MC_UNSET_RAW_MEM; return 1; } @@ -171,334 +168,6 @@ int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l){ } - -/******************************* DFS with visited state *******************************/ - -xbt_dynar_t visited_pairs; - -void set_pair_visited(mc_pair_t pair, int sc){ - - MC_SET_RAW_MEM; - mc_visited_pair_t p = NULL; - p = xbt_new0(s_mc_visited_pair_t, 1); - p->pair = pair; - p->search_cycle = sc; - char hash[41]; - xbt_sha((const char *)&p, hash); - xbt_dynar_push(visited_pairs, &hash); - MC_UNSET_RAW_MEM; - -} - -int visited(mc_pair_t pair, int sc){ - - MC_SET_RAW_MEM; - - mc_visited_pair_t p = NULL; - p = xbt_new0(s_mc_visited_pair_t, 1); - p->pair = pair; - p->search_cycle = sc; - char hash[41]; - xbt_sha((const char *)&p, hash); - if(xbt_dynar_member(visited_pairs, hash)){ - MC_UNSET_RAW_MEM; - return 1; - }else{ - MC_UNSET_RAW_MEM; - return 0; - } -} - - -void MC_vddfs_stateful_init(xbt_automaton_t a){ - - XBT_DEBUG("**************************************************"); - XBT_DEBUG("Double-DFS stateful with visited state init"); - XBT_DEBUG("**************************************************"); - - mc_pair_t mc_initial_pair; - mc_state_t initial_graph_state; - smx_process_t process; - mc_snapshot_t init_snapshot; - - MC_wait_for_requests(); - - MC_SET_RAW_MEM; - - init_snapshot = xbt_new0(s_mc_snapshot_t, 1); - - initial_graph_state = MC_state_pair_new(); - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - MC_state_interleave_process(initial_graph_state, process); - } - } - - visited_pairs = xbt_dynar_new(sizeof(char *), NULL); - reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL); - - MC_take_snapshot(init_snapshot); - - MC_UNSET_RAW_MEM; - - unsigned int cursor = 0; - xbt_state_t state = NULL; - - xbt_dynar_foreach(a->states, cursor, state){ - if(state->type == -1){ - - MC_SET_RAW_MEM; - mc_initial_pair = new_pair(init_snapshot, initial_graph_state, state); - xbt_fifo_unshift(mc_stack_liveness_stateful, mc_initial_pair); - MC_UNSET_RAW_MEM; - - if(cursor == 0){ - MC_vddfs_stateful(a, 0, 0); - }else{ - MC_restore_snapshot(init_snapshot); - MC_UNSET_RAW_MEM; - MC_vddfs_stateful(a, 0, 0); - } - }else{ - if(state->type == 2){ - - MC_SET_RAW_MEM; - mc_initial_pair = new_pair(init_snapshot, initial_graph_state, state); - xbt_fifo_unshift(mc_stack_liveness_stateful, mc_initial_pair); - MC_UNSET_RAW_MEM; - - if(cursor == 0){ - MC_vddfs_stateful(a, 1, 0); - }else{ - MC_restore_snapshot(init_snapshot); - MC_UNSET_RAW_MEM; - MC_vddfs_stateful(a, 1, 0); - } - } - } - } -} - - -void MC_vddfs_stateful(xbt_automaton_t a, int search_cycle, int restore){ - - smx_process_t process = NULL; - - - if(xbt_fifo_size(mc_stack_liveness_stateful) == 0) - return; - - if(restore == 1){ - MC_restore_snapshot(((mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateful)))->system_state); - MC_UNSET_RAW_MEM; - } - - - /* Get current state */ - mc_pair_t current_pair = (mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateful)); - - if(restore == 1){ - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - MC_state_interleave_process(current_pair->graph_state, process); - } - } - } - - XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness_stateful), search_cycle); - XBT_DEBUG("Pair : graph=%p, automaton=%p(%s), %u interleave", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id,MC_state_interleave_size(current_pair->graph_state)); - - a->current_state = current_pair->automaton_state; - - mc_stats_pair->visited_pairs++; - - int value; - mc_state_t next_graph_state = NULL; - smx_req_t req = NULL; - char *req_str; - - - xbt_transition_t transition_succ; - unsigned int cursor; - int res; - - xbt_dynar_t successors = NULL; - - mc_pair_t next_pair = NULL; - mc_snapshot_t next_snapshot = NULL; - mc_snapshot_t current_snapshot = NULL; - mc_pair_t pair_succ = NULL; - - MC_SET_RAW_MEM; - successors = xbt_dynar_new(sizeof(mc_pair_t), NULL); - MC_UNSET_RAW_MEM; - - - while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ - - MC_SET_RAW_MEM; - current_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; - - - /* 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); - } - - MC_state_set_executed_request(current_pair->graph_state, req, value); - - /* Answer the request */ - SIMIX_request_pre(req, value); - - /* Wait for requests (schedules processes) */ - MC_wait_for_requests(); - - - /* Create the new expanded graph_state */ - MC_SET_RAW_MEM; - - 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)){ - MC_state_interleave_process(next_graph_state, process); - } - } - - next_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(next_snapshot); - - 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(a, transition_succ->label); - - if(res == 1){ - MC_SET_RAW_MEM; - next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst); - 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(a, transition_succ->label); - - if(res == 2){ - MC_SET_RAW_MEM; - next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst); - xbt_dynar_push(successors, &next_pair); - MC_UNSET_RAW_MEM; - } - } - - - - if(xbt_dynar_length(successors) == 0){ - - MC_SET_RAW_MEM; - next_pair = new_pair(next_snapshot, next_graph_state, current_pair->automaton_state); - xbt_dynar_push(successors, &next_pair); - MC_UNSET_RAW_MEM; - - } - - - //XBT_DEBUG("Successors length %lu", xbt_dynar_length(successors)); - - cursor = 0; - - xbt_dynar_foreach(successors, cursor, pair_succ){ - - /*XBT_DEBUG("Search reached pair %p : graph=%p, automaton=%p", pair_succ, pair_succ->graph_state, pair_succ->automaton_state); - char hash[41]; - XBT_DEBUG("Const char pair %s", (const char *)&pair_succ); - xbt_sha((const char *)&pair_succ, hash); - XBT_DEBUG("Hash pair_succ %s", hash);*/ - - if((search_cycle == 1) && (reached(a) == 1)){ - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("| ACCEPTANCE CYCLE |"); - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("Counter-example that violates formula :"); - MC_show_stack_liveness_stateful(mc_stack_liveness_stateful); - MC_dump_stack_liveness_stateful(mc_stack_liveness_stateful); - MC_print_statistics_pairs(mc_stats_pair); - exit(0); - } - - XBT_DEBUG("Search visited pair %p : graph %p, automaton %p", pair_succ, pair_succ->graph_state, pair_succ->automaton_state); - - if(visited(pair_succ, search_cycle) == 0){ - - //mc_stats_pair->executed_transitions++; - set_pair_visited(pair_succ, search_cycle); - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ); - MC_UNSET_RAW_MEM; - - MC_vddfs_stateful(a, search_cycle, 0); - - //XBT_DEBUG("Pair (graph=%p, automaton=%p) expanded", pair_succ->graph_state, pair_succ->automaton_state); - - if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ - - XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); - int res = set_pair_reached(a); - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ); - MC_UNSET_RAW_MEM; - - MC_vddfs_stateful(a, 1, 1); - - if(res){ - MC_SET_RAW_MEM; - xbt_dynar_pop(reached_pairs, NULL); - MC_UNSET_RAW_MEM; - } - - } - - }else{ - - XBT_DEBUG("Pair already visited !"); - } - - } - - - if(MC_state_interleave_size(current_pair->graph_state) > 0){ - MC_restore_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; - - } - } - - - MC_SET_RAW_MEM; - xbt_fifo_shift(mc_stack_liveness_stateful); - XBT_DEBUG("Pair (graph=%p, automaton =%p) shifted in stack", current_pair->graph_state, current_pair->automaton_state); - MC_UNSET_RAW_MEM; - - - -} - - - /********************* Double-DFS stateful without visited state *******************/ @@ -875,10 +544,10 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay){ } } - /* Get current state */ + /* Get current pair */ current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateless)); - /* Update current state in automaton */ + /* Update current state in buchi automaton */ a->current_state = current_pair->automaton_state; XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness_stateless), search_cycle);