X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ca2459a5a9672bb1764ee4a95e59c01c82dcea78..7641e1b61b13d593d2eb86fc7cbcb6c8bcb89d8d:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index 2ea1786d8e..74086a1842 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -5,7 +5,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, "Logging specific to algorithms for liveness properties verification"); xbt_dynar_t initial_pairs = NULL; -int max_pair = 0; xbt_dynar_t reached_pairs; extern mc_snapshot_t initial_snapshot; @@ -15,42 +14,108 @@ mc_pair_t new_pair(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st){ p->system_state = sn; p->automaton_state = st; p->graph_state = sg; - p->num = max_pair; - max_pair++; mc_stats_pair->expanded_pairs++; return p; } -int reached(mc_pair_t pair){ +int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ + + if(s1->num_reg != s2->num_reg) + return 1; + + int i; + for(i=0 ; i< s1->num_reg ; i++){ + + if(s1->regions[i]->size != s2->regions[i]->size) + return 1; + + if(s1->regions[i]->start_addr != s2->regions[i]->start_addr) + return 1; + + if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0) + return 1; + + } + + return 0; + +} + +int reached(xbt_automaton_t a){ if(xbt_dynar_is_empty(reached_pairs)){ - return 0; + return 0; }else{ MC_SET_RAW_MEM; - char hash[41]; - xbt_sha((const char *)&pair, hash); - if(xbt_dynar_member(reached_pairs, hash)){ - MC_UNSET_RAW_MEM; - return 1; - }else{ - MC_UNSET_RAW_MEM; - return 0; + + mc_pair_reached_t pair = NULL; + pair = xbt_new0(s_mc_pair_reached_t, 1); + pair->automaton_state = a->current_state; + pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); + pair->system_state = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot(pair->system_state); + + /* Get values of propositional symbols */ + unsigned int cursor = 0; + xbt_propositional_symbol_t ps = NULL; + xbt_dynar_foreach(a->propositional_symbols, cursor, ps){ + int (*f)() = ps->function; + int res = (*f)(); + xbt_dynar_push(pair->prop_ato, &res); } + + cursor = 0; + mc_pair_reached_t pair_test; + + xbt_dynar_foreach(reached_pairs, cursor, pair_test){ + if(automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){ + if(xbt_dynar_compare(pair_test->prop_ato, pair->prop_ato, propositional_symbols_compare_value) == 0){ + if(snapshot_compare(pair_test->system_state, pair->system_state) == 0){ + MC_UNSET_RAW_MEM; + return 1; + } + } + } + } + + MC_UNSET_RAW_MEM; + return 0; + } - } -void set_pair_reached(mc_pair_t pair){ +int set_pair_reached(xbt_automaton_t a){ + + if(reached(a) == 0){ - if(reached(pair) == 0){ MC_SET_RAW_MEM; - char hash[41]; - xbt_sha((const char *)&pair, hash); - xbt_dynar_push(reached_pairs, &hash); + + mc_pair_reached_t pair = NULL; + pair = xbt_new0(s_mc_pair_reached_t, 1); + pair->automaton_state = a->current_state; + pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); + pair->system_state = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot(pair->system_state); + + /* Get values of propositional symbols */ + unsigned int cursor = 0; + xbt_propositional_symbol_t ps = NULL; + xbt_dynar_foreach(a->propositional_symbols, cursor, ps){ + int (*f)() = ps->function; + int res = (*f)(); + xbt_dynar_push(pair->prop_ato, &res); + } + + xbt_dynar_push(reached_pairs, &pair); + MC_UNSET_RAW_MEM; + + return 1; + } + return 0; } void MC_pair_delete(mc_pair_t pair){ @@ -103,327 +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(char *), 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)); - - - 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;; - - - 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); - - successors = xbt_dynar_new(sizeof(mc_pair_t), NULL); - - 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(pair_succ) == 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++; - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ); - set_pair_visited(pair_succ, search_cycle); - 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))){ - - set_pair_reached(pair_succ); - XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ); - MC_UNSET_RAW_MEM; - - MC_vddfs_stateful(a, 1, 1); - - //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 *******************/ @@ -451,7 +195,7 @@ void MC_ddfs_stateful_init(xbt_automaton_t a){ } } - reached_pairs = xbt_dynar_new(sizeof(char *), NULL); + reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL); MC_take_snapshot(init_snapshot); @@ -499,30 +243,31 @@ void MC_ddfs_stateful_init(xbt_automaton_t a){ void MC_ddfs_stateful(xbt_automaton_t a, int search_cycle, int restore){ smx_process_t process = NULL; - + mc_pair_t current_pair = 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){ + current_pair = (mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateful)); + MC_restore_snapshot(current_pair->system_state); xbt_swag_foreach(process, simix_global->process_list){ if(MC_process_is_enabled(process)){ MC_state_interleave_process(current_pair->graph_state, process); } } + MC_UNSET_RAW_MEM; } + /* Get current state */ + current_pair = (mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateful)); + + 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; @@ -535,14 +280,16 @@ void MC_ddfs_stateful(xbt_automaton_t a, int search_cycle, int restore){ unsigned int cursor; int res; - xbt_dynar_t successors; + xbt_dynar_t successors = NULL; - mc_pair_t next_pair; - mc_snapshot_t next_snapshot; - mc_snapshot_t current_snapshot; + mc_pair_t next_pair = NULL; + mc_snapshot_t next_snapshot = NULL; + mc_snapshot_t current_snapshot = NULL; //sleep(1); - + 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){ @@ -555,7 +302,7 @@ void MC_ddfs_stateful(xbt_automaton_t a, int search_cycle, int restore){ /* Debug information */ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ req_str = MC_request_to_string(req, value); - XBT_DEBUG("%u Execute: %s", search_cycle, req_str); + XBT_DEBUG("Execute: %s", req_str); xbt_free(req_str); } @@ -582,41 +329,39 @@ void MC_ddfs_stateful(xbt_automaton_t a, int search_cycle, int restore){ next_snapshot = xbt_new0(s_mc_snapshot_t, 1); MC_take_snapshot(next_snapshot); - - successors = xbt_dynar_new(sizeof(mc_pair_t), NULL); + + xbt_dynar_reset(successors); MC_UNSET_RAW_MEM; - //xbt_dynar_reset(successors); cursor = 0; xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ res = MC_automaton_evaluate_label(a, transition_succ->label); - - MC_SET_RAW_MEM; if(res == 1){ // enabled transition in automaton + 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; } - 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); - - MC_SET_RAW_MEM; if(res == 2){ // transition always enabled in automaton + 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; } - MC_UNSET_RAW_MEM; + } @@ -636,7 +381,7 @@ void MC_ddfs_stateful(xbt_automaton_t a, int search_cycle, int restore){ //XBT_DEBUG("Search visited pair : graph=%p, automaton=%p", pair_succ->graph_state, pair_succ->automaton_state); - if((search_cycle == 1) && (reached(pair_succ) == 1)){ + if((search_cycle == 1) && (reached(a) == 1)){ XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); XBT_INFO("| ACCEPTANCE CYCLE |"); XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); @@ -658,7 +403,7 @@ void MC_ddfs_stateful(xbt_automaton_t a, int search_cycle, int restore){ if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ - set_pair_reached(pair_succ); + int res = set_pair_reached(a); XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); MC_SET_RAW_MEM; @@ -667,14 +412,17 @@ void MC_ddfs_stateful(xbt_automaton_t a, int search_cycle, int restore){ MC_ddfs_stateful(a, 1, 1); - //MC_SET_RAW_MEM; - xbt_dynar_pop(reached_pairs, NULL); - //MC_UNSET_RAW_MEM; + if(res){ + MC_SET_RAW_MEM; + xbt_dynar_pop(reached_pairs, NULL); + MC_UNSET_RAW_MEM; + } } } if(MC_state_interleave_size(current_pair->graph_state) > 0){ + XBT_DEBUG("Backtracking to depth %u", xbt_fifo_size(mc_stack_liveness_stateful)); MC_restore_snapshot(current_snapshot); MC_UNSET_RAW_MEM; } @@ -710,43 +458,6 @@ mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st){ } -int reached_stateless(mc_pair_stateless_t pair){ - - if(xbt_dynar_is_empty(reached_pairs)){ - return 0; - }else{ - MC_SET_RAW_MEM; - - char hash[41] =""; - xbt_sha((const char*)&pair, hash); - XBT_DEBUG("Hash : %s", hash); - if(xbt_dynar_member(reached_pairs, hash)){ - XBT_DEBUG("Pair already reached"); - MC_UNSET_RAW_MEM; - return 1; - }else{ - MC_UNSET_RAW_MEM; - return 0; - } - } -} - -void set_pair_stateless_reached(mc_pair_stateless_t pair){ - - //MC_SET_RAW_MEM; - char hash[41] = ""; - xbt_sha((const char*)&pair, hash); - XBT_DEBUG("Hash to pushed %s", hash); - if(strcmp(hash, "da39a3ee5e6b4b0d3255bfef95601890afd80709") == 0){ - XBT_DEBUG("Error in hash, pair empty !"); - sleep(4); - } - - xbt_dynar_push(reached_pairs, &hash); - //MC_UNSET_RAW_MEM; - -} - void MC_ddfs_stateless_init(xbt_automaton_t a){ @@ -768,7 +479,11 @@ void MC_ddfs_stateless_init(xbt_automaton_t a){ } } - reached_pairs = xbt_dynar_new(sizeof(char *), NULL); + reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL); + + initial_snapshot = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot(initial_snapshot); + MC_UNSET_RAW_MEM; unsigned int cursor = 0; @@ -780,10 +495,6 @@ void MC_ddfs_stateless_init(xbt_automaton_t a){ MC_SET_RAW_MEM; mc_initial_pair = new_pair_stateless(initial_graph_state, state); xbt_fifo_unshift(mc_stack_liveness_stateless, mc_initial_pair); - - initial_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(initial_snapshot); - MC_UNSET_RAW_MEM; if(cursor == 0){ @@ -799,10 +510,6 @@ void MC_ddfs_stateless_init(xbt_automaton_t a){ MC_SET_RAW_MEM; mc_initial_pair = new_pair_stateless(initial_graph_state, state); xbt_fifo_unshift(mc_stack_liveness_stateless, mc_initial_pair); - - initial_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(initial_snapshot); - MC_UNSET_RAW_MEM; if(cursor == 0){ @@ -837,28 +544,18 @@ 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 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); 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)); - //sleep(1); mc_stats_pair->visited_pairs++; - /*if(MC_state_interleave_size(current_pair->graph_state) == 0 && (current_pair->automaton_state->type == 1)){ - xbt_fifo_shift(mc_stack_liveness_stateless); - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("| ACCEPTANCE CYCLE |"); - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("Counter-example that violates formula :"); - MC_show_stack_liveness_stateless(mc_stack_liveness_stateless); - MC_dump_stack_liveness_stateless(mc_stack_liveness_stateless); - MC_print_statistics_pairs(mc_stats_pair); - exit(0); - }*/ - int value; mc_state_t next_graph_state = NULL; smx_req_t req = NULL; @@ -879,7 +576,6 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay){ while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ - //XBT_DEBUG("Interleave size %u", MC_state_interleave_size(current_pair->graph_state)); /* Debug information */ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ @@ -900,8 +596,8 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay){ MC_SET_RAW_MEM; - /* Create the new expanded graph_state */ + /* Create the new expanded graph_state */ next_graph_state = MC_state_pair_new(); /* Get enabled process and insert it in the interleave set of the next graph_state */ @@ -915,8 +611,7 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay){ MC_UNSET_RAW_MEM; - - + cursor= 0; xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ @@ -954,13 +649,11 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay){ MC_UNSET_RAW_MEM; } - cursor = 0; - - //XBT_DEBUG("Successors length %lu", xbt_dynar_length(successors)); + cursor = 0; xbt_dynar_foreach(successors, cursor, pair_succ){ - if((search_cycle == 1) && (reached_stateless(pair_succ) == 1)){ + if((search_cycle == 1) && (reached(a) == 1)){ XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); XBT_INFO("| ACCEPTANCE CYCLE |"); XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); @@ -977,14 +670,11 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay){ MC_ddfs_stateless(a, search_cycle, 0); - - - //XBT_DEBUG("Stack size %u", xbt_fifo_size(mc_stack_liveness_stateless)); - + 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); - set_pair_stateless_reached(pair_succ); + XBT_DEBUG("Acceptance pair %p : graph=%p, automaton=%p(%s)", pair_succ, 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_stateless, pair_succ); @@ -992,9 +682,11 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay){ MC_ddfs_stateless(a, 1, 1); - MC_SET_RAW_MEM; - xbt_dynar_pop(reached_pairs, NULL); - MC_UNSET_RAW_MEM; + if(res){ + MC_SET_RAW_MEM; + xbt_dynar_pop(reached_pairs, NULL); + MC_UNSET_RAW_MEM; + } } }