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);
+ //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++){
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(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;
+ return 1;
}
if(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data)){
//XBT_DEBUG("Different heap (mmalloc_compare)");
- errors++;
+ 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(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;
+ 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++;
+ return 1;
}
break;
case 2:
- //XBT_DEBUG("Region : program");
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(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
//XBT_DEBUG("Different memcmp for data in program");
- errors++;
+ return 1;
}
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(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
//XBT_DEBUG("Different memcmp for data in stack");
- errors++;
+ return 1;
}
break;
}
}
- return (errors>0);
+ return 0;
}
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;
xbt_dynar_push_as(prop_ato, int, res);
}
- mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot_liveness(sn);
-
- 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){
+ 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);
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_state_t st, int sc){
+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; j<sn->num_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;
xbt_dynar_push_as(prop_ato, int, res);
}
+ mc_pair_reached_hash_t pair_test = NULL;
+
+ int region_diff = 0;
+
+ cursor = 0;
+
+ xbt_dynar_foreach(reached_pairs_hash, cursor, pair_test){
+
+ 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;
+
+ 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);
- int i=0;
- xbt_fifo_item_t item = xbt_fifo_get_first_item(visited_pairs);
- mc_pair_visited_t pair_test = NULL;
+ 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)();
- while(i < xbt_fifo_size(visited_pairs) && item != NULL){
+ xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
+ f = ps->function;
+ res = (*f)();
+ xbt_dynar_push_as(prop_ato, int, res);
+ }
- pair_test = (mc_pair_visited_t) xbt_fifo_get_item_content(item);
-
- 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;
+ 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; j<sn->num_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);
}
}
+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){
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);
- pair->search_cycle = sc;
+
/* Get values of propositional symbols */
unsigned int cursor = 0;
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;
case 3 : {
unsigned int cursor = 0;
xbt_propositional_symbol_t p = NULL;
+ 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)();
}
}
}
}
- 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 */
xbt_fifo_unshift(mc_stack_liveness_stateless, mc_initial_pair);
MC_UNSET_RAW_MEM;
- set_pair_reached(state);
-
+ //set_pair_reached(state);
+ set_pair_reached_hash(state);
+
if(cursor != 0){
MC_restore_snapshot(initial_snapshot_liveness);
MC_UNSET_RAW_MEM;
if(xbt_fifo_size(mc_stack_liveness_stateless) < MAX_DEPTH_LIVENESS){
- set_pair_visited(current_pair->automaton_state, search_cycle);
+ //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){
xbt_dynar_foreach(successors, cursor, pair_succ){
- if(!visited(pair_succ->automaton_state, search_cycle)){
-
- 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) == 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_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);
+ 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_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
- set_pair_reached(pair_succ->automaton_state);
+ //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_stateless, pair_succ);
+ MC_UNSET_RAW_MEM;
+
+ MC_ddfs_stateless(search_cycle);
}
}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(pair_succ->automaton_state);
-
- search_cycle = 1;
+ 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_stateless, pair_succ);
+ MC_UNSET_RAW_MEM;
+
+ MC_ddfs_stateless(search_cycle);
+
+ }else{
- XBT_DEBUG("Reached pairs : %d", xbt_fifo_size(reached_pairs));
+ XBT_DEBUG("Next pair already visited ! ");
}
-
+
}
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
- MC_UNSET_RAW_MEM;
-
- MC_ddfs_stateless(search_cycle);
-
- /* Restore system before checking others successors */
- if(cursor != (xbt_dynar_length(successors) - 1))
- MC_replay_liveness(mc_stack_liveness_stateless, 1);
-
}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);
- XBT_DEBUG("Next pair already visited");
+ //set_pair_reached(pair_succ->automaton_state);
+ set_pair_reached_hash(pair_succ->automaton_state);
- if(search_cycle == 1){
+ search_cycle = 1;
- if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
-
- if(reached(pair_succ->automaton_state) == 1){
+ //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+ XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash));
- 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);
+ 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_stateless, pair_succ);
+ MC_UNSET_RAW_MEM;
+
+ MC_ddfs_stateless(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_stateless, 1);
+
+
}
if(MC_state_interleave_size(current_pair->graph_state) > 0){
xbt_dynar_foreach(successors, cursor, pair_succ){
- if(!visited(pair_succ->automaton_state, search_cycle)){
+ 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(pair_succ->automaton_state) == 1){
+ XBT_DEBUG("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness_stateless) + 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);
+ 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_stateless) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
- set_pair_reached(pair_succ->automaton_state);
+ //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_stateless, pair_succ);
+ MC_UNSET_RAW_MEM;
+
+ MC_ddfs_stateless(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(pair_succ->automaton_state);
-
- 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_stateless, pair_succ);
+ MC_UNSET_RAW_MEM;
+
+ MC_ddfs_stateless(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(search_cycle);
+ //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_stateless, pair_succ);
+ MC_UNSET_RAW_MEM;
- XBT_DEBUG("Next pair already visited");
+ MC_ddfs_stateless(search_cycle);
+
+ }else{
- if(search_cycle == 1){
+ XBT_DEBUG("Next pair already visited ! ");
- if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
-
- if(reached(pair_succ->automaton_state) == 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);
-
- }
-
- }
-
}
+
}
-
+
+ /* Restore system before checking others successors */
+ if(cursor != xbt_dynar_length(successors) - 1)
+ MC_replay_liveness(mc_stack_liveness_stateless, 1);
+
+
}
-
+
}
-
+
}else{
XBT_DEBUG("Max depth reached");
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);
+ //xbt_dynar_pop(reached_pairs, NULL);
+ xbt_dynar_pop(reached_pairs_hash, NULL);
}
MC_UNSET_RAW_MEM;
