X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7dba5032e5387a88a6b1c868ab0076454f08e88a..2be0e4648c5b7055580df1c265b7c43ee6763a46:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index 7d5eb8a86a..8ff21442dd 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -4,109 +4,181 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, "Logging specific to algorithms for liveness properties verification"); -xbt_fifo_t reached_pairs; -xbt_fifo_t visited_pairs; +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; + +/* 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 snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ - //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("Num reg : %d", s1->num_reg); - int i; int errors = 0; for(i=0 ; i< s1->num_reg ; i++){ if(s1->regions[i]->type != s2->regions[i]->type){ - //XBT_DEBUG("Different type of region"); - return 1; + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different type of region"); + errors++; + }else{ + return 1; + } } switch(s1->regions[i]->type){ case 0: - //XBT_DEBUG("Region : heap"); if(s1->regions[i]->size != s2->regions[i]->size){ - //XBT_DEBUG("Different size of heap (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size); - return 1; + 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(s1->regions[i]->start_addr != s2->regions[i]->start_addr){ - //XBT_DEBUG("Different start addr of heap (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); - return 1; + 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)){ - //XBT_DEBUG("Different heap (mmalloc_compare)"); - errors++; + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different heap (mmalloc_compare)"); + errors++; + }else{ + return 1; + } } break; case 1 : - //XBT_DEBUG("Region : libsimgrid"); if(s1->regions[i]->size != s2->regions[i]->size){ - //XBT_DEBUG("Different size of libsimgrid (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size); - return 1; + 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){ - //XBT_DEBUG("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); - return 1; + 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){ - //XBT_DEBUG("Different memcmp for data in libsimgrid"); - errors++; + 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: - //XBT_DEBUG("Region : program"); + /*case 2: if(s1->regions[i]->size != s2->regions[i]->size){ - //XBT_DEBUG("Different size of program (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size); - return 1; - } + 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){ - //XBT_DEBUG("Different start addr of program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); - return 1; + 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){ - //XBT_DEBUG("Different memcmp for data in program"); - errors++; + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + XBT_DEBUG("Different memcmp for data in program"); + errors++; + }else{ + return 1; + } } - break; + break;*/ case 3: - //XBT_DEBUG("Region : stack"); if(s1->regions[i]->size != s2->regions[i]->size){ - //XBT_DEBUG("Different size of stack (s1 = %Zu, s2 = %Zu)", s1->regions[i]->size, s2->regions[i]->size); - return 1; + 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){ - //XBT_DEBUG("Different start addr of stack (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); - return 1; + 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){ - //XBT_DEBUG("Different memcmp for data in stack"); - errors++; + 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; } } - return (errors>0); + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ + return (errors>0); + }else{ + return 0; + } } -int reached(xbt_automaton_t a, xbt_state_t st, char *prgm){ +int reached(xbt_state_t st){ - if(xbt_fifo_size(reached_pairs) == 0){ + 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; @@ -115,43 +187,29 @@ int reached(xbt_automaton_t a, xbt_state_t st, char *prgm){ /* Get values of propositional symbols */ unsigned int cursor = 0; xbt_propositional_symbol_t ps = NULL; - xbt_dynar_foreach(a->propositional_symbols, cursor, ps){ + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ f = ps->function; res = (*f)(); xbt_dynar_push_as(prop_ato, int, res); } - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn, prgm); - - int i=0; - xbt_fifo_item_t item = xbt_fifo_get_first_item(reached_pairs); + cursor = 0; mc_pair_reached_t pair_test = NULL; - while(i < xbt_fifo_size(reached_pairs) && item != NULL){ - - pair_test = (mc_pair_reached_t) xbt_fifo_get_item_content(item); - - if(pair_test != NULL){ - 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(sn, pair_test->system_state) == 0){ - - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - return 1; - } + 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; } } } - - item = xbt_fifo_get_next_item(item); - - i++; - } MC_free_snapshot(sn); @@ -163,7 +221,7 @@ int reached(xbt_automaton_t a, xbt_state_t st, char *prgm){ } } -void set_pair_reached(xbt_automaton_t a, xbt_state_t st, char *prgm){ +void set_pair_reached(xbt_state_t st){ MC_SET_RAW_MEM; @@ -173,7 +231,7 @@ void set_pair_reached(xbt_automaton_t a, xbt_state_t st, char *prgm){ 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, prgm); + MC_take_snapshot_liveness(pair->system_state); /* Get values of propositional symbols */ unsigned int cursor = 0; @@ -181,79 +239,254 @@ void set_pair_reached(xbt_automaton_t a, xbt_state_t st, char *prgm){ int res; int (*f)(); - xbt_dynar_foreach(a->propositional_symbols, cursor, ps){ + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ f = ps->function; res = (*f)(); xbt_dynar_push_as(pair->prop_ato, int, res); } - xbt_fifo_unshift(reached_pairs, pair); + xbt_dynar_push(reached_pairs, &pair); MC_UNSET_RAW_MEM; - } -int visited(xbt_automaton_t a, xbt_state_t st, int sc, char *prgm){ +int reached_hash(xbt_state_t st){ - if(xbt_fifo_size(visited_pairs) == 0){ + if(xbt_dynar_is_empty(reached_pairs_hash)){ return 0; }else{ MC_SET_RAW_MEM; - - xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL); + + 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)(); - xbt_dynar_foreach(a->propositional_symbols, cursor, ps){ + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ f = ps->function; res = (*f)(); xbt_dynar_push_as(prop_ato, int, res); } - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn, prgm); + mc_pair_reached_hash_t pair_test = NULL; - int i=0; - xbt_fifo_item_t item = xbt_fifo_get_first_item(visited_pairs); - mc_pair_visited_t pair_test = NULL; + int region_diff = 0; - while(i < xbt_fifo_size(visited_pairs) && item != NULL){ + cursor = 0; - pair_test = (mc_pair_visited_t) xbt_fifo_get_item_content(item); + 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; + } + } + } - if(pair_test != NULL){ - 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(sn, pair_test->system_state) == 0){ - - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; + + 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; + + 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)(); + + 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); + + MC_free_snapshot(sn); + + MC_UNSET_RAW_MEM; + +} + + +int visited(xbt_state_t st, int sc){ + + + 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)(); + + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ + f = 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; - return 1; - } + return 1; + } } } } + } - item = xbt_fifo_get_next_item(item); - - i++; + MC_free_snapshot(sn); + xbt_dynar_reset(prop_ato); + xbt_free(prop_ato); + MC_UNSET_RAW_MEM; + return 0; + + } +} + + +int visited_hash(xbt_state_t st, int sc){ + + + 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)(); + + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ + f = 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; + return 1; + } + } + } + } + + region_diff = 0; + } + MC_free_snapshot(sn); xbt_dynar_reset(prop_ato); xbt_free(prop_ato); @@ -263,7 +496,47 @@ int visited(xbt_automaton_t a, xbt_state_t st, int sc, char *prgm){ } } -void set_pair_visited(xbt_automaton_t a, xbt_state_t st, int sc, char *prgm){ +void set_pair_visited_hash(xbt_state_t st, int sc){ + + 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); + 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; + + 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)(); + + 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 set_pair_visited(xbt_state_t st, int sc){ MC_SET_RAW_MEM; @@ -272,9 +545,10 @@ void set_pair_visited(xbt_automaton_t a, xbt_state_t st, int sc, char *prgm){ 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 = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(pair->system_state, prgm); 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; @@ -282,13 +556,13 @@ void set_pair_visited(xbt_automaton_t a, xbt_state_t st, int sc, char *prgm){ int res; int (*f)(); - xbt_dynar_foreach(a->propositional_symbols, cursor, ps){ + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ f = ps->function; res = (*f)(); xbt_dynar_push_as(pair->prop_ato, int, res); } - xbt_fifo_unshift(visited_pairs, pair); + xbt_dynar_push(visited_pairs, &pair); MC_UNSET_RAW_MEM; @@ -303,32 +577,33 @@ void MC_pair_delete(mc_pair_t 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)(); } } @@ -366,10 +641,10 @@ mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r){ return p; } -void MC_ddfs_stateless_init(xbt_automaton_t a, char *prgm){ +void MC_ddfs_init(void){ XBT_DEBUG("**************************************************"); - XBT_DEBUG("Double-DFS stateless init"); + XBT_DEBUG("Double-DFS init"); XBT_DEBUG("**************************************************"); mc_pair_stateless_t mc_initial_pair = NULL; @@ -387,25 +662,27 @@ void MC_ddfs_stateless_init(xbt_automaton_t a, char *prgm){ } } - reached_pairs = xbt_fifo_new(); - visited_pairs = xbt_fifo_new(); + 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); /* Save the initial state */ initial_snapshot_liveness = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_to_restore_liveness(initial_snapshot_liveness, prgm); + MC_take_snapshot_to_restore_liveness(initial_snapshot_liveness); MC_UNSET_RAW_MEM; unsigned int cursor = 0; xbt_state_t state; - xbt_dynar_foreach(a->states, cursor, state){ + xbt_dynar_foreach(automaton->states, cursor, state){ if(state->type == -1){ 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); + xbt_fifo_unshift(mc_stack_liveness, mc_initial_pair); MC_UNSET_RAW_MEM; if(cursor != 0){ @@ -413,24 +690,25 @@ void MC_ddfs_stateless_init(xbt_automaton_t a, char *prgm){ MC_UNSET_RAW_MEM; } - MC_ddfs_stateless(a, 0, 0, prgm); + MC_ddfs(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_stateless, mc_initial_pair); + xbt_fifo_unshift(mc_stack_liveness, mc_initial_pair); MC_UNSET_RAW_MEM; - set_pair_reached(a, state, prgm); - + set_pair_reached(state); + //set_pair_reached_hash(state); + if(cursor != 0){ MC_restore_snapshot(initial_snapshot_liveness); MC_UNSET_RAW_MEM; } - MC_ddfs_stateless(a, 1, 0, prgm); + MC_ddfs(1); } } @@ -439,37 +717,28 @@ void MC_ddfs_stateless_init(xbt_automaton_t a, char *prgm){ } -void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay, char *prgm){ +void MC_ddfs(int search_cycle){ smx_process_t process; mc_pair_stateless_t current_pair = NULL; - if(xbt_fifo_size(mc_stack_liveness_stateless) == 0) + if(xbt_fifo_size(mc_stack_liveness) == 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)); + current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness)); /* Update current state in buchi automaton */ - a->current_state = current_pair->automaton_state; + automaton->current_state = current_pair->automaton_state; - XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness_stateless), search_cycle); + 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); + sleep(1); int value; mc_state_t next_graph_state = NULL; @@ -483,11 +752,13 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay, char *pr mc_pair_stateless_t next_pair = NULL; mc_pair_stateless_t pair_succ; - if(xbt_fifo_size(mc_stack_liveness_stateless) < MAX_DEPTH_LIVENESS){ + if(xbt_fifo_size(mc_stack_liveness) < MAX_DEPTH_LIVENESS){ - set_pair_visited(a, current_pair->automaton_state, search_cycle, prgm); + //set_pair_visited(current_pair->automaton_state, search_cycle); + set_pair_visited_hash(current_pair->automaton_state, search_cycle); - //XBT_DEBUG("Visited pairs : %d", xbt_fifo_size(visited_pairs)); + //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){ @@ -529,7 +800,7 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay, char *pr cursor= 0; xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - res = MC_automaton_evaluate_label(a, transition_succ->label); + res = MC_automaton_evaluate_label(transition_succ->label); if(res == 1){ // enabled transition in automaton MC_SET_RAW_MEM; @@ -544,7 +815,7 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay, char *pr xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - res = MC_automaton_evaluate_label(a, transition_succ->label); + res = MC_automaton_evaluate_label(transition_succ->label); if(res == 2){ // true transition in automaton MC_SET_RAW_MEM; @@ -559,73 +830,105 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay, char *pr xbt_dynar_foreach(successors, cursor, pair_succ){ - if(!visited(a, pair_succ->automaton_state, search_cycle, prgm)){ - - if(search_cycle == 1){ + if(search_cycle == 1){ - if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ + if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ - if(reached(a, pair_succ->automaton_state, prgm) == 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)); + 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_stateless(mc_stack_liveness_stateless); - MC_dump_stack_liveness_stateless(mc_stack_liveness_stateless); - MC_print_statistics_pairs(mc_stats_pair); - exit(0); + 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{ + }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); + 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(a, pair_succ->automaton_state, prgm); + set_pair_reached(pair_succ->automaton_state); + //set_pair_reached_hash(pair_succ->automaton_state); - //XBT_DEBUG("Reached pairs : %d", xbt_fifo_size(reached_pairs)); + 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))){ + 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); + 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(a, pair_succ->automaton_state, prgm); - - search_cycle = 1; + set_pair_reached(pair_succ->automaton_state); + //set_pair_reached_hash(pair_succ->automaton_state); - //XBT_DEBUG("Reached pairs : %d", xbt_fifo_size(reached_pairs)); + search_cycle = 1; - } + 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_stateless, pair_succ); - MC_UNSET_RAW_MEM; + 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{ - MC_ddfs_stateless(a, search_cycle, 0, prgm); + 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_stateless, 1); - - }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_stateless)); - MC_replay_liveness(mc_stack_liveness_stateless, 0); + XBT_DEBUG("Backtracking to depth %u", xbt_fifo_size(mc_stack_liveness)); + MC_replay_liveness(mc_stack_liveness, 0); } } @@ -645,7 +948,7 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay, char *pr cursor= 0; xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - res = MC_automaton_evaluate_label(a, transition_succ->label); + res = MC_automaton_evaluate_label(transition_succ->label); if(res == 1){ // enabled transition in automaton MC_SET_RAW_MEM; @@ -660,7 +963,7 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay, char *pr xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - res = MC_automaton_evaluate_label(a, transition_succ->label); + res = MC_automaton_evaluate_label(transition_succ->label); if(res == 2){ // true transition in automaton MC_SET_RAW_MEM; @@ -675,92 +978,122 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay, char *pr xbt_dynar_foreach(successors, cursor, pair_succ){ - if(!visited(a, pair_succ->automaton_state, search_cycle, prgm)){ + if(search_cycle == 1){ - if(search_cycle == 1){ + if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ - 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)){ - if(reached(a, pair_succ->automaton_state, prgm) == 1){ + XBT_DEBUG("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness) + 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(mc_stack_liveness); + MC_dump_stack_liveness(mc_stack_liveness); + MC_print_statistics_pairs(mc_stats_pair); + exit(0); - 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{ + }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); + 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(a, pair_succ->automaton_state, prgm); + set_pair_reached(pair_succ->automaton_state); + //set_pair_reached_hash(pair_succ->automaton_state); - //XBT_DEBUG("Reached pairs : %d", xbt_fifo_size(reached_pairs)); + 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(((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, prgm); - - search_cycle = 1; + if(!visited_hash(pair_succ->automaton_state, search_cycle)){ + //if(!visited(pair_succ->automaton_state, search_cycle)){ - //XBT_DEBUG("Reached pairs : %d", xbt_fifo_size(reached_pairs)); + 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 ! "); + } } + - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ); - MC_UNSET_RAW_MEM; + }else{ + + if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ - MC_ddfs_stateless(a, search_cycle, 0, prgm); + set_pair_reached(pair_succ->automaton_state); + //set_pair_reached_hash(pair_succ->automaton_state); + + search_cycle = 1; - /* Restore system before checking others successors */ - if(cursor != xbt_dynar_length(successors) - 1) - MC_replay_liveness(mc_stack_liveness_stateless, 1); + XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash)); - }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; - XBT_DEBUG("Next pair already visited"); - + 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); + + } - + } - + }else{ XBT_DEBUG("Max depth reached"); } - if(xbt_fifo_size(mc_stack_liveness_stateless) == 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_stateless) ); + 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_stateless) ); + 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_stateless); + xbt_fifo_shift(mc_stack_liveness); if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){ - xbt_fifo_shift(reached_pairs); + xbt_dynar_pop(reached_pairs, NULL); + //xbt_dynar_pop(reached_pairs_hash, NULL); } MC_UNSET_RAW_MEM; } -