X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/da4f14aac80fb8e604d839717a53f8c6dae1535e..a8c9a764fa0d66251c5b954663ee192facbd94c1:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index 722d6ee111..98eb2d4ee2 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -11,29 +11,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, "Logging specific to algorithms for liveness properties verification"); xbt_dynar_t reached_pairs; -xbt_dynar_t reached_pairs_hash; -xbt_dynar_t visited_pairs; -xbt_dynar_t visited_pairs_hash; xbt_dynar_t successors; -xbt_dynar_t hosts_table; - - -/* fast implementation of djb2 algorithm */ -unsigned int hash_region(char *str, int str_len){ - - int c; - register unsigned int hash = 5381; - - while (str_len--) { - c = *str++; - hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ - } - - return hash; - -} - int create_dump(int pair) { // Try to enable core dumps @@ -48,7 +27,7 @@ int create_dump(int pair) switch(fork()){ case 0: // We are the child process -- run the actual program - abort(); + xbt_abort(); break; case -1: @@ -75,327 +54,77 @@ int reached(xbt_state_t st){ raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - if(xbt_dynar_is_empty(reached_pairs)){ - - return 0; - - }else{ - - MC_SET_RAW_MEM; - - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn); - - xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL); - int res; - int_f_void_t f; - - /* Get values of propositional symbols */ - 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(prop_ato, int, res); - } - - cursor = 0; - mc_pair_reached_t pair_test = NULL; - - xbt_dynar_foreach(reached_pairs, cursor, pair_test){ - XBT_INFO("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, prop_ato) == 0){ - if(snapshot_compare(pair_test->system_state, sn) == 0){ - - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - - return 1; - } - }else{ - XBT_INFO("Different values of propositional symbols"); - } - }else{ - XBT_INFO("Different automaton state"); - } - } - - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - - return 0; - - } -} - - -void set_pair_reached(xbt_state_t st){ - - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - MC_SET_RAW_MEM; - mc_pair_reached_t pair = NULL; - pair = xbt_new0(s_mc_pair_reached_t, 1); - pair->nb = xbt_dynar_length(reached_pairs) + 1; - pair->automaton_state = st; - pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); - pair->system_state = xbt_new0(s_mc_snapshot_t, 1); - //pair->rdv_points = xbt_dict_new(); - MC_take_snapshot_liveness(pair->system_state); - + mc_pair_reached_t new_pair = NULL; + new_pair = xbt_new0(s_mc_pair_reached_t, 1); + 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(); + /* Get values of propositional symbols */ - unsigned int cursor = 0; - xbt_propositional_symbol_t ps = NULL; 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(pair->prop_ato, int, res); + xbt_dynar_push_as(new_pair->prop_ato, int, res); } - - xbt_dynar_push(reached_pairs, &pair); - - create_dump(xbt_dynar_length(reached_pairs)); MC_UNSET_RAW_MEM; + + if(xbt_dynar_is_empty(reached_pairs) || !compare){ - if(raw_mem_set) MC_SET_RAW_MEM; - else + /* New pair reached */ + xbt_dynar_push(reached_pairs, &new_pair); MC_UNSET_RAW_MEM; - -} - - -int reached_hash(xbt_state_t st){ - - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - - if(xbt_dynar_is_empty(reached_pairs_hash)){ + if(raw_mem_set) + MC_SET_RAW_MEM; + return 0; }else{ MC_SET_RAW_MEM; - - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn); - - int j; - unsigned int hash_regions[sn->num_reg]; - for(j=0; jnum_reg; j++){ - hash_regions[j] = hash_region(sn->regions[j]->data, sn->regions[j]->size); - } - - - /* Get values of propositional symbols */ - xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL); - unsigned int cursor = 0; - xbt_propositional_symbol_t ps = NULL; - int res; - int_f_void_t f; - - xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ - f = (int_f_void_t)ps->function; - res = (*f)(); - xbt_dynar_push_as(prop_ato, int, res); - } - - mc_pair_reached_hash_t pair_test = NULL; - - int region_diff = 0; - + cursor = 0; - - xbt_dynar_foreach(reached_pairs_hash, cursor, pair_test){ - + mc_pair_reached_t pair_test = NULL; + + xbt_dynar_foreach(reached_pairs, cursor, pair_test){ + XBT_INFO("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, prop_ato) == 0){ - for(j=0 ; j< sn->num_reg ; j++){ - if(hash_regions[j] != pair_test->hash_regions[j]){ - region_diff++; - } - } - if(region_diff == 0){ - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - + 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_INFO("Different snapshot"); - } + } }else{ XBT_INFO("Different values of propositional symbols"); } }else{ XBT_INFO("Different automaton state"); } - - region_diff = 0; } - - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - - return 0; + /* New pair reached */ + xbt_dynar_push(reached_pairs, &new_pair); - } -} - -void set_pair_reached_hash(xbt_state_t st){ - - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - - MC_SET_RAW_MEM; - - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn); - - mc_pair_reached_hash_t pair = NULL; - pair = xbt_new0(s_mc_pair_reached_hash_t, 1); - pair->automaton_state = st; - pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); - pair->hash_regions = malloc(sizeof(unsigned int) * sn->num_reg); - - int i; - - for(i=0 ; i< sn->num_reg ; i++){ - pair->hash_regions[i] = hash_region(sn->regions[i]->data, sn->regions[i]->size); - } - - /* Get values of propositional symbols */ - unsigned int cursor = 0; - xbt_propositional_symbol_t ps = NULL; - int res; - int_f_void_t f; - - xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ - f = (int_f_void_t)ps->function; - res = (*f)(); - xbt_dynar_push_as(pair->prop_ato, int, res); - } - - xbt_dynar_push(reached_pairs_hash, &pair); - - MC_free_snapshot(sn); - - MC_UNSET_RAW_MEM; - - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - -} - - -int visited(xbt_state_t st, int sc){ - - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - - if(xbt_dynar_is_empty(visited_pairs)){ - - return 0; - - }else{ - - MC_SET_RAW_MEM; - - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn); - - xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL); - - /* Get values of propositional symbols */ - unsigned int cursor = 0; - xbt_propositional_symbol_t ps = NULL; - int res; - int_f_void_t f; - - xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ - f = (int_f_void_t)ps->function; - res = (*f)(); - xbt_dynar_push_as(prop_ato, int, res); - } - - cursor = 0; - mc_pair_visited_t pair_test = NULL; - - xbt_dynar_foreach(visited_pairs, cursor, pair_test){ - if(pair_test->search_cycle == sc) { - if(automaton_state_compare(pair_test->automaton_state, st) == 0){ - if(propositional_symbols_compare_value(pair_test->prop_ato, prop_ato) == 0){ - if(snapshot_compare(pair_test->system_state, sn) == 0){ - - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - - return 1; - - }else{ - XBT_INFO("Different snapshot"); - } - }else{ - XBT_INFO("Different values of propositional symbols"); - } - }else{ - XBT_INFO("Different automaton state"); - } - }else{ - XBT_INFO("Different value of search_cycle"); - } - } - - - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); MC_UNSET_RAW_MEM; if(raw_mem_set) MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; + + compare = 0; return 0; @@ -403,121 +132,19 @@ int visited(xbt_state_t st, int sc){ } -int visited_hash(xbt_state_t st, int sc){ - - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - - if(xbt_dynar_is_empty(visited_pairs_hash)){ - - return 0; - - }else{ - - MC_SET_RAW_MEM; - - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn); - - int j; - unsigned int hash_regions[sn->num_reg]; - for(j=0; jnum_reg; j++){ - hash_regions[j] = hash_region(sn->regions[j]->data, sn->regions[j]->size); - } - - - /* Get values of propositional symbols */ - xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL); - unsigned int cursor = 0; - xbt_propositional_symbol_t ps = NULL; - int res; - int_f_void_t f; - - xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ - f = (int_f_void_t)ps->function; - res = (*f)(); - xbt_dynar_push_as(prop_ato, int, res); - } - - mc_pair_visited_hash_t pair_test = NULL; - - int region_diff = 0; - cursor = 0; - - xbt_dynar_foreach(visited_pairs_hash, cursor, pair_test){ - - if(pair_test->search_cycle == sc) { - if(automaton_state_compare(pair_test->automaton_state, st) == 0){ - if(propositional_symbols_compare_value(pair_test->prop_ato, prop_ato) == 0){ - for(j=0 ; j< sn->num_reg ; j++){ - if(hash_regions[j] != pair_test->hash_regions[j]){ - region_diff++; - } - } - if(region_diff == 0){ - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - - return 1; - }else{ - //XBT_INFO("Different snapshot"); - } - }else{ - //XBT_INFO("Different values of propositional symbols"); - } - }else{ - //XBT_INFO("Different automaton state"); - } - }else{ - //XBT_INFO("Different value of search_cycle"); - } - - region_diff = 0; - } - - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - - return 0; - - } -} - -void set_pair_visited_hash(xbt_state_t st, int sc){ +void set_pair_reached(xbt_state_t st){ raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_SET_RAW_MEM; - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn); - - mc_pair_visited_hash_t pair = NULL; - pair = xbt_new0(s_mc_pair_visited_hash_t, 1); + mc_pair_reached_t pair = NULL; + pair = xbt_new0(s_mc_pair_reached_t, 1); + pair->nb = xbt_dynar_length(reached_pairs) + 1; pair->automaton_state = st; pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); - pair->search_cycle = sc; - pair->hash_regions = malloc(sizeof(unsigned int) * sn->num_reg); - - int i; + pair->system_state = MC_take_snapshot_liveness(); - for(i=0 ; i< sn->num_reg ; i++){ - pair->hash_regions[i] = hash_region(sn->regions[i]->data, sn->regions[i]->size); - } - /* Get values of propositional symbols */ unsigned int cursor = 0; xbt_propositional_symbol_t ps = NULL; @@ -529,56 +156,14 @@ void set_pair_visited_hash(xbt_state_t st, int sc){ res = (*f)(); xbt_dynar_push_as(pair->prop_ato, int, res); } - - xbt_dynar_push(visited_pairs_hash, &pair); - MC_free_snapshot(sn); + xbt_dynar_push(reached_pairs, &pair); MC_UNSET_RAW_MEM; - - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - -} - -void set_pair_visited(xbt_state_t st, int sc){ - - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - - MC_SET_RAW_MEM; - - mc_pair_visited_t pair = NULL; - pair = xbt_new0(s_mc_pair_visited_t, 1); - pair->automaton_state = st; - pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); - pair->search_cycle = sc; - pair->system_state = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(pair->system_state); - - /* Get values of propositional symbols */ - unsigned int cursor = 0; - xbt_propositional_symbol_t ps = NULL; - int res; - int_f_void_t f; - - xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ - f = (int_f_void_t)ps->function; - res = (*f)(); - xbt_dynar_push_as(pair->prop_ato, int, res); - } - - xbt_dynar_push(visited_pairs, &pair); - - MC_UNSET_RAW_MEM; - if(raw_mem_set) MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - + } void MC_pair_delete(mc_pair_t pair){ @@ -629,12 +214,17 @@ int MC_automaton_evaluate_label(xbt_exp_label_t l){ /********************* Double-DFS stateless *******************/ -void MC_pair_stateless_delete(mc_pair_stateless_t pair){ +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); } +void pair_stateless_free_voidp(void *p){ + pair_stateless_free((mc_pair_stateless_t) * (void **) p); +} + mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r){ mc_pair_stateless_t p = NULL; p = xbt_new0(s_mc_pair_stateless_t, 1); @@ -645,6 +235,19 @@ mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r){ return p; } +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); + } +} + +void pair_reached_free_voidp(void *p){ + pair_reached_free((mc_pair_reached_t) * (void **) p); +} + void MC_ddfs_init(void){ raw_mem_set = (mmalloc_get_current_heap() == raw_heap); @@ -669,18 +272,15 @@ void MC_ddfs_init(void){ } } - reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL); - //reached_pairs_hash = xbt_dynar_new(sizeof(mc_pair_reached_hash_t), NULL); - //visited_pairs = xbt_dynar_new(sizeof(mc_pair_visited_t), NULL); - //visited_pairs_hash = xbt_dynar_new(sizeof(mc_pair_visited_hash_t), NULL); + reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), pair_reached_free_voidp); successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL); /* Save the initial state */ - initial_snapshot_liveness = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(initial_snapshot_liveness); + initial_state_liveness = xbt_new0(s_mc_global_t, 1); + initial_state_liveness->initial_snapshot = MC_take_snapshot_liveness(); MC_UNSET_RAW_MEM; - + unsigned int cursor = 0; xbt_state_t state; @@ -693,7 +293,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->initial_snapshot); MC_UNSET_RAW_MEM; } @@ -708,10 +308,9 @@ void MC_ddfs_init(void){ MC_UNSET_RAW_MEM; set_pair_reached(state); - //set_pair_reached_hash(state); if(cursor != 0){ - MC_restore_snapshot(initial_snapshot_liveness); + MC_restore_snapshot(initial_state_liveness->initial_snapshot); MC_UNSET_RAW_MEM; } @@ -748,7 +347,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++; @@ -765,15 +364,12 @@ 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){ - //set_pair_visited(current_pair->automaton_state, search_cycle); - //set_pair_visited_hash(current_pair->automaton_state, search_cycle); - - //XBT_INFO("Visited pairs : %lu", xbt_dynar_length(visited_pairs)); - //XBT_INFO("Visited pairs : %lu", xbt_dynar_length(visited_pairs_hash)); - if(current_pair->requests > 0){ while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ @@ -781,7 +377,7 @@ void MC_ddfs(int search_cycle){ /* Debug information */ req_str = MC_request_to_string(req, value); - XBT_INFO("Execute: %s", req_str); + XBT_DEBUG("Execute: %s", req_str); xbt_free(req_str); MC_state_set_executed_request(current_pair->graph_state, req, value); @@ -792,7 +388,6 @@ void MC_ddfs(int search_cycle){ /* Wait for requests (schedules processes) */ MC_wait_for_requests(); - MC_SET_RAW_MEM; /* Create the new expanded graph_state */ @@ -848,7 +443,6 @@ void MC_ddfs(int search_cycle){ if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ if(reached(pair_succ->automaton_state)){ - //if(reached_hash(pair_succ->automaton_state)){ XBT_INFO("Next pair (depth = %d, %u interleave) already reached !", xbt_fifo_size(mc_stack_liveness) + 1, MC_state_interleave_size(pair_succ->graph_state)); @@ -859,17 +453,13 @@ void MC_ddfs(int search_cycle){ MC_show_stack_liveness(mc_stack_liveness); MC_dump_stack_liveness(mc_stack_liveness); MC_print_statistics_pairs(mc_stats_pair); - exit(0); + xbt_abort(); }else{ - XBT_INFO("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); - - set_pair_reached(pair_succ->automaton_state); - //set_pair_reached_hash(pair_succ->automaton_state); + XBT_DEBUG("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)); - //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash)); + XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); MC_SET_RAW_MEM; xbt_fifo_unshift(mc_stack_liveness, pair_succ); @@ -881,54 +471,34 @@ void MC_ddfs(int search_cycle){ }else{ - //if(!visited_hash(pair_succ->automaton_state, search_cycle)){ - //if(!visited(pair_succ->automaton_state, search_cycle)){ - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); - - /*}else{ - - XBT_INFO("Next pair already visited ! "); - - }*/ - + 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))){ - XBT_INFO("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, 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_hash(pair_succ->automaton_state); search_cycle = 1; - XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); - //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash)); + XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); } - //if(!visited_hash(pair_succ->automaton_state, search_cycle)){ - //if(!visited(pair_succ->automaton_state, search_cycle)){ - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); - - /*}else{ - - XBT_INFO("Next pair already visited ! "); - - }*/ - + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); + } @@ -940,176 +510,39 @@ void MC_ddfs(int search_cycle){ } 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{ /*No request to execute, 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)){ - //if(reached_hash(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); - exit(0); - - }else{ - - XBT_INFO("Next pair (depth = %d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); - - set_pair_reached(pair_succ->automaton_state); - //set_pair_reached_hash(pair_succ->automaton_state); - - XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); - //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash)); - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); - - } - - }else{ - - //if(!visited_hash(pair_succ->automaton_state, search_cycle)){ - //if(!visited(pair_succ->automaton_state, search_cycle)){ - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); - - /*}else{ - - XBT_INFO("Next pair already visited ! "); - - }*/ - } - - - }else{ - - if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ - - set_pair_reached(pair_succ->automaton_state); - //set_pair_reached_hash(pair_succ->automaton_state); - - search_cycle = 1; - - XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); - //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash)); - - } - - //if(!visited_hash(pair_succ->automaton_state, search_cycle)){ - //if(!visited(pair_succ->automaton_state, search_cycle)){ - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); - - /*}else{ - - XBT_INFO("Next pair already visited ! "); - - }*/ - - } - - /* 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_DEBUG("Max depth reached"); } if(xbt_fifo_size(mc_stack_liveness) == MAX_DEPTH_LIVENESS ){ - XBT_INFO("Pair (graph=%p, automaton =%p, search_cycle = %d, depth = %d) shifted in stack, maximum depth reached", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) ); + XBT_DEBUG("Pair (depth = %d) shifted in stack, maximum depth reached", xbt_fifo_size(mc_stack_liveness) ); }else{ - XBT_INFO("Pair (graph=%p, automaton =%p, search_cycle = %d, depth = %d) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle, 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); - //xbt_dynar_pop(reached_pairs_hash, 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; }