X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c46571ef338c2b981ed72a94c12e6bceda8ee0eb..df801effd71cdbc852ec2a588218e4e81c06cf07:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index 150ed78ea3..81c402d35e 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -4,540 +4,606 @@ 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 visited_pairs; xbt_dynar_t reached_pairs; -int expanded = 0; - -mc_pairs_t new_pair(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st){ - mc_pairs_t p = NULL; - p = xbt_new0(s_mc_pairs_t, 1); - 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; - -} - -void set_pair_visited(mc_state_t gs, xbt_state_t as, int sc){ +xbt_dynar_t reached_pairs_hash; +xbt_dynar_t visited_pairs; +xbt_dynar_t visited_pairs_hash; +xbt_dynar_t successors; - MC_SET_RAW_MEM; - mc_visited_pairs_t p = NULL; - p = xbt_new0(s_mc_visited_pairs_t, 1); - p->graph_state = gs; - p->automaton_state = as; - p->search_cycle = sc; - char *hash = malloc(sizeof(char)*128); - xbt_sha((char *)&p, hash); - xbt_dynar_push(visited_pairs, &hash); - MC_UNSET_RAW_MEM; -} +/* fast implementation of djb2 algorithm */ +unsigned int hash_region(char *str, int str_len){ -int reached(mc_state_t gs, xbt_state_t as ){ + int c; + register unsigned int hash = 5381; - /*mc_reached_pairs_t rp = NULL; - unsigned int c= 0; - unsigned int i; - int different_process; - - MC_SET_RAW_MEM; - xbt_dynar_foreach(reached_pairs, c, rp){ - if(rp->automaton_state == as){ - different_process=0; - for(i=0; i < gs->max_pid; i++){ - if(gs->proc_status[i].state != rp->graph_state->proc_status[i].state){ - different_process++; - } - } - if(different_process==0){ - MC_UNSET_RAW_MEM; - XBT_DEBUG("Pair (graph=%p, automaton=%p(%s)) already reached (graph=%p)!", gs, as, as->id, rp->graph_state); - return 1; - } - } + while (str_len--) { + c = *str++; + hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ } - MC_UNSET_RAW_MEM; - return 0;*/ - //XBT_DEBUG("Search acceptance pair already reach !"); - char* hash_reached = malloc(sizeof(char)*128); - unsigned int c= 0; + return hash; - MC_SET_RAW_MEM; - mc_reached_pairs_t p = NULL; - p = xbt_new0(s_mc_reached_pairs_t, 1); - p->graph_state = gs; - p->automaton_state = as; - char *hash = malloc(sizeof(char)*128); - xbt_sha((char *)&p, hash); - //XBT_DEBUG("Hash : %s", hash); - xbt_dynar_foreach(reached_pairs, c, hash_reached){ - if(strcmp(hash, hash_reached) == 0){ - MC_UNSET_RAW_MEM; - //XBT_DEBUG("Pair (graph=%p, automaton=%p(%s)) already reached !", gs, as, as->id); - return 1; - } - } - - MC_UNSET_RAW_MEM; - return 0; } -void set_pair_reached(mc_state_t gs, xbt_state_t as){ +int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ - //XBT_DEBUG("Set pair (graph=%p, automaton=%p) reached ", gs, as); - if(reached(gs, as) == 0){ - MC_SET_RAW_MEM; - mc_reached_pairs_t p = NULL; - p = xbt_new0(s_mc_reached_pairs_t, 1); - p->graph_state = gs; - p->automaton_state = as; - char *hash = malloc(sizeof(char)*128) ; - xbt_sha((char *)&p, hash); - xbt_dynar_push(reached_pairs, &hash); - //XBT_DEBUG("New reached pair : graph=%p, automaton=%p(%s)", gs, as, as->id); - MC_UNSET_RAW_MEM; + + if(s1->num_reg != s2->num_reg){ + XBT_DEBUG("Different num_reg (s1 = %d, s2 = %d)", s1->num_reg, s2->num_reg); + return 1; } -} + int i; + int errors = 0; -int visited(mc_state_t gs, xbt_state_t as, int sc){ - /*unsigned int c = 0; - mc_visited_pairs_t p = NULL; - unsigned int i; - int different_process; + for(i=0 ; i< s1->num_reg ; i++){ - //XBT_DEBUG("Visited pair length : %lu", xbt_dynar_length(visited_pairs)); + if(s1->regions[i]->type != s2->regions[i]->type){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different type of region"); + errors++; + }else{ + return 1; + } + } - MC_SET_RAW_MEM; - xbt_dynar_foreach(visited_pairs, c, p){ - //XBT_DEBUG("Test pair visited"); - //sleep(1); - if((p->automaton_state == as) && (p->search_cycle == sc)){ - different_process=0; - for(i=0; i < gs->max_pid; i++){ - if(gs->proc_status[i].state != p->graph_state->proc_status[i].state){ - different_process++; + switch(s1->regions[i]->type){ + case 0: + if(s1->regions[i]->size != s2->regions[i]->size){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different size of heap (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size); + errors++; + }else{ + return 1; } } - if(different_process==0){ - MC_UNSET_RAW_MEM; - return 1; + if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different start addr of heap (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); + errors++; + }else{ + return 1; + } + } + if(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data)){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different heap (mmalloc_compare)"); + errors++; + }else{ + return 1; + } + } + break; + case 1 : + if(s1->regions[i]->size != s2->regions[i]->size){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different size of libsimgrid (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size); + errors++; + }else{ + return 1; + } + } + if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); + errors++; + }else{ + return 1; + } + } + if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different memcmp for data in libsimgrid"); + errors++; + }else{ + return 1; + } + } + break; + /*case 2: + if(s1->regions[i]->size != s2->regions[i]->size){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different size of program (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size); + errors++; + }else{ + return 1; + } + } + if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different start addr of program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); + errors++; + }else{ + return 1; + } + } + if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different memcmp for data in program"); + errors++; + }else{ + return 1; + } } + break;*/ + case 3: + if(s1->regions[i]->size != s2->regions[i]->size){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different size of stack (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size); + errors++; + }else{ + return 1; + } + } + if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different start addr of stack (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); + errors++; + }else{ + return 1; + } + } + if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different memcmp for data in stack"); + errors++; + }else{ + return 1; + } + } + break; + default: + break; } } - MC_UNSET_RAW_MEM; - return 0;*/ - - //XBT_DEBUG("Test visited pair"); - char* hash_visited = malloc(sizeof(char)*128); - unsigned int c= 0; - - MC_SET_RAW_MEM; - mc_visited_pairs_t p = NULL; - p = xbt_new0(s_mc_visited_pairs_t, 1); - p->graph_state = gs; - p->automaton_state = as; - char *hash = malloc(sizeof(char)*128); - xbt_sha((char *)&p, hash); - //XBT_DEBUG("Hash : %s", hash); - xbt_dynar_foreach(visited_pairs, c, hash_visited){ - if(strcmp(hash, hash_visited) == 0){ - MC_UNSET_RAW_MEM; - return 1; - } + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + return (errors>0); + }else{ + return 0; } - MC_UNSET_RAW_MEM; - //XBT_DEBUG("End test visited pair"); - return 0; - } -void MC_dfs_init(xbt_automaton_t a){ +int reached(xbt_state_t st){ - XBT_DEBUG("**************************************************"); - XBT_DEBUG("DFS init"); - XBT_DEBUG("**************************************************"); - - mc_pairs_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; + if(xbt_dynar_is_empty(reached_pairs)){ - init_snapshot = xbt_new0(s_mc_snapshot_t, 1); + return 0; - 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); - } - } + }else{ - visited_pairs = xbt_dynar_new(sizeof(char *), NULL); - reached_pairs = xbt_dynar_new(sizeof(char *), NULL); + MC_SET_RAW_MEM; - MC_take_snapshot(init_snapshot); + 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)(); - MC_UNSET_RAW_MEM; + /* Get values of propositional symbols */ + unsigned int cursor = 0; + xbt_propositional_symbol_t ps = NULL; + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ + f = ps->function; + res = (*f)(); + xbt_dynar_push_as(prop_ato, int, res); + } - /* unsigned int cursor = 0; */ - /* xbt_state_t state = NULL; */ - /* int nb_init_state = 0; */ + cursor = 0; + mc_pair_reached_t pair_test = NULL; + + + xbt_dynar_foreach(reached_pairs, cursor, pair_test){ + if(automaton_state_compare(pair_test->automaton_state, st) == 0){ + if(propositional_symbols_compare_value(pair_test->prop_ato, prop_ato) == 0){ + XBT_DEBUG("Pair reached %d", cursor+1); + 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; + return 1; + } + } + } + } - /* xbt_dynar_foreach(a->states, cursor, state){ */ - /* if(state->type == -1){ */ + MC_free_snapshot(sn); + xbt_dynar_reset(prop_ato); + xbt_free(prop_ato); + MC_UNSET_RAW_MEM; + return 0; + + } +} - /* MC_SET_RAW_MEM; */ - /* mc_initial_pair = new_pair(init_snapshot, initial_graph_state, state); */ +void set_pair_reached(xbt_state_t st){ - /* xbt_fifo_unshift(mc_snapshot_stack, mc_initial_pair); */ + + MC_SET_RAW_MEM; + + mc_pair_reached_t pair = NULL; + pair = xbt_new0(s_mc_pair_reached_t, 1); + pair->automaton_state = st; + pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); + 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)(); - /* XBT_DEBUG("**************************************************"); */ - /* XBT_DEBUG("Initial state=%p ", mc_initial_pair); */ + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ + f = ps->function; + res = (*f)(); + xbt_dynar_push_as(pair->prop_ato, int, res); + } + + xbt_dynar_push(reached_pairs, &pair); - /* MC_UNSET_RAW_MEM; */ + MC_UNSET_RAW_MEM; + +} - /* set_pair_visited(mc_initial_pair->graph_state, mc_initial_pair->automaton_state, 0); */ - - /* if(nb_init_state == 0) */ - /* MC_dfs(a, 0, 0); */ - /* else */ - /* MC_dfs(a, 0, 1); */ - - /* nb_init_state++; */ - /* } */ - /* } */ +int reached_hash(xbt_state_t st){ - /* regarder dans l'automate toutes les transitions activables grâce à l'état initial du système - -> donnera les états initiaux de la propriété consistants avec l'état initial du système */ - unsigned int cursor = 0; - unsigned int cursor2 = 0; - xbt_state_t state = NULL; - int res; - xbt_transition_t transition_succ; - xbt_dynar_t successors = xbt_dynar_new(sizeof(mc_pairs_t), NULL); - mc_pairs_t pair_succ; + if(xbt_dynar_is_empty(reached_pairs_hash)){ - xbt_dynar_foreach(a->states, cursor, state){ - if(state->type == -1){ - xbt_dynar_foreach(state->out, cursor2, transition_succ){ - res = MC_automaton_evaluate_label(a, transition_succ->label); - - if((res == 1) || (res == 2)){ - - MC_SET_RAW_MEM; + return 0; - mc_initial_pair = new_pair(init_snapshot, initial_graph_state, transition_succ->dst); - xbt_dynar_push(successors, &mc_initial_pair); + }else{ - MC_UNSET_RAW_MEM; + 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); } - } - cursor = 0; - if(xbt_dynar_length(successors) == 0){ - 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, transition_succ->dst); - xbt_dynar_push(successors, &mc_initial_pair); - - MC_UNSET_RAW_MEM; - } + /* 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)(); + + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ + f = ps->function; + res = (*f)(); + xbt_dynar_push_as(prop_ato, int, res); } - } - cursor = 0; - xbt_dynar_foreach(successors, cursor, pair_succ){ - MC_SET_RAW_MEM; + mc_pair_reached_hash_t pair_test = NULL; - xbt_fifo_unshift(mc_snapshot_stack, pair_succ); - set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, 0); + int region_diff = 0; - MC_UNSET_RAW_MEM; + cursor = 0; - if(cursor == 0){ - MC_dfs(a, 0, 0); - }else{ - MC_dfs(a, 0, 1); + xbt_dynar_foreach(reached_pairs_hash, cursor, pair_test){ + + 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; + return 1; + } + } + } + + + region_diff = 0; } + + MC_free_snapshot(sn); + xbt_dynar_reset(prop_ato); + xbt_free(prop_ato); + MC_UNSET_RAW_MEM; + return 0; + } +} +void set_pair_reached_hash(xbt_state_t st){ + 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; - -void MC_dfs(xbt_automaton_t a, int search_cycle, int restore){ - - smx_process_t process = NULL; - - - if(xbt_fifo_size(mc_snapshot_stack) == 0) - return; - - if(restore == 1){ - MC_restore_snapshot(((mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack)))->system_state); - MC_UNSET_RAW_MEM; + 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)(); - - /* Get current state */ - mc_pairs_t current_pair = (mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack)); - - if(restore==1){ - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - //XBT_DEBUG("Pid : %lu", process->pid); - MC_state_interleave_process(current_pair->graph_state, process); - } - } + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ + f = ps->function; + res = (*f)(); + xbt_dynar_push_as(pair->prop_ato, int, res); } + + xbt_dynar_push(reached_pairs_hash, &pair); - XBT_DEBUG("************************************************** ( search_cycle = %d )", search_cycle); - XBT_DEBUG("State : 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_free_snapshot(sn); + MC_UNSET_RAW_MEM; + +} - mc_stats_pair->visited_pairs++; - int value; - mc_state_t next_graph_state = NULL; - smx_req_t req = NULL; - char *req_str; +int visited(xbt_state_t st, int sc){ - mc_pairs_t pair_succ; - xbt_transition_t transition_succ; - unsigned int cursor; - int res; - //int enabled_transition = 0; - xbt_dynar_t successors = xbt_dynar_new(sizeof(mc_pairs_t), NULL); + if(xbt_dynar_is_empty(visited_pairs)){ - mc_pairs_t next_pair; - mc_snapshot_t next_snapshot; - mc_snapshot_t current_snapshot; - - - while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ + return 0; - 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); - } + }else{ - MC_state_set_executed_request(current_pair->graph_state, req, value); + MC_SET_RAW_MEM; - /* Answer the request */ - SIMIX_request_pre(req, value); + mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(sn); - /* Wait for requests (schedules processes) */ - MC_wait_for_requests(); + 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)(); + + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ + f = ps->function; + res = (*f)(); + xbt_dynar_push_as(prop_ato, int, res); + } - /* Create the new expanded graph_state */ - MC_SET_RAW_MEM; + cursor = 0; + mc_pair_visited_t pair_test = NULL; - 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); + 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; + + return 1; + + } + } + } } } - next_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(next_snapshot); - - MC_UNSET_RAW_MEM; - xbt_dynar_reset(successors); + MC_free_snapshot(sn); + xbt_dynar_reset(prop_ato); + xbt_free(prop_ato); + MC_UNSET_RAW_MEM; + return 0; - 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) || (res == 2)){ // enabled transition in automaton - next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst); - xbt_dynar_push(successors, &next_pair); - } +int visited_hash(xbt_state_t st, int sc){ - MC_UNSET_RAW_MEM; - } - - if(xbt_dynar_length(successors) == 0){ + if(xbt_dynar_is_empty(visited_pairs_hash)){ - 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; - - } + return 0; + }else{ - cursor = 0; - xbt_dynar_foreach(successors, cursor, pair_succ){ - - //XBT_DEBUG("Search visited pair : graph=%p, automaton=%p", pair_succ->graph_state, pair_succ->automaton_state); - - if((search_cycle == 1) && (reached(pair_succ->graph_state, pair_succ->automaton_state) == 1)){ - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("| ACCEPTANCE CYCLE |"); - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("Counter-example that violates formula :"); - MC_show_snapshot_stack(mc_snapshot_stack); - MC_dump_snapshot_stack(mc_snapshot_stack); - MC_print_statistics_pairs(mc_stats_pair); - exit(0); - } - - if(visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle) == 0){ + MC_SET_RAW_MEM; - //XBT_DEBUG("Unvisited pair !"); + mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(sn); - mc_stats_pair->executed_transitions++; - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_snapshot_stack, pair_succ); - set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle); - MC_UNSET_RAW_MEM; + 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)(); + + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ + f = ps->function; + res = (*f)(); + xbt_dynar_push_as(prop_ato, int, res); + } - MC_dfs(a, search_cycle, 0); + mc_pair_visited_hash_t pair_test = NULL; - if((search_cycle == 0) && (current_pair->automaton_state->type == 1)){ + int region_diff = 0; + cursor = 0; - MC_restore_snapshot(current_pair->system_state); - MC_UNSET_RAW_MEM; - - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - //XBT_DEBUG("Pid : %lu", process->pid); - MC_state_interleave_process(current_pair->graph_state, process); + 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; + return 1; } } - - set_pair_reached(current_pair->graph_state, current_pair->automaton_state); - XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id); - MC_dfs(a, 1, 1); - } - }else{ - - XBT_DEBUG("Pair already visited !"); - } + + region_diff = 0; } + MC_free_snapshot(sn); + xbt_dynar_reset(prop_ato); + xbt_free(prop_ato); + MC_UNSET_RAW_MEM; + return 0; - if(MC_state_interleave_size(current_pair->graph_state) > 0){ - MC_restore_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; - //XBT_DEBUG("Snapshot restored"); - } } +} - +void set_pair_visited_hash(xbt_state_t st, int sc){ + MC_SET_RAW_MEM; - //remove_pair_reached(current_pair->graph_state); - xbt_fifo_shift(mc_snapshot_stack); - XBT_DEBUG("State (graph=%p, automaton =%p) shifted in snapshot_stack", current_pair->graph_state, current_pair->automaton_state); - MC_UNSET_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); + 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; -void MC_show_snapshot_stack(xbt_fifo_t stack){ - int value; - mc_pairs_t pair; - xbt_fifo_item_t item; - smx_req_t req; - char *req_str = NULL; + for(i=0 ; i< sn->num_reg ; i++){ + pair->hash_regions[i] = hash_region(sn->regions[i]->data, sn->regions[i]->size); + } - for (item = xbt_fifo_get_last_item(stack); - (item ? (pair = (mc_pairs_t) (xbt_fifo_get_item_content(item))) - : (NULL)); item = xbt_fifo_get_prev_item(item)) { - req = MC_state_get_executed_request(pair->graph_state, &value); - if(req){ - req_str = MC_request_to_string(req, value); - XBT_INFO("%s", req_str); - xbt_free(req_str); - } + /* Get values of propositional symbols */ + unsigned int cursor = 0; + xbt_propositional_symbol_t ps = NULL; + int res; + int (*f)(); + + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ + f = ps->function; + res = (*f)(); + xbt_dynar_push_as(pair->prop_ato, int, res); } + + xbt_dynar_push(visited_pairs_hash, &pair); + + MC_free_snapshot(sn); + + MC_UNSET_RAW_MEM; + } -void MC_dump_snapshot_stack(xbt_fifo_t stack){ - mc_pairs_t pair; +void set_pair_visited(xbt_state_t st, int sc){ + MC_SET_RAW_MEM; - while ((pair = (mc_pairs_t) xbt_fifo_pop(stack)) != NULL) - MC_pair_delete(pair); + + 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)(); + + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ + f = ps->function; + res = (*f)(); + xbt_dynar_push_as(pair->prop_ato, int, res); + } + + xbt_dynar_push(visited_pairs, &pair); + MC_UNSET_RAW_MEM; + + } -void MC_pair_delete(mc_pairs_t pair){ +void MC_pair_delete(mc_pair_t pair){ xbt_free(pair->graph_state->proc_status); xbt_free(pair->graph_state); - //xbt_free(pair->automaton_state); -> FIXME : à implémenter xbt_free(pair); } -int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l){ + +int MC_automaton_evaluate_label(xbt_exp_label_t l){ switch(l->type){ case 0 : { - int left_res = MC_automaton_evaluate_label(a, l->u.or_and.left_exp); - int right_res = MC_automaton_evaluate_label(a, l->u.or_and.right_exp); + 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); return (left_res || right_res); break; } case 1 : { - int left_res = MC_automaton_evaluate_label(a, l->u.or_and.left_exp); - int right_res = MC_automaton_evaluate_label(a, l->u.or_and.right_exp); + 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); return (left_res && right_res); break; } case 2 : { - int res = MC_automaton_evaluate_label(a, l->u.exp_not); + int res = MC_automaton_evaluate_label(l->u.exp_not); return (!res); break; } case 3 : { unsigned int cursor = 0; xbt_propositional_symbol_t p = NULL; - xbt_dynar_foreach(a->propositional_symbols, cursor, p){ + int (*f)(); + xbt_dynar_foreach(automaton->propositional_symbols, cursor, p){ if(strcmp(p->pred, l->u.predicat) == 0){ - int (*f)() = p->function; + f = p->function; return (*f)(); } } @@ -554,269 +620,480 @@ int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l){ } -/********************* Double DFS using color pair *********************/ - - - -/********************* DPOR without replay *********************/ +/********************* Double-DFS stateless *******************/ +void MC_pair_stateless_delete(mc_pair_stateless_t pair){ + xbt_free(pair->graph_state->proc_status); + xbt_free(pair->graph_state); + xbt_free(pair); +} +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); + p->automaton_state = st; + p->graph_state = sg; + p->requests = r; + mc_stats_pair->expanded_pairs++; + return p; +} -void MC_dpor_with_restore_snapshot_init(xbt_automaton_t a){ +void MC_ddfs_init(){ XBT_DEBUG("**************************************************"); - XBT_DEBUG("DPOR (with restore snapshot) init"); + XBT_DEBUG("Double-DFS init"); XBT_DEBUG("**************************************************"); - mc_pairs_t initial_pair; - mc_state_t initial_graph_state; + mc_pair_stateless_t mc_initial_pair = NULL; + mc_state_t initial_graph_state = NULL; smx_process_t process; - mc_snapshot_t initial_snapshot; - + MC_wait_for_requests(); MC_SET_RAW_MEM; - initial_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); - break; } } - visited_pairs = xbt_dynar_new(sizeof(mc_visited_pairs_t), NULL); - reached_pairs = xbt_dynar_new(sizeof(mc_reached_pairs_t), NULL); + 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); + successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL); - MC_take_snapshot(initial_snapshot); + /* Save the initial state */ + initial_snapshot_liveness = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_to_restore_liveness(initial_snapshot_liveness); MC_UNSET_RAW_MEM; unsigned int cursor = 0; - unsigned int cursor2 = 0; - xbt_state_t state = NULL; - int res; - xbt_transition_t transition_succ; + xbt_state_t state; - xbt_dynar_foreach(a->states, cursor, state){ + xbt_dynar_foreach(automaton->states, cursor, state){ if(state->type == -1){ - xbt_dynar_foreach(state->out, cursor2, transition_succ){ - res = MC_automaton_evaluate_label(a, transition_succ->label); - - if((res == 1) || (res == 2)){ - - MC_SET_RAW_MEM; - - initial_pair = new_pair(initial_snapshot, initial_graph_state, transition_succ->dst); - xbt_fifo_unshift(mc_snapshot_stack, initial_pair); + + MC_SET_RAW_MEM; + mc_initial_pair = new_pair_stateless(initial_graph_state, state, MC_state_interleave_size(initial_graph_state)); + xbt_fifo_unshift(mc_stack_liveness, mc_initial_pair); + MC_UNSET_RAW_MEM; + + if(cursor != 0){ + MC_restore_snapshot(initial_snapshot_liveness); + MC_UNSET_RAW_MEM; + } - MC_UNSET_RAW_MEM; - - /* Add pair to list of visited pairs*/ - set_pair_visited(initial_pair->graph_state, initial_pair->automaton_state, 0); + MC_ddfs(0); - MC_dpor_with_restore_snapshot(a, 0, 0); + }else{ + if(state->type == 2){ + + MC_SET_RAW_MEM; + mc_initial_pair = new_pair_stateless(initial_graph_state, state, MC_state_interleave_size(initial_graph_state)); + xbt_fifo_unshift(mc_stack_liveness, mc_initial_pair); + MC_UNSET_RAW_MEM; - break; + set_pair_reached(state); + //set_pair_reached_hash(state); - } + if(cursor != 0){ + MC_restore_snapshot(initial_snapshot_liveness); + MC_UNSET_RAW_MEM; + } + + MC_ddfs(1); + } } + } - if(xbt_fifo_size(mc_snapshot_stack)>0) - break; - } +} - /* Initial state of automaton is initial state for initial pair*/ - if(xbt_fifo_size(mc_snapshot_stack) == 0){ - cursor = 0; - - xbt_dynar_foreach(a->states, cursor, state){ - if(state->type == -1){ - - MC_SET_RAW_MEM; +void MC_ddfs(int search_cycle){ - initial_pair = new_pair(initial_snapshot, initial_graph_state, state); - xbt_fifo_unshift(mc_snapshot_stack, initial_pair); - - MC_UNSET_RAW_MEM; - - /* Add pair to list of visited pairs*/ - set_pair_visited(initial_pair->graph_state, initial_pair->automaton_state, 0); - - MC_dpor_with_restore_snapshot(a, 0, 0); - - break; - } - } + smx_process_t process; + mc_pair_stateless_t current_pair = NULL; - } + if(xbt_fifo_size(mc_stack_liveness) == 0) + return; -} + /* Get current pair */ + current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness)); -/* Test du dpor sans rejeu des états de la pile à partir de l'état initial du système mais avec restauration au milieu de l'arbre -> s'applique aux safety properties mais pas d'intégration pour les liveness */ -void MC_dpor_with_restore_snapshot(xbt_automaton_t a, int search_cycle, int restore){ + /* Update current state in buchi automaton */ + automaton->current_state = current_pair->automaton_state; - smx_process_t process = NULL; - - if(xbt_fifo_size(mc_snapshot_stack) == 0) - return; + + XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), 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++; + + sleep(1); int value; mc_state_t next_graph_state = NULL; - smx_req_t req = NULL, prev_req = NULL; + smx_req_t req = NULL; char *req_str; - xbt_fifo_item_t item = NULL; xbt_transition_t transition_succ; - unsigned int cursor; + unsigned int cursor = 0; int res; - mc_pairs_t next_pair; - mc_snapshot_t next_snapshot; - mc_snapshot_t current_snapshot; - mc_pairs_t current_pair; - mc_pairs_t prev_pair; - int new_pair_created; + mc_pair_stateless_t next_pair = NULL; + mc_pair_stateless_t pair_succ; - while(xbt_fifo_size(mc_snapshot_stack) > 0){ + if(xbt_fifo_size(mc_stack_liveness) < MAX_DEPTH_LIVENESS){ - current_pair = (mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack)); + //set_pair_visited(current_pair->automaton_state, search_cycle); + set_pair_visited_hash(current_pair->automaton_state, search_cycle); + //XBT_DEBUG("Visited pairs : %lu", xbt_dynar_length(visited_pairs)); + XBT_DEBUG("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){ + + /* 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); - XBT_DEBUG("**************************************************"); - XBT_DEBUG("Depth : %d, State : g=%p, a=%p(%s), %u interleave", xbt_fifo_size(mc_snapshot_stack),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++; + /* Answer the request */ + SIMIX_request_pre(req, value); - /* Add pair to list of visited pairs*/ - set_pair_visited(current_pair->graph_state, current_pair->automaton_state, search_cycle); + /* Wait for requests (schedules processes) */ + MC_wait_for_requests(); - if((xbt_fifo_size(mc_snapshot_stack) < MAX_DEPTH) && (req = MC_state_get_request(current_pair->graph_state, &value))){ - MC_SET_RAW_MEM; - current_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; + MC_SET_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); - } + /* Create the new expanded graph_state */ + next_graph_state = MC_state_pair_new(); - MC_state_set_executed_request(current_pair->graph_state, req, value); + /* 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); + } + } - /* 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(); + 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){ - /* Get an 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); - break; + 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_DEBUG("Next pair (depth = %d, %d interleave) already reached !", xbt_fifo_size(mc_stack_liveness) + 1, MC_state_interleave_size(pair_succ->graph_state)); + + 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_DEBUG("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("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + //XBT_DEBUG("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_DEBUG("Next pair already visited ! "); + + } + + } + + }else{ + + if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ + + XBT_DEBUG("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); + + search_cycle = 1; + + XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + //XBT_DEBUG("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_DEBUG("Next pair already visited ! "); + + } + + } + + + /* 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 %u", xbt_fifo_size(mc_stack_liveness)); + MC_replay_liveness(mc_stack_liveness, 0); } } - next_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(next_snapshot); - + + }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; - new_pair_created = 0; - - cursor = 0; + + 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) || (res == 2)){ - + res = MC_automaton_evaluate_label(transition_succ->label); + + if(res == 1){ // enabled transition in automaton MC_SET_RAW_MEM; - next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst); - xbt_fifo_unshift(mc_snapshot_stack, next_pair); + 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; - - new_pair_created = 1; - - break; - } + } - /* Pas d'avancement possible dans l'automate */ - if(new_pair_created == 0){ - - MC_SET_RAW_MEM; - next_pair = new_pair(next_snapshot,next_graph_state,current_pair->automaton_state); - xbt_fifo_unshift(mc_snapshot_stack, 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; + } } - - }else{ - XBT_DEBUG("There are no more processes to interleave."); - - /* Trash the current state, no longer needed */ - MC_SET_RAW_MEM; - xbt_fifo_shift(mc_snapshot_stack); - MC_UNSET_RAW_MEM; - while((current_pair = xbt_fifo_shift(mc_snapshot_stack)) != NULL){ - req = MC_state_get_internal_request(current_pair->graph_state); - xbt_fifo_foreach(mc_snapshot_stack, item, prev_pair, mc_pairs_t) { - if(MC_request_depend(req, MC_state_get_internal_request(prev_pair->graph_state))){ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - XBT_DEBUG("Dependent Transitions:"); - prev_req = MC_state_get_executed_request(prev_pair->graph_state, &value); - req_str = MC_request_to_string(prev_req, value); - XBT_DEBUG("%s (state=%p)", req_str, prev_pair->graph_state); - xbt_free(req_str); - prev_req = MC_state_get_executed_request(current_pair->graph_state, &value); - req_str = MC_request_to_string(prev_req, value); - XBT_DEBUG("%s (state=%p)", req_str, current_pair->graph_state); - xbt_free(req_str); - } - - if(!MC_state_process_is_done(prev_pair->graph_state, req->issuer)){ - MC_state_interleave_process(prev_pair->graph_state, req->issuer); + 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_DEBUG("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_DEBUG("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); - } else { - XBT_DEBUG("Process %p is in done set", req->issuer); + set_pair_reached(pair_succ->automaton_state); + //set_pair_reached_hash(pair_succ->automaton_state); + + XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + //XBT_DEBUG("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); + } - break; - } - } + }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_DEBUG("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_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + //XBT_DEBUG("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_DEBUG("Next pair already visited ! "); + + } - if(MC_state_interleave_size(current_pair->graph_state)){ - MC_restore_snapshot(current_pair->system_state); - xbt_fifo_unshift(mc_snapshot_stack, current_pair); - XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_snapshot_stack)); - MC_UNSET_RAW_MEM; - break; } + + /* Restore system before checking others successors */ + if(cursor != xbt_dynar_length(successors) - 1) + MC_replay_liveness(mc_stack_liveness, 1); + + } + + } + + }else{ + + XBT_DEBUG("Max depth reached"); - MC_UNSET_RAW_MEM; + } - } + if(xbt_fifo_size(mc_stack_liveness) == MAX_DEPTH_LIVENESS ){ + XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u, depth = %d) shifted in stack, maximum depth reached", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) ); + }else{ + XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u, depth = %d) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) ); + } + + + MC_SET_RAW_MEM; + xbt_fifo_shift(mc_stack_liveness); + 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); } MC_UNSET_RAW_MEM; - return; + + + }