XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc,
"Logging specific to algorithms for liveness properties verification");
-xbt_dynar_t initial_pairs = NULL;
-xbt_dynar_t reached_pairs;
-extern mc_snapshot_t initial_snapshot;
-
-mc_pair_t new_pair(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st){
- mc_pair_t p = NULL;
- p = xbt_new0(s_mc_pair_t, 1);
- p->system_state = sn;
- p->automaton_state = st;
- p->graph_state = sg;
- mc_stats_pair->expanded_pairs++;
- return p;
-
-}
+xbt_fifo_t reached_pairs;
+xbt_fifo_t visited_pairs;
+xbt_dynar_t successors = NULL;
+
+//mc_snapshot_t snapshot;
int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
+
+ //XBT_DEBUG("Compare snapshot");
- if(s1->num_reg != s2->num_reg)
+ if(s1->num_reg != s2->num_reg){
+ XBT_DEBUG("Different num_reg (s1 = %d, s2 = %d)", s1->num_reg, s2->num_reg);
return 1;
+ }
- int i, errors=0;
+ //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]->size != s2->regions[i]->size)
- return 1;
-
- if(s1->regions[i]->start_addr != s2->regions[i]->start_addr)
- return 1;
-
- if(s1->regions[i]->type != s2->regions[i]->type)
+
+ if(s1->regions[i]->type != s2->regions[i]->type){
+ //XBT_DEBUG("Different type of region");
return 1;
+ }
- if(s1->regions[i]->type == 0){
+ 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;
+ }
if(mmalloc_compare_heap(s1->regions[i]->start_addr, s2->regions[i]->start_addr)){
- XBT_DEBUG("Different heap (mmalloc_compare)");
- //sleep(1);
+ //XBT_DEBUG("Different heap (mmalloc_compare)");
errors++;
}
- }else{
+ 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;
+ }
+ if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+ //XBT_DEBUG("Different memcmp for data in libsimgrid");
+ errors++;
+ }
+ 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(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(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+ //XBT_DEBUG("Different memcmp for data in program");
+ errors++;
+ }
+ 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(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(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
- XBT_DEBUG("Different memcmp for data in libsimgrid (%d)", i);
- //sleep(2);
+ //XBT_DEBUG("Different memcmp for data in stack");
errors++;
}
+ break;
}
-
-
}
return (errors>0);
-
+
}
-int reached(xbt_automaton_t a, mc_snapshot_t s){
+int reached(xbt_automaton_t a, xbt_state_t st, char *prgm){
+
+
+ if(xbt_fifo_size(reached_pairs) == 0){
- if(xbt_dynar_is_empty(reached_pairs)){
return 0;
+
}else{
- MC_SET_RAW_MEM;
-
- mc_pair_reached_t pair = NULL;
- pair = xbt_new0(s_mc_pair_reached_t, 1);
- pair->automaton_state = a->current_state;
- pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
- pair->system_state = s;
+ 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;
xbt_dynar_foreach(a->propositional_symbols, cursor, ps){
int (*f)() = ps->function;
int res = (*f)();
- xbt_dynar_push(pair->prop_ato, &res);
+ xbt_dynar_push_as(prop_ato, int, res);
}
-
- cursor = 0;
- mc_pair_reached_t pair_test;
- int (*compare_dynar)(const void*; const void*) = propositional_symbols_compare;
-
- xbt_dynar_foreach(reached_pairs, cursor, pair_test){
- if(automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){
- if(xbt_dynar_compare(pair_test->prop_ato, pair->prop_ato, compare_dynar) == 0){
- if(snapshot_compare(pair_test->system_state, pair->system_state) == 0){
+
+ MC_SET_RAW_MEM;
+ mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(sn, prgm);
+ MC_UNSET_RAW_MEM;
+
+ int i=0;
+ xbt_fifo_item_t item = xbt_fifo_get_first_item(reached_pairs);
+ mc_pair_reached_t pair_test = NULL;
+
+ while(i < xbt_fifo_size(reached_pairs)){
+
+ pair_test = (mc_pair_reached_t) xbt_fifo_get_item_content(item);
+
+ 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_SET_RAW_MEM;
+ MC_free_snapshot(sn);
MC_UNSET_RAW_MEM;
return 1;
}
}
}
+
+ item = xbt_fifo_get_next_item(item);
+
+ i++;
+
}
+ MC_SET_RAW_MEM;
+ MC_free_snapshot(sn);
MC_UNSET_RAW_MEM;
return 0;
}
}
-int set_pair_reached(xbt_automaton_t a, mc_snapshot_t s){
+void set_pair_reached(xbt_automaton_t a, xbt_state_t st, char *prgm){
- if(reached(a, s) == 0){
+
+ MC_SET_RAW_MEM;
+
+ mc_pair_reached_t pair = NULL;
+ pair = xbt_new0(s_mc_pair_reached_t, 1);
+ pair->automaton_state = st;
+ pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
+ pair->system_state = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(pair->system_state, prgm);
+
+ /* 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(reached_pairs, pair);
+
+ MC_UNSET_RAW_MEM;
+
+
+}
- MC_SET_RAW_MEM;
+int visited(xbt_automaton_t a, xbt_state_t st, int sc, char *prgm){
+
+
+ if(xbt_fifo_size(visited_pairs) == 0){
+
+ return 0;
- mc_pair_reached_t pair = NULL;
- pair = xbt_new0(s_mc_pair_reached_t, 1);
- pair->automaton_state = a->current_state;
- pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
- pair->system_state = s;
+ }else{
+ 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;
xbt_dynar_foreach(a->propositional_symbols, cursor, ps){
int (*f)() = ps->function;
int res = (*f)();
- xbt_dynar_push(pair->prop_ato, &res);
+ xbt_dynar_push_as(prop_ato, int, res);
}
-
- xbt_dynar_push(reached_pairs, &pair);
-
+
+ MC_SET_RAW_MEM;
+ mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(sn, prgm);
MC_UNSET_RAW_MEM;
- return 1;
+ int i=0;
+ xbt_fifo_item_t item = xbt_fifo_get_first_item(visited_pairs);
+ mc_pair_visited_t pair_test = NULL;
+
+ while(i < xbt_fifo_size(visited_pairs)){
+
+ 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(sn, pair_test->system_state) == 0){
+ MC_SET_RAW_MEM;
+ MC_free_snapshot(sn);
+ MC_UNSET_RAW_MEM;
+ return 1;
+ }
+ }
+ }
+ }
+
+ item = xbt_fifo_get_next_item(item);
+
+ i++;
+
+ }
+
+ MC_SET_RAW_MEM;
+ MC_free_snapshot(sn);
+ MC_UNSET_RAW_MEM;
+ return 0;
+
}
+}
- return 0;
+void set_pair_visited(xbt_automaton_t a, xbt_state_t st, int sc, char *prgm){
+
+
+ MC_SET_RAW_MEM;
+
+ mc_pair_visited_t pair = NULL;
+ pair = xbt_new0(s_mc_pair_visited_t, 1);
+ pair->automaton_state = st;
+ pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
+ pair->system_state = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(pair->system_state, prgm);
+ 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_pair_t pair){
}
+
int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l){
switch(l->type){
xbt_free(pair);
}
-mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st){
+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){
+void MC_ddfs_stateless_init(xbt_automaton_t a, char *prgm){
XBT_DEBUG("**************************************************");
XBT_DEBUG("Double-DFS stateless init");
MC_wait_for_requests();
MC_SET_RAW_MEM;
+
initial_graph_state = MC_state_pair_new();
xbt_swag_foreach(process, simix_global->process_list){
if(MC_process_is_enabled(process)){
}
}
- reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL);
+ reached_pairs = xbt_fifo_new();
+ visited_pairs = xbt_fifo_new();
+ successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL);
- initial_snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot(initial_snapshot);
+ /* Save the initial state */
+ initial_snapshot_liveness = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot_liveness(initial_snapshot_liveness, prgm);
MC_UNSET_RAW_MEM;
if(state->type == -1){
MC_SET_RAW_MEM;
- mc_initial_pair = new_pair_stateless(initial_graph_state, state);
+ 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_ddfs_stateless(a, 0, 0);
- }else{
- MC_restore_snapshot(initial_snapshot);
+ if(cursor != 0){
+ MC_restore_snapshot(initial_snapshot_liveness);
MC_UNSET_RAW_MEM;
- MC_ddfs_stateless(a, 0, 0);
}
+
+ MC_ddfs_stateless(a, 0, 0, prgm);
+
}else{
if(state->type == 2){
MC_SET_RAW_MEM;
- mc_initial_pair = new_pair_stateless(initial_graph_state, state);
+ 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, prgm);
- if(cursor == 0){
- MC_ddfs_stateless(a, 1, 0);
- }else{
- MC_restore_snapshot(initial_snapshot);
+ if(cursor != 0){
+ MC_restore_snapshot(initial_snapshot_liveness);
MC_UNSET_RAW_MEM;
- MC_ddfs_stateless(a, 1, 0);
}
+
+ MC_ddfs_stateless(a, 1, 0, prgm);
+
}
}
}
}
-void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay){
+void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay, char *prgm){
smx_process_t process;
mc_pair_stateless_t current_pair = 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);
+ 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)){
/* Update current state in buchi automaton */
a->current_state = current_pair->automaton_state;
+
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));
-
-
+ XBT_DEBUG("Pair : graph=%p, automaton=%p(%s), %u interleave", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id, MC_state_interleave_size(current_pair->graph_state));
+
mc_stats_pair->visited_pairs++;
+ //sleep(1);
+
int value;
mc_state_t next_graph_state = NULL;
smx_req_t req = NULL;
mc_pair_stateless_t next_pair = NULL;
mc_pair_stateless_t pair_succ;
- mc_snapshot_t next_snapshot = NULL;
- mc_snapshot_t current_snapshot = NULL;
-
- xbt_dynar_t successors = NULL;
-
- MC_SET_RAW_MEM;
- successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL);
- 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;
+ if(xbt_fifo_size(mc_stack_liveness_stateless) < MAX_DEPTH_LIVENESS){
- /* 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);
- }
+ set_pair_visited(a, current_pair->automaton_state, search_cycle, prgm);
- //sleep(1);
+ if(current_pair->requests > 0){
- MC_state_set_executed_request(current_pair->graph_state, req, value);
-
- /* Answer the request */
- SIMIX_request_pre(req, value);
-
- /* Wait for requests (schedules processes) */
- MC_wait_for_requests();
-
-
- MC_SET_RAW_MEM;
-
- /* Create the new expanded graph_state */
- 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);
-
- xbt_dynar_reset(successors);
-
- if(snapshot_compare(current_snapshot,next_snapshot)){
- XBT_DEBUG("Different snapshot");
- //sleep(2);
-
- }
+ 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_UNSET_RAW_MEM;
+ MC_state_set_executed_request(current_pair->graph_state, req, value);
+ /* Answer the request */
+ SIMIX_request_pre(req, value);
- cursor= 0;
- xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
+ /* Wait for requests (schedules processes) */
+ MC_wait_for_requests();
- 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);
- xbt_dynar_push(successors, &next_pair);
- MC_UNSET_RAW_MEM;
- }
-
- }
- cursor = 0;
-
- xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
-
- res = MC_automaton_evaluate_label(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);
- xbt_dynar_push(successors, &next_pair);
- MC_UNSET_RAW_MEM;
- }
+ /* Create the new expanded graph_state */
+ 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);
+ }
+ }
-
- if(xbt_dynar_length(successors) == 0){
- MC_SET_RAW_MEM;
- next_pair = new_pair_stateless(next_graph_state, current_pair->automaton_state);
- xbt_dynar_push(successors, &next_pair);
- MC_UNSET_RAW_MEM;
- }
+ xbt_dynar_reset(successors);
- cursor = 0;
+ MC_UNSET_RAW_MEM;
- xbt_dynar_foreach(successors, cursor, pair_succ){
-
- if((search_cycle == 1) && (reached(a, next_snapshot) == 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);
- }
-
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
- MC_UNSET_RAW_MEM;
- MC_ddfs_stateless(a, search_cycle, 0);
+ cursor= 0;
+ xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
-
- if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
+ res = MC_automaton_evaluate_label(a, transition_succ->label);
- XBT_DEBUG("Acceptance pair %p : graph=%p, automaton=%p(%s)", pair_succ, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
- int res = set_pair_reached(a, next_snapshot);
+ 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;
+ }
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
- MC_UNSET_RAW_MEM;
-
- MC_ddfs_stateless(a, 1, 1);
-
- if(res){
- MC_SET_RAW_MEM;
- xbt_dynar_pop(reached_pairs, NULL);
- MC_UNSET_RAW_MEM;
}
- }
- }
- 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);
- }
+ cursor = 0;
- }
-
- MC_SET_RAW_MEM;
- xbt_fifo_shift(mc_stack_liveness_stateless);
- XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle);
- MC_UNSET_RAW_MEM;
+ 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;
+ }
-}
+ }
-/********************* Double-DFS stateful without visited state *******************/
+ cursor = 0;
+
+ xbt_dynar_foreach(successors, cursor, pair_succ){
+ if(!visited(a, pair_succ->automaton_state, search_cycle, prgm)){
-void MC_ddfs_stateful_init(xbt_automaton_t a){
+ if(search_cycle == 1){
- XBT_DEBUG("**************************************************");
- XBT_DEBUG("Double-DFS stateful without visited state init");
- XBT_DEBUG("**************************************************");
-
- mc_pair_t mc_initial_pair;
- mc_state_t initial_graph_state;
- smx_process_t process;
- mc_snapshot_t init_snapshot;
-
- MC_wait_for_requests();
+ if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
+
+ if(reached(a, pair_succ->automaton_state, prgm) == 1){
- MC_SET_RAW_MEM;
+ 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));
- init_snapshot = xbt_new0(s_mc_snapshot_t, 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);
- initial_graph_state = MC_state_pair_new();
- xbt_swag_foreach(process, simix_global->process_list){
- if(MC_process_is_enabled(process)){
- MC_state_interleave_process(initial_graph_state, process);
- }
- }
+ }else{
- reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL);
+ 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, prgm);
- MC_take_snapshot(init_snapshot);
+ }
- MC_UNSET_RAW_MEM;
+ }
- unsigned int cursor = 0;
- xbt_state_t state = NULL;
+ }else{
+
+ if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
- xbt_dynar_foreach(a->states, cursor, state){
- if(state->type == -1){
-
- MC_SET_RAW_MEM;
- mc_initial_pair = new_pair(init_snapshot, initial_graph_state, state);
- xbt_fifo_unshift(mc_stack_liveness_stateful, mc_initial_pair);
- MC_UNSET_RAW_MEM;
+ 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, prgm);
+
+ search_cycle = 1;
- if(cursor == 0){
- MC_ddfs_stateful(a, 0, 0);
- }else{
- MC_restore_snapshot(init_snapshot);
- MC_UNSET_RAW_MEM;
- MC_ddfs_stateful(a, 0, 0);
- }
- }else{
- if(state->type == 2){
-
- MC_SET_RAW_MEM;
- mc_initial_pair = new_pair(init_snapshot, initial_graph_state, state);
- xbt_fifo_unshift(mc_stack_liveness_stateful, mc_initial_pair);
- MC_UNSET_RAW_MEM;
-
- if(cursor == 0){
- MC_ddfs_stateful(a, 1, 0);
- }else{
- MC_restore_snapshot(init_snapshot);
- MC_UNSET_RAW_MEM;
- MC_ddfs_stateful(a, 1, 0);
- }
- }
- }
- }
-}
+ }
+ }
-void MC_ddfs_stateful(xbt_automaton_t a, int search_cycle, int restore){
+ MC_SET_RAW_MEM;
+ xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
+ MC_UNSET_RAW_MEM;
- smx_process_t process = NULL;
- mc_pair_t current_pair = NULL;
+ MC_ddfs_stateless(a, search_cycle, 0, prgm);
- if(xbt_fifo_size(mc_stack_liveness_stateful) == 0)
- return;
+ /* 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(restore == 1){
- current_pair = (mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateful));
- MC_restore_snapshot(current_pair->system_state);
- xbt_swag_foreach(process, simix_global->process_list){
- if(MC_process_is_enabled(process)){
- MC_state_interleave_process(current_pair->graph_state, process);
+ 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);
+ }
}
- }
- MC_UNSET_RAW_MEM;
- }
- /* Get current state */
- current_pair = (mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateful));
+
+ }else{ /*No request to execute, search evolution in Büchi automaton */
+ MC_SET_RAW_MEM;
- XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness_stateful), 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));
+ /* Create the new expanded graph_state */
+ next_graph_state = MC_state_pair_new();
- a->current_state = current_pair->automaton_state;
+ xbt_dynar_reset(successors);
- mc_stats_pair->visited_pairs++;
+ MC_UNSET_RAW_MEM;
- int value;
- mc_state_t next_graph_state = NULL;
- smx_req_t req = NULL;
- char *req_str;
- mc_pair_t pair_succ;
- xbt_transition_t transition_succ;
- unsigned int cursor;
- int res;
+ cursor= 0;
+ xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
- xbt_dynar_t successors = NULL;
+ res = MC_automaton_evaluate_label(a, transition_succ->label);
- mc_pair_t next_pair = NULL;
- mc_snapshot_t next_snapshot = NULL;
- mc_snapshot_t current_snapshot = NULL;
+ 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;
+ }
- //sleep(1);
- MC_SET_RAW_MEM;
- successors = xbt_dynar_new(sizeof(mc_pair_t), NULL);
- 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;
+ cursor = 0;
-
- /* 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);
-
- /* 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;
+ 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;
+ }
- 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);
+ cursor = 0;
+
+ xbt_dynar_foreach(successors, cursor, pair_succ){
- xbt_dynar_reset(successors);
+ if(!visited(a, pair_succ->automaton_state, search_cycle, prgm)){
- MC_UNSET_RAW_MEM;
+ if(search_cycle == 1){
-
- cursor = 0;
- xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
+ if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 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_dynar_push(successors, &next_pair);
- MC_UNSET_RAW_MEM;
- }
+ if(reached(a, pair_succ->automaton_state, prgm) == 1){
- }
+ XBT_DEBUG("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness_stateless) + 1);
- cursor = 0;
- xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
+ 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);
- res = MC_automaton_evaluate_label(a, transition_succ->label);
-
- if(res == 2){ // transition always enabled in automaton
- MC_SET_RAW_MEM;
- next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst);
- xbt_dynar_push(successors, &next_pair);
- MC_UNSET_RAW_MEM;
- }
-
-
- }
-
-
- if(xbt_dynar_length(successors) == 0){
+ }else{
- 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;
-
- }
+ 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, prgm);
- //XBT_DEBUG("Successors in automaton %lu", xbt_dynar_length(successors));
+ }
- 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);
+ }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))){
- if((search_cycle == 1) && (reached(a, next_snapshot) == 1)){
- XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
- XBT_INFO("| ACCEPTANCE CYCLE |");
- XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
- XBT_INFO("Counter-example that violates formula :");
- MC_show_stack_liveness_stateful(mc_stack_liveness_stateful);
- MC_dump_stack_liveness_stateful(mc_stack_liveness_stateful);
- MC_print_statistics_pairs(mc_stats_pair);
- exit(0);
- }
-
- //mc_stats_pair->executed_transitions++;
-
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ);
- MC_UNSET_RAW_MEM;
+ set_pair_reached(a, pair_succ->automaton_state, prgm);
+
+ search_cycle = 1;
- MC_ddfs_stateful(a, search_cycle, 0);
-
-
- if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
+ }
- int res = set_pair_reached(a, next_snapshot);
- XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
-
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ);
- MC_UNSET_RAW_MEM;
-
- MC_ddfs_stateful(a, 1, 1);
+ }
- if(res){
MC_SET_RAW_MEM;
- xbt_dynar_pop(reached_pairs, NULL);
+ 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");
+
}
+
}
-
+
}
+
+ }else{
+
+ XBT_DEBUG("Max depth reached");
- if(MC_state_interleave_size(current_pair->graph_state) > 0){
- XBT_DEBUG("Backtracking to depth %u", xbt_fifo_size(mc_stack_liveness_stateful));
- MC_restore_snapshot(current_snapshot);
- 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, 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) );
+ }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) );
}
MC_SET_RAW_MEM;
- xbt_fifo_shift(mc_stack_liveness_stateful);
- XBT_DEBUG("Pair (graph=%p, automaton =%p) shifted in stack", current_pair->graph_state, current_pair->automaton_state);
+ 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);
+ }
MC_UNSET_RAW_MEM;
+
}
+
