xbt_dynar_t initial_pairs = NULL;
xbt_dynar_t reached_pairs;
+xbt_dynar_t successors = NULL;
extern mc_snapshot_t initial_snapshot;
+/* Global variables for stateless algorithm */
+mc_snapshot_t snapshot = NULL;
+
+/* Global variables for stateful algorithm */
+mc_snapshot_t next_snapshot = NULL;
+mc_snapshot_t current_snapshot = NULL;
+
+
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);
}
-int reached(xbt_automaton_t a){
+int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
+
+ if(s1->num_reg != s2->num_reg)
+ return 1;
+
+ int i, 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)
+ return 1;
+
+ 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)");
+ sleep(1);
+ errors++;
+ }
+ }else{
+ if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
+ XBT_DEBUG("Different memcmp for data in libsimgrid");
+ sleep(1);
+ errors++;
+ }
+ }
+
+
+ }
+
+ return (errors>0);
+
+}
+
+int reached(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t s){
+
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);
+ 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 size = xbt_dynar_length(pair->prop_ato);
- //int i, d1, d2;
-
+
xbt_dynar_foreach(reached_pairs, cursor, pair_test){
- /*if(memcmp(pair_test->automaton_state, pair->automaton_state, sizeof(xbt_state_t)) == 0){
- for(i=0; i< size; i++){
- d1 = xbt_dynar_get_as(pair->prop_ato, i, int);
- d2 = xbt_dynar_get_as(pair_test->prop_ato, i, int);
- if(d1 == d2){
+ 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, s) == 0){
MC_UNSET_RAW_MEM;
return 1;
}
}
- }*/
-
- if(memcmp(pair_test, pair, sizeof(mc_pair_reached_t)) == 0){
- MC_UNSET_RAW_MEM;
- return 1;
}
}
}
}
-int set_pair_reached(xbt_automaton_t a){
-
- if(reached(a) == 0){
-
- 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);
-
- /* 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(reached_pairs, &pair);
-
- MC_UNSET_RAW_MEM;
-
- return 1;
+void set_pair_reached(xbt_automaton_t a, xbt_state_t st, mc_snapshot_t sn){
+
+ 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;
+
+ /* 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);
}
-
- return 0;
+
+ xbt_dynar_push(reached_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){
-/******************************* DFS with visited state *******************************/
-
-xbt_dynar_t visited_pairs;
-void set_pair_visited(mc_pair_t pair, int sc){
- MC_SET_RAW_MEM;
- mc_visited_pair_t p = NULL;
- p = xbt_new0(s_mc_visited_pair_t, 1);
- p->pair = pair;
- p->search_cycle = sc;
- char hash[41];
- xbt_sha((const char *)&p, hash);
- xbt_dynar_push(visited_pairs, &hash);
- MC_UNSET_RAW_MEM;
+/********************* 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);
}
-int visited(mc_pair_t pair, int sc){
-
- MC_SET_RAW_MEM;
-
- mc_visited_pair_t p = NULL;
- p = xbt_new0(s_mc_visited_pair_t, 1);
- p->pair = pair;
- p->search_cycle = sc;
- char hash[41];
- xbt_sha((const char *)&p, hash);
- if(xbt_dynar_member(visited_pairs, hash)){
- MC_UNSET_RAW_MEM;
- return 1;
- }else{
- MC_UNSET_RAW_MEM;
- return 0;
- }
+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_vddfs_stateful_init(xbt_automaton_t a){
+
+void MC_ddfs_stateless_init(xbt_automaton_t a){
XBT_DEBUG("**************************************************");
- XBT_DEBUG("Double-DFS stateful with visited state init");
+ XBT_DEBUG("Double-DFS stateless init");
XBT_DEBUG("**************************************************");
- mc_pair_t mc_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 init_snapshot;
MC_wait_for_requests();
MC_SET_RAW_MEM;
- init_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)){
}
}
- visited_pairs = xbt_dynar_new(sizeof(char *), NULL);
reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL);
+ successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL);
+ snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot(init_snapshot);
+ initial_snapshot = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot(initial_snapshot);
MC_UNSET_RAW_MEM;
unsigned int cursor = 0;
- xbt_state_t state = NULL;
+ xbt_state_t state;
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_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_vddfs_stateful(a, 0, 0);
+ MC_ddfs_stateless(a, 0, 0);
}else{
- MC_restore_snapshot(init_snapshot);
+ MC_restore_snapshot(initial_snapshot);
MC_UNSET_RAW_MEM;
- MC_vddfs_stateful(a, 0, 0);
+ MC_ddfs_stateless(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_vddfs_stateful(a, 1, 0);
- }else{
- MC_restore_snapshot(init_snapshot);
- MC_UNSET_RAW_MEM;
- MC_vddfs_stateful(a, 1, 0);
- }
- }
+ 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;
+
+ if(cursor == 0){
+ MC_ddfs_stateless(a, 1, 0);
+ }else{
+ MC_restore_snapshot(initial_snapshot);
+ MC_UNSET_RAW_MEM;
+ MC_ddfs_stateless(a, 1, 0);
+ }
+ }
}
}
-}
+}
-void MC_vddfs_stateful(xbt_automaton_t a, int search_cycle, int restore){
- smx_process_t process = NULL;
+void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay){
+ smx_process_t process;
+ mc_pair_stateless_t current_pair = NULL;
- if(xbt_fifo_size(mc_stack_liveness_stateful) == 0)
+ if(xbt_fifo_size(mc_stack_liveness_stateless) == 0)
return;
- if(restore == 1){
- MC_restore_snapshot(((mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateful)))->system_state);
- MC_UNSET_RAW_MEM;
- }
-
-
- /* Get current state */
- mc_pair_t current_pair = (mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateful));
-
- if(restore == 1){
+ if(replay == 1){
+ MC_replay_liveness(mc_stack_liveness_stateless);
+ 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);
}
}
- 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));
-
+ /* Get current pair */
+ current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateless));
+
+ /* 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));
+
+
mc_stats_pair->visited_pairs++;
int value;
smx_req_t req = NULL;
char *req_str;
-
xbt_transition_t transition_succ;
- unsigned int cursor;
+ unsigned int cursor = 0;
int res;
- xbt_dynar_t successors = NULL;
+ mc_pair_stateless_t next_pair = NULL;
+ mc_pair_stateless_t pair_succ;
- mc_pair_t next_pair = NULL;
- mc_snapshot_t next_snapshot = NULL;
- mc_snapshot_t current_snapshot = NULL;
- mc_pair_t pair_succ = NULL;
- 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){
+ if(MC_state_interleave_size(current_pair->graph_state) > 0){
- MC_SET_RAW_MEM;
- current_snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot(current_snapshot);
- MC_UNSET_RAW_MEM;
+ while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL && (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);
- }
-
- 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();
-
+ /* Debug information */
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ req_str = MC_request_to_string(req, value);
+ XBT_DEBUG("Execute: %s", req_str);
+ xbt_free(req_str);
+ }
- /* Create the new expanded graph_state */
- MC_SET_RAW_MEM;
+ //sleep(1);
- 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);
- }
- }
+ MC_state_set_executed_request(current_pair->graph_state, req, value);
- next_snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot(next_snapshot);
+ /* Answer the request */
+ SIMIX_request_pre(req, value);
- xbt_dynar_reset(successors);
+ /* Wait for requests (schedules processes) */
+ MC_wait_for_requests();
- 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){
- 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;
- }
- }
+ MC_SET_RAW_MEM;
- cursor = 0;
- xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
+ /* Create the new expanded graph_state */
+ next_graph_state = MC_state_pair_new();
- res = MC_automaton_evaluate_label(a, transition_succ->label);
-
- if(res == 2){
- 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;
+ /* 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){
+ xbt_dynar_reset(successors);
- 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("Successors length %lu", xbt_dynar_length(successors));
+ cursor= 0;
+ xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
- cursor = 0;
-
- xbt_dynar_foreach(successors, cursor, pair_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;
+ }
- /*XBT_DEBUG("Search reached pair %p : graph=%p, automaton=%p", pair_succ, pair_succ->graph_state, pair_succ->automaton_state);
- char hash[41];
- XBT_DEBUG("Const char pair %s", (const char *)&pair_succ);
- xbt_sha((const char *)&pair_succ, hash);
- XBT_DEBUG("Hash pair_succ %s", hash);*/
-
- if((search_cycle == 1) && (reached(a) == 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);
}
- XBT_DEBUG("Search visited pair %p : graph %p, automaton %p", pair_succ, pair_succ->graph_state, pair_succ->automaton_state);
+ cursor = 0;
+
+ xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
+
+ res = MC_automaton_evaluate_label(a, transition_succ->label);
- if(visited(pair_succ, search_cycle) == 0){
+ 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;
+ }
- //mc_stats_pair->executed_transitions++;
- set_pair_visited(pair_succ, search_cycle);
+ }
+
+ if(xbt_dynar_length(successors) == 0){
MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ);
+ next_pair = new_pair_stateless(next_graph_state, current_pair->automaton_state, MC_state_interleave_size(next_graph_state));
+ xbt_dynar_push(successors, &next_pair);
MC_UNSET_RAW_MEM;
+ }
- MC_vddfs_stateful(a, search_cycle, 0);
+ cursor = 0;
- //XBT_DEBUG("Pair (graph=%p, automaton=%p) expanded", pair_succ->graph_state, pair_succ->automaton_state);
+ xbt_dynar_foreach(successors, cursor, pair_succ){
- if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
+
- XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
- int res = set_pair_reached(a);
-
+ if((search_cycle == 1) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)) ){
+
MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ);
+ MC_take_snapshot(snapshot);
MC_UNSET_RAW_MEM;
-
- MC_vddfs_stateful(a, 1, 1);
- if(res){
- MC_SET_RAW_MEM;
- xbt_dynar_pop(reached_pairs, NULL);
- MC_UNSET_RAW_MEM;
+ 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);
}
+ }
+
+ if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
+ XBT_DEBUG("Take snapshot of acceptance pair (depth = %d)", xbt_fifo_size(mc_stack_liveness_stateless) + 1 );
+ MC_SET_RAW_MEM;
+ MC_take_snapshot(snapshot);
+ 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, search_cycle, 0);
+
+
+ if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
+
+ XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
+
+
+ set_pair_reached(a, pair_succ->automaton_state, snapshot);
+
- }else{
+ /* Pair shifted from stack when first MC_ddfs finished and returned at this point */
+ MC_SET_RAW_MEM;
+ xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
+ MC_UNSET_RAW_MEM;
+
+ MC_ddfs_stateless(a, 1, 1);
- XBT_DEBUG("Pair already visited !");
+ /* No acceptance cycle with this acceptance pair, we remove it from the list reached_pairs */
+ MC_SET_RAW_MEM;
+ xbt_dynar_pop(reached_pairs, NULL);
+ MC_UNSET_RAW_MEM;
+
+ }
}
+
+ XBT_DEBUG("Backtracking to depth %u", xbt_fifo_size(mc_stack_liveness_stateless));
+ MC_replay_liveness(mc_stack_liveness_stateless);
+
}
+
+ }else{ /*No request to execute, search evolution in Büchi automaton */
- if(MC_state_interleave_size(current_pair->graph_state) > 0){
- MC_restore_snapshot(current_snapshot);
+ if((xbt_fifo_size(mc_stack_liveness_stateless) < MAX_DEPTH_LIVENESS)){
+
+ // MC_state_set_executed_request(current_pair->graph_state, NULL, 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();
+
+ 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){
+
+ 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;
+ }
+
+ }
+
+
+ if(xbt_dynar_length(successors) == 0){
+ MC_SET_RAW_MEM;
+ next_pair = new_pair_stateless(next_graph_state, current_pair->automaton_state, MC_state_interleave_size(next_graph_state));
+ xbt_dynar_push(successors, &next_pair);
+ MC_UNSET_RAW_MEM;
+ }
+
+ cursor = 0;
+
+ xbt_dynar_foreach(successors, cursor, pair_succ){
+
+ if((search_cycle == 1) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)) ){
+
+ MC_SET_RAW_MEM;
+ MC_take_snapshot(snapshot);
+ MC_UNSET_RAW_MEM;
+
+ 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);
+ }
+ }
+
+
+ if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
+ XBT_DEBUG("Take snapshot of acceptance pair (depth = %d)", xbt_fifo_size(mc_stack_liveness_stateless) + 1 );
+ MC_SET_RAW_MEM;
+ MC_take_snapshot(snapshot);
+ 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, search_cycle, 0);
+
+
+ if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
+
+ XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
+
+
+ set_pair_reached(a, pair_succ->automaton_state, snapshot);
+
+
+ /* Pair shifted from stack when first MC_ddfs finished and returned at this point */
+ MC_SET_RAW_MEM;
+ xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
+ MC_UNSET_RAW_MEM;
+
+ MC_ddfs_stateless(a, 1, 1);
+
+ /* No acceptance cycle with this acceptance pair, we remove it from the list reached_pairs */
+ MC_SET_RAW_MEM;
+ xbt_dynar_pop(reached_pairs, NULL);
+ MC_UNSET_RAW_MEM;
+
+ }
+ }
}
- }
+ }
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);
+ 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;
-
-
}
-
-
/********************* Double-DFS stateful without visited state *******************/
MC_SET_RAW_MEM;
- init_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)){
}
reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL);
-
+ successors = xbt_dynar_new(sizeof(mc_pair_t), NULL);
+ current_snapshot = xbt_new0(s_mc_snapshot_t, 1);
+ next_snapshot = xbt_new0(s_mc_snapshot_t, 1);
+
+ init_snapshot = xbt_new0(s_mc_snapshot_t, 1);
MC_take_snapshot(init_snapshot);
MC_UNSET_RAW_MEM;
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));
a->current_state = current_pair->automaton_state;
+
+ //sleep(1);
mc_stats_pair->visited_pairs++;
unsigned int cursor;
int res;
- xbt_dynar_t successors = NULL;
-
mc_pair_t next_pair = NULL;
- mc_snapshot_t next_snapshot = NULL;
- mc_snapshot_t current_snapshot = NULL;
-
- //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;
-
-
+
/* Debug information */
if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
req_str = MC_request_to_string(req, value);
+ 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("Execute: %s", req_str);
xbt_free(req_str);
}
}
}
- next_snapshot = xbt_new0(s_mc_snapshot_t, 1);
MC_take_snapshot(next_snapshot);
xbt_dynar_reset(successors);
}
- //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);
-
- if((search_cycle == 1) && (reached(a) == 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);
+ if((search_cycle == 1) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
+
+ if(reached(a, pair_succ->automaton_state, 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(1);
+ }
}
- //mc_stats_pair->executed_transitions++;
MC_SET_RAW_MEM;
xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ);
if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
- int res = set_pair_reached(a);
XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id);
+ set_pair_reached(a, pair_succ->automaton_state, next_snapshot);
MC_SET_RAW_MEM;
xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ);
MC_UNSET_RAW_MEM;
- MC_ddfs_stateful(a, 1, 1);
+ MC_ddfs_stateful(a, 1, 0);
- if(res){
- MC_SET_RAW_MEM;
- xbt_dynar_pop(reached_pairs, NULL);
- MC_UNSET_RAW_MEM;
- }
+
+ MC_SET_RAW_MEM;
+ xbt_dynar_pop(reached_pairs, NULL);
+ MC_UNSET_RAW_MEM;
}
}
MC_UNSET_RAW_MEM;
}
-
-
-
-/********************* 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){
- mc_pair_stateless_t p = NULL;
- p = xbt_new0(s_mc_pair_stateless_t, 1);
- p->automaton_state = st;
- p->graph_state = sg;
- mc_stats_pair->expanded_pairs++;
- return p;
-}
-
-
-
-void MC_ddfs_stateless_init(xbt_automaton_t a){
-
- XBT_DEBUG("**************************************************");
- XBT_DEBUG("Double-DFS stateless init");
- XBT_DEBUG("**************************************************");
-
- mc_pair_stateless_t mc_initial_pair = NULL;
- mc_state_t initial_graph_state = NULL;
- smx_process_t process;
-
- 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)){
- MC_state_interleave_process(initial_graph_state, process);
- }
- }
-
- reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL);
-
- initial_snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot(initial_snapshot);
-
- MC_UNSET_RAW_MEM;
-
- unsigned int cursor = 0;
- xbt_state_t state;
-
- xbt_dynar_foreach(a->states, cursor, state){
- if(state->type == -1){
-
- MC_SET_RAW_MEM;
- mc_initial_pair = new_pair_stateless(initial_graph_state, 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);
- MC_UNSET_RAW_MEM;
- MC_ddfs_stateless(a, 0, 0);
- }
- }else{
- if(state->type == 2){
-
- MC_SET_RAW_MEM;
- mc_initial_pair = new_pair_stateless(initial_graph_state, state);
- xbt_fifo_unshift(mc_stack_liveness_stateless, mc_initial_pair);
- MC_UNSET_RAW_MEM;
-
- if(cursor == 0){
- MC_ddfs_stateless(a, 1, 0);
- }else{
- MC_restore_snapshot(initial_snapshot);
- MC_UNSET_RAW_MEM;
- MC_ddfs_stateless(a, 1, 0);
- }
- }
- }
- }
-
-}
-
-
-void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay){
-
- smx_process_t process;
- mc_pair_stateless_t current_pair = NULL;
-
- if(xbt_fifo_size(mc_stack_liveness_stateless) == 0)
- return;
-
- if(replay == 1){
- MC_replay_liveness(mc_stack_liveness_stateless);
- 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 state */
- current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateless));
-
- /* Update current state in 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));
-
-
- mc_stats_pair->visited_pairs++;
-
- int value;
- mc_state_t next_graph_state = NULL;
- smx_req_t req = NULL;
- char *req_str;
-
- xbt_transition_t transition_succ;
- unsigned int cursor = 0;
- int res;
-
- mc_pair_stateless_t next_pair = NULL;
- mc_pair_stateless_t pair_succ;
-
- 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){
-
-
- /* 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);
- }
-
- //sleep(1);
-
- 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);
- }
- }
-
- 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);
- 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){ // 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;
- }
-
- }
-
-
- 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;
- }
-
- cursor = 0;
-
-
-
- xbt_dynar_foreach(successors, cursor, pair_succ){
-
- if((search_cycle == 1) && (reached(a) == 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);
-
-
- if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
-
- 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);
-
- 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);
- }
-
- }
-
- 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;
-
-}
-
