X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d31b17008f739a67f54a3fcd4095fe8057831ed..2b6a13defd8f5be6e04fe678115b24f7a53ce006:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index b04a36308b..bf7c15d6d2 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -5,534 +5,224 @@ 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; - -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; - -} +xbt_fifo_t reached_pairs; +xbt_fifo_t visited_pairs; +xbt_dynar_t successors = NULL; +extern mc_snapshot_t initial_snapshot; -void set_pair_visited(mc_state_t gs, xbt_state_t as, int sc){ +int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ - //XBT_DEBUG("New visited pair : graph=%p, automaton=%p", gs, as); - 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; - xbt_dynar_push(visited_pairs, &p); - //XBT_DEBUG("New visited pair , length of visited pairs : %lu", xbt_dynar_length(visited_pairs)); - MC_UNSET_RAW_MEM; + XBT_DEBUG("Compare snapshot"); + + if(s1->num_reg != s2->num_reg){ + XBT_DEBUG("Different num_reg (s1 = %d, s2 = %d)", s1->num_reg, s2->num_reg); + return 1; + } - //XBT_DEBUG("New visited pair , length of visited pairs : %lu", xbt_dynar_length(visited_pairs)); -} + int i; + int errors = 0; -int reached(mc_state_t gs, xbt_state_t as ){ + for(i=0 ; i< s1->num_reg ; i++){ + + if(s1->regions[i]->size != s2->regions[i]->size){ + XBT_DEBUG("Different size of region"); + return 1; + } + + if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){ + XBT_DEBUG("Different start addr of region"); + return 1; + } + + if(s1->regions[i]->type != s2->regions[i]->type){ + XBT_DEBUG("Different type of region"); + return 1; + } - 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(s1->regions[i]->type == 0){ + if(mmalloc_compare_heap(s1->regions[i]->start_addr, s2->regions[i]->start_addr)){ + XBT_DEBUG("Different heap (mmalloc_compare)"); + errors++; } - 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; + }else{ + if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){ + XBT_DEBUG("Different memcmp for data in libsimgrid or program"); + errors++; } - /* 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){ - - //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; - xbt_dynar_push(reached_pairs, &p); - XBT_DEBUG("New reached pair : graph=%p, automaton=%p(%s)", gs, as, as->id); - MC_UNSET_RAW_MEM; - //} + return (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; +int reached(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t s){ - //XBT_DEBUG("Visited pair length : %lu", xbt_dynar_length(visited_pairs)); - 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++; - } - } - if(different_process==0){ - MC_UNSET_RAW_MEM; - return 1; - } - } - } - MC_UNSET_RAW_MEM; - return 0; - -} + if(xbt_fifo_size(reached_pairs) == 0){ -void MC_dfs_init(xbt_automaton_t a){ + return 0; - 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(); + }else{ - MC_SET_RAW_MEM; - - init_snapshot = xbt_new0(s_mc_snapshot_t, 1); + MC_SET_RAW_MEM; + + xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL); - 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); + /* 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_as(prop_ato, int, res); } - } - visited_pairs = xbt_dynar_new(sizeof(mc_visited_pairs_t), NULL); - reached_pairs = xbt_dynar_new(sizeof(mc_reached_pairs_t), NULL); - - MC_take_snapshot(init_snapshot); - - MC_UNSET_RAW_MEM; - /* unsigned int cursor = 0; */ - /* xbt_state_t state = NULL; */ - /* int nb_init_state = 0; */ - /* xbt_dynar_foreach(a->states, cursor, state){ */ - /* if(state->type == -1){ */ + int i=0; + xbt_fifo_item_t item = xbt_fifo_get_first_item(reached_pairs); + mc_pair_reached_t pair_test = NULL; - /* MC_SET_RAW_MEM; */ - /* mc_initial_pair = new_pair(init_snapshot, initial_graph_state, state); */ + while(i < xbt_fifo_size(reached_pairs)){ - /* xbt_fifo_unshift(mc_snapshot_stack, mc_initial_pair); */ - - /* XBT_DEBUG("**************************************************"); */ - /* XBT_DEBUG("Initial state=%p ", mc_initial_pair); */ - - /* 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); */ + pair_test = (mc_pair_reached_t) xbt_fifo_get_item_content(item); - /* nb_init_state++; */ - /* } */ - /* } */ - - /* 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); - xbt_dynar_t elses = xbt_dynar_new(sizeof(mc_pairs_t), NULL); - mc_pairs_t pair_succ; - - 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){ - - 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; - - }else{ - if(res == 2){ - - MC_SET_RAW_MEM; - - mc_initial_pair = new_pair(init_snapshot, initial_graph_state, transition_succ->dst); - xbt_dynar_push(elses, &mc_initial_pair); - + 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(s, pair_test->system_state) == 0){ MC_UNSET_RAW_MEM; + return 1; } } } - } - } - - - cursor = 0; - xbt_dynar_foreach(successors, cursor, pair_succ){ - MC_SET_RAW_MEM; - - xbt_fifo_unshift(mc_snapshot_stack, pair_succ); - - XBT_DEBUG("**************************************************"); - XBT_DEBUG("Initial pair=%p (graph=%p, automaton=%p(%s)) ", pair_succ, pair_succ->graph_state, pair_succ->automaton_state,pair_succ->automaton_state->id ); - - MC_UNSET_RAW_MEM; - set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, 0); + item = xbt_fifo_get_next_item(item); + + i++; - if(cursor == 0){ - MC_dfs(a, 0, 0); - }else{ - MC_dfs(a, 0, 1); } - } - - cursor = 0; - xbt_dynar_foreach(elses, cursor, pair_succ){ - MC_SET_RAW_MEM; - - xbt_fifo_unshift(mc_snapshot_stack, pair_succ); - - XBT_DEBUG("**************************************************"); - XBT_DEBUG("Initial pair=%p (graph=%p, automaton=%p(%s)) ", pair_succ, pair_succ->graph_state, pair_succ->automaton_state,pair_succ->automaton_state->id ); MC_UNSET_RAW_MEM; - - set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, 0); - - if((xbt_dynar_length(successors) == 0) && (cursor == 0)){ - MC_dfs(a, 0, 0); - }else{ - MC_dfs(a, 0, 1); - } + return 0; + } - } +void set_pair_reached(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t sn){ -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; - } - - //XBT_DEBUG("Lpv length after restore snapshot: %lu", xbt_dynar_length(visited_pairs)); - - /* Get current state */ - mc_pairs_t current_pair = (mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack)); + + 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 = sn; - 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); - } - } + /* 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_as(pair->prop_ato, int, res); } - - 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)); - //XBT_DEBUG("Restore : %d", restore); - //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + xbt_fifo_unshift(reached_pairs, pair); - //sleep(1); - - mc_stats_pair->visited_pairs++; - - int value; - mc_state_t next_graph_state = NULL; - smx_req_t req = NULL; - char *req_str; - - 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); - xbt_dynar_t elses = xbt_dynar_new(sizeof(mc_pairs_t), NULL); - - mc_pairs_t next_pair; - mc_snapshot_t next_snapshot; - mc_snapshot_t current_snapshot; + MC_UNSET_RAW_MEM; - while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ +} - MC_SET_RAW_MEM; - current_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; - - - /* Debug information */ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - req_str = MC_request_to_string(req, value); - XBT_DEBUG("Execute: %s", req_str); - xbt_free(req_str); - } +int visited(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t s, int sc){ - MC_state_set_executed_request(current_pair->graph_state, req, value); - /* Answer the request */ - SIMIX_request_pre(req, value); + if(xbt_fifo_size(visited_pairs) == 0){ - /* Wait for requests (schedules processes) */ - MC_wait_for_requests(); + return 0; + }else{ - /* 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); - - MC_UNSET_RAW_MEM; + xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL); - xbt_dynar_reset(successors); - xbt_dynar_reset(elses); - - 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; - next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst); - - //XBT_DEBUG("Next pair : %p", next_pair); - - if(res == 1){ // enabled transition in automaton - xbt_dynar_push(successors, &next_pair); - }else{ - if(res == 2){ // enabled transition in automaton - xbt_dynar_push(elses, &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; - + /* 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_as(prop_ato, int, res); } - 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){ - - //XBT_DEBUG("Unvisited pair !"); - - mc_stats_pair->executed_transitions++; - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_snapshot_stack, pair_succ); - MC_UNSET_RAW_MEM; - set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle); - MC_dfs(a, search_cycle, 0); + int i=0; + xbt_fifo_item_t item = xbt_fifo_get_first_item(visited_pairs); + mc_pair_visited_t pair_test = NULL; - if((search_cycle == 0) && (current_pair->automaton_state->type == 1)){ + while(i < xbt_fifo_size(visited_pairs)){ - 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); + pair_test = (mc_pair_visited_t) xbt_fifo_get_item_content(item); + + 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(s, pair_test->system_state) == 0){ + 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); - } } - } - - cursor = 0; - xbt_dynar_foreach(elses, 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){ - - //XBT_DEBUG("Unvisited pair !"); - - mc_stats_pair->executed_transitions++; - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_snapshot_stack, pair_succ); - MC_UNSET_RAW_MEM; - - set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle); - MC_dfs(a, search_cycle, 0); - - if((search_cycle == 0) && (current_pair->automaton_state->type == 1)){ - - 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); - } - } - - 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); + item = xbt_fifo_get_next_item(item); + + i++; - } - } - } - - - if(MC_state_interleave_size(current_pair->graph_state) > 0){ - MC_restore_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; - //XBT_DEBUG("Snapshot restored"); } - } - - 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; - -} - -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 (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); - } + MC_UNSET_RAW_MEM; + return 0; + } } -void MC_dump_snapshot_stack(xbt_fifo_t stack){ - mc_pairs_t pair; +void set_pair_visited(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t sn, 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->system_state = sn; + pair->search_cycle = sc; + + /* 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_as(pair->prop_ato, int, res); + } + + xbt_fifo_unshift(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 @@ -540,6 +230,7 @@ void MC_pair_delete(mc_pairs_t pair){ } + int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l){ switch(l->type){ @@ -581,251 +272,430 @@ int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l){ } } -void MC_stateful_dpor_init(xbt_automaton_t a){ + + + + +/********************* 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->automaton_state); -> FIXME : à implémenter + 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_ddfs_stateless_init(xbt_automaton_t a, char *prgm){ XBT_DEBUG("**************************************************"); - XBT_DEBUG("DPOR stateful init"); + XBT_DEBUG("Double-DFS stateless 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_fifo_new(); + visited_pairs = xbt_fifo_new(); + successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL); - MC_take_snapshot(initial_snapshot); + initial_snapshot = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(initial_snapshot, prgm); 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){ 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_UNSET_RAW_MEM; - - set_pair_visited(initial_pair->graph_state, initial_pair->automaton_state, 0); + + 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_stateless, mc_initial_pair); + MC_UNSET_RAW_MEM; + + if(cursor != 0){ + MC_restore_snapshot(initial_snapshot); + MC_UNSET_RAW_MEM; + } - MC_stateful_dpor(a, 0, 0); + MC_ddfs_stateless(a, 0, 0, prgm); - break; + }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_stateless, mc_initial_pair); + MC_UNSET_RAW_MEM; - } + set_pair_reached(a, state, initial_snapshot); + + if(cursor != 0){ + MC_restore_snapshot(initial_snapshot); + MC_UNSET_RAW_MEM; + } + + MC_ddfs_stateless(a, 1, 0, prgm); + } } + } - if(xbt_fifo_size(mc_snapshot_stack)>0) - break; - } +} - 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_stateless(xbt_automaton_t a, int search_cycle, int replay, char *prgm){ - initial_pair = new_pair(initial_snapshot, initial_graph_state, state); - xbt_fifo_unshift(mc_snapshot_stack, initial_pair); - - MC_UNSET_RAW_MEM; - - set_pair_visited(initial_pair->graph_state, initial_pair->automaton_state, 0); - - MC_stateful_dpor(a, 0, 0); - - break; + smx_process_t process; + mc_pair_stateless_t current_pair = NULL; + mc_snapshot_t snapshot = NULL; + mc_snapshot_t current_snapshot = NULL; + + if(xbt_fifo_size(mc_stack_liveness_stateless) == 0) + return; + + if(replay == 1){ + MC_replay_liveness(mc_stack_liveness_stateless, 0); + current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateless)); + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ + MC_state_interleave_process(current_pair->graph_state, process); } } - } -} + /* Get current pair */ + current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateless)); -void MC_stateful_dpor(xbt_automaton_t a, int search_cycle, int restore){ + /* Update current state in buchi automaton */ + a->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_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)); + + mc_stats_pair->visited_pairs++; 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; - //mc_pairs_t pair_succ; 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_stateless) < MAX_DEPTH_LIVENESS){ - current_pair = (mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack)); + MC_SET_RAW_MEM; + current_snapshot = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(current_snapshot, prgm); + MC_UNSET_RAW_MEM; + set_pair_visited(a, current_pair->automaton_state, current_snapshot, search_cycle); + + 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); - if((xbt_fifo_size(mc_snapshot_stack) < MAX_DEPTH) && (req = MC_state_get_request(current_pair->graph_state, &value))){ + /* Wait for requests (schedules processes) */ + MC_wait_for_requests(); - 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_SET_RAW_MEM; - MC_state_set_executed_request(current_pair->graph_state, req, value); - mc_stats_pair->executed_transitions++; + /* Create the new expanded graph_state */ + next_graph_state = MC_state_pair_new(); - /* 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); + } + } + + xbt_dynar_reset(successors); + + MC_UNSET_RAW_MEM; + + + cursor= 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + + res = MC_automaton_evaluate_label(a, transition_succ->label); + + if(res == 1){ // 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(a, 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; + + MC_SET_RAW_MEM; + snapshot = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(snapshot, prgm); + MC_UNSET_RAW_MEM; + + xbt_dynar_foreach(successors, cursor, pair_succ){ + + if(!visited(a, pair_succ->automaton_state, snapshot, search_cycle)){ + + if(search_cycle == 1){ + + if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ + + if(reached(a, pair_succ->automaton_state, snapshot) == 1){ + + XBT_DEBUG("Next pair (depth = %d, %d interleave) already reached !", xbt_fifo_size(mc_stack_liveness_stateless) + 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_stateless(mc_stack_liveness_stateless); + MC_dump_stack_liveness_stateless(mc_stack_liveness_stateless); + 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_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); + + set_pair_reached(a, pair_succ->automaton_state, snapshot); + + } + + } + + }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_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); + + set_pair_reached(a, pair_succ->automaton_state, snapshot); + + search_cycle = 1; + + } + + } + + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs_stateless(a, search_cycle, 0, prgm); + + /* Restore system before checking others successors */ + if(cursor != (xbt_dynar_length(successors) - 1)) + MC_replay_liveness(mc_stack_liveness_stateless, 1); + + }else{ + + XBT_DEBUG("Next pair already visited"); + + } + } + + if(MC_state_interleave_size(current_pair->graph_state) > 0){ + XBT_DEBUG("Backtracking to depth %u", xbt_fifo_size(mc_stack_liveness_stateless)); + MC_replay_liveness(mc_stack_liveness_stateless, 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(a, 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(a, 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 */ + cursor = 0; + MC_SET_RAW_MEM; - xbt_fifo_shift(mc_snapshot_stack); + snapshot = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(snapshot, prgm); MC_UNSET_RAW_MEM; + + xbt_dynar_foreach(successors, cursor, pair_succ){ + + if(!visited(a, pair_succ->automaton_state, snapshot, search_cycle)){ + + if(search_cycle == 1){ + + if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ + + if(reached(a, pair_succ->automaton_state, snapshot) == 1){ + + XBT_DEBUG("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness_stateless) + 1); + + 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); + + }else{ + + XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); + + set_pair_reached(a, pair_succ->automaton_state, snapshot); + + } + + } + + }else{ + + if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)) && (xbt_fifo_size(mc_stack_liveness_stateless) < (MAX_DEPTH_LIVENESS - 1))){ + + set_pair_reached(a, pair_succ->automaton_state, snapshot); + + search_cycle = 1; + + } + + } - 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); - else - XBT_DEBUG("Process %p is in done set", req->issuer); - - break; - } - } - - 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_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ); MC_UNSET_RAW_MEM; - break; + + MC_ddfs_stateless(a, search_cycle, 0, prgm); + + /* Restore system before checking others successors */ + if(cursor != xbt_dynar_length(successors) - 1) + MC_replay_liveness(mc_stack_liveness_stateless, 1); + + }else{ + + XBT_DEBUG("Next pair already visited"); + } + } + + } + + }else{ + + XBT_DEBUG("Max depth reached"); - MC_UNSET_RAW_MEM; + } - } + if(xbt_fifo_size(mc_stack_liveness_stateless) == MAX_DEPTH_LIVENESS ){ + XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u) shifted in stack, maximum depth reached", current_pair->graph_state, current_pair->automaton_state, search_cycle); + }else{ + XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle); } + + + MC_SET_RAW_MEM; + xbt_fifo_shift(mc_stack_liveness_stateless); + if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){ + xbt_fifo_shift(reached_pairs); + } + if(snapshot != NULL) + MC_free_snapshot(snapshot); + MC_pair_stateless_delete(current_pair); MC_UNSET_RAW_MEM; - return; + + } +