xbt_dynar_t initial_pairs = NULL;
int max_pair = 0;
-xbt_dynar_t visited_pairs;
xbt_dynar_t reached_pairs;
-mc_pairs_t new_pair(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st){
- mc_pairs_t p = NULL;
- p = xbt_new0(s_mc_pairs_t, 1);
+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;
}
-void set_pair_visited(mc_state_t gs, xbt_state_t as, int sc){
-
- //XBT_DEBUG("New visited pair : graph=%p, automaton=%p", gs, as);
- MC_SET_RAW_MEM;
- mc_visited_pairs_t p = NULL;
- p = xbt_new0(s_mc_visited_pairs_t, 1);
- p->graph_state = gs;
- p->automaton_state = as;
- p->search_cycle = sc;
- xbt_dynar_push(visited_pairs, &p);
- //XBT_DEBUG("New visited pair , length of visited pairs : %lu", xbt_dynar_length(visited_pairs));
- MC_UNSET_RAW_MEM;
-
- //XBT_DEBUG("New visited pair , length of visited pairs : %lu", xbt_dynar_length(visited_pairs));
-}
-int reached(mc_state_t gs, xbt_state_t as ){
+int reached(mc_pair_t pair){
- mc_reached_pairs_t rp = NULL;
+ char* hash_reached = malloc(sizeof(char)*160);
unsigned int c= 0;
- unsigned int i;
- int different_process;
MC_SET_RAW_MEM;
- xbt_dynar_foreach(reached_pairs, c, rp){
- if(rp->automaton_state == as){
- different_process=0;
- for(i=0; i < gs->max_pid; i++){
- if(gs->proc_status[i].state != rp->graph_state->proc_status[i].state){
- different_process++;
- }
- }
- if(different_process==0){
- MC_UNSET_RAW_MEM;
- XBT_DEBUG("Pair (graph=%p, automaton=%p(%s)) already reached (graph=%p)!", gs, as, as->id, rp->graph_state);
- return 1;
- }
- /* XBT_DEBUG("Pair (graph=%p, automaton=%p(%s)) already reached !", gs, as, as->id); */
- /* return 1; */
+ char *hash = malloc(sizeof(char)*160);
+ xbt_sha((char *)&pair, hash);
+ xbt_dynar_foreach(reached_pairs, c, hash_reached){
+ if(strcmp(hash, hash_reached) == 0){
+ MC_UNSET_RAW_MEM;
+ return 1;
}
}
+
MC_UNSET_RAW_MEM;
return 0;
}
-void set_pair_reached(mc_state_t gs, xbt_state_t as){
+void set_pair_reached(mc_pair_t pair){
- //XBT_DEBUG("Set pair (graph=%p, automaton=%p) reached ", gs, as);
- //if(reached(gs, as) == 0){
+ if(reached(pair) == 0){
MC_SET_RAW_MEM;
- mc_reached_pairs_t p = NULL;
- p = xbt_new0(s_mc_reached_pairs_t, 1);
- p->graph_state = gs;
- p->automaton_state = as;
- xbt_dynar_push(reached_pairs, &p);
- XBT_DEBUG("New reached pair : graph=%p, automaton=%p(%s)", gs, as, as->id);
+ char *hash = malloc(sizeof(char)*160) ;
+ xbt_sha((char *)&pair, hash);
+ xbt_dynar_push(reached_pairs, &hash);
MC_UNSET_RAW_MEM;
- //}
+ }
}
-int visited(mc_state_t gs, xbt_state_t as, int sc){
- unsigned int c = 0;
- mc_visited_pairs_t p = NULL;
- unsigned int i;
- int different_process;
+void MC_pair_delete(mc_pair_t pair){
+ xbt_free(pair->graph_state->proc_status);
+ xbt_free(pair->graph_state);
+ //xbt_free(pair->automaton_state); -> FIXME : à implémenter
+ xbt_free(pair);
+}
- //XBT_DEBUG("Visited pair length : %lu", xbt_dynar_length(visited_pairs));
- MC_SET_RAW_MEM;
- xbt_dynar_foreach(visited_pairs, c, p){
- //XBT_DEBUG("Test pair visited");
- //sleep(1);
- if((p->automaton_state == as) && (p->search_cycle == sc)){
- different_process=0;
- for(i=0; i < gs->max_pid; i++){
- if(gs->proc_status[i].state != p->graph_state->proc_status[i].state){
- different_process++;
- }
- }
- if(different_process==0){
- MC_UNSET_RAW_MEM;
- return 1;
+int MC_automaton_evaluate_label(xbt_automaton_t a, 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);
+ 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);
+ return (left_res && right_res);
+ break;
+ }
+ case 2 : {
+ int res = MC_automaton_evaluate_label(a, 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){
+ if(strcmp(p->pred, l->u.predicat) == 0){
+ int (*f)() = p->function;
+ return (*f)();
}
}
+ return -1;
+ break;
+ }
+ case 4 : {
+ return 2;
+ break;
+ }
+ default :
+ return -1;
+ }
+}
+
+
+
+/******************************* 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 = malloc(sizeof(char)*160);
+ xbt_sha((char *)&p, hash);
+ xbt_dynar_push(visited_pairs, &hash);
+ MC_UNSET_RAW_MEM;
+
+}
+
+int visited(mc_pair_t pair, int sc){
+
+ char* hash_visited = malloc(sizeof(char)*160);
+ unsigned int c= 0;
+
+ 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 = malloc(sizeof(char)*160);
+ xbt_sha((char *)&p, hash);
+ xbt_dynar_foreach(visited_pairs, c, hash_visited){
+ if(strcmp(hash, hash_visited) == 0){
+ MC_UNSET_RAW_MEM;
+ return 1;
+ }
}
+
MC_UNSET_RAW_MEM;
return 0;
}
-void MC_dfs_init(xbt_automaton_t a){
+
+void MC_vddfs_stateful_init(xbt_automaton_t a){
XBT_DEBUG("**************************************************");
- XBT_DEBUG("DFS init");
+ XBT_DEBUG("Double-DFS stateful with visited state init");
XBT_DEBUG("**************************************************");
- mc_pairs_t mc_initial_pair;
+ mc_pair_t mc_initial_pair;
mc_state_t initial_graph_state;
smx_process_t process;
mc_snapshot_t init_snapshot;
}
}
- visited_pairs = xbt_dynar_new(sizeof(mc_visited_pairs_t), NULL);
- reached_pairs = xbt_dynar_new(sizeof(mc_reached_pairs_t), NULL);
+ visited_pairs = xbt_dynar_new(sizeof(char *), NULL);
+ reached_pairs = xbt_dynar_new(sizeof(char *), NULL);
MC_take_snapshot(init_snapshot);
MC_UNSET_RAW_MEM;
- /* unsigned int cursor = 0; */
- /* xbt_state_t state = NULL; */
- /* int nb_init_state = 0; */
-
- /* xbt_dynar_foreach(a->states, cursor, state){ */
- /* if(state->type == -1){ */
-
- /* MC_SET_RAW_MEM; */
- /* mc_initial_pair = new_pair(init_snapshot, initial_graph_state, state); */
-
- /* xbt_fifo_unshift(mc_snapshot_stack, mc_initial_pair); */
-
- /* XBT_DEBUG("**************************************************"); */
- /* XBT_DEBUG("Initial state=%p ", mc_initial_pair); */
-
- /* MC_UNSET_RAW_MEM; */
-
- /* set_pair_visited(mc_initial_pair->graph_state, mc_initial_pair->automaton_state, 0); */
-
- /* if(nb_init_state == 0) */
- /* MC_dfs(a, 0, 0); */
- /* else */
- /* MC_dfs(a, 0, 1); */
-
- /* nb_init_state++; */
- /* } */
- /* } */
-
/* regarder dans l'automate toutes les transitions activables grâce à l'état initial du système
-> donnera les états initiaux de la propriété consistants avec l'état initial du système */
xbt_state_t state = NULL;
int res;
xbt_transition_t transition_succ;
- xbt_dynar_t successors = xbt_dynar_new(sizeof(mc_pairs_t), NULL);
- xbt_dynar_t elses = xbt_dynar_new(sizeof(mc_pairs_t), NULL);
- mc_pairs_t pair_succ;
+ xbt_dynar_t successors = xbt_dynar_new(sizeof(mc_pair_t), NULL);
+ mc_pair_t pair_succ;
xbt_dynar_foreach(a->states, cursor, state){
if(state->type == -1){
xbt_dynar_foreach(state->out, cursor2, transition_succ){
res = MC_automaton_evaluate_label(a, transition_succ->label);
- if(res == 1){
+ if((res == 1) || (res == 2)){
MC_SET_RAW_MEM;
MC_UNSET_RAW_MEM;
- }else{
- if(res == 2){
-
- MC_SET_RAW_MEM;
-
- mc_initial_pair = new_pair(init_snapshot, initial_graph_state, transition_succ->dst);
- xbt_dynar_push(elses, &mc_initial_pair);
-
- MC_UNSET_RAW_MEM;
- }
}
}
}
}
-
cursor = 0;
- xbt_dynar_foreach(successors, cursor, pair_succ){
- MC_SET_RAW_MEM;
-
- xbt_fifo_unshift(mc_snapshot_stack, pair_succ);
- XBT_DEBUG("**************************************************");
- XBT_DEBUG("Initial pair=%p (graph=%p, automaton=%p(%s)) ", pair_succ, pair_succ->graph_state, pair_succ->automaton_state,pair_succ->automaton_state->id );
-
- MC_UNSET_RAW_MEM;
-
- set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, 0);
+ if(xbt_dynar_length(successors) == 0){
+ xbt_dynar_foreach(a->states, cursor, state){
+ if(state->type == -1){
+ MC_SET_RAW_MEM;
- if(cursor == 0){
- MC_dfs(a, 0, 0);
- }else{
- MC_dfs(a, 0, 1);
+ mc_initial_pair = new_pair(init_snapshot, initial_graph_state, transition_succ->dst);
+ xbt_dynar_push(successors, &mc_initial_pair);
+
+ MC_UNSET_RAW_MEM;
+ }
}
}
cursor = 0;
- xbt_dynar_foreach(elses, cursor, pair_succ){
+ xbt_dynar_foreach(successors, cursor, pair_succ){
MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_snapshot_stack, pair_succ);
-
- XBT_DEBUG("**************************************************");
- XBT_DEBUG("Initial pair=%p (graph=%p, automaton=%p(%s)) ", pair_succ, pair_succ->graph_state, pair_succ->automaton_state,pair_succ->automaton_state->id );
+ xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ);
+ set_pair_visited(pair_succ, 0);
MC_UNSET_RAW_MEM;
- set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, 0);
-
- if((xbt_dynar_length(successors) == 0) && (cursor == 0)){
- MC_dfs(a, 0, 0);
+ if(cursor == 0){
+ MC_vddfs_stateful(a, 0, 0);
}else{
- MC_dfs(a, 0, 1);
+ MC_vddfs_stateful(a, 0, 1);
}
- }
-
+ }
}
-void MC_dfs(xbt_automaton_t a, int search_cycle, int restore){
+void MC_vddfs_stateful(xbt_automaton_t a, int search_cycle, int restore){
smx_process_t process = NULL;
- if(xbt_fifo_size(mc_snapshot_stack) == 0)
+ if(xbt_fifo_size(mc_stack_liveness_stateful) == 0)
return;
if(restore == 1){
- MC_restore_snapshot(((mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack)))->system_state);
+ MC_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;
}
- //XBT_DEBUG("Lpv length after restore snapshot: %lu", xbt_dynar_length(visited_pairs));
/* Get current state */
- mc_pairs_t current_pair = (mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack));
+ mc_pair_t current_pair = (mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateful));
if(restore==1){
xbt_swag_foreach(process, simix_global->process_list){
if(MC_process_is_enabled(process)){
- //XBT_DEBUG("Pid : %lu", process->pid);
MC_state_interleave_process(current_pair->graph_state, process);
}
}
}
XBT_DEBUG("************************************************** ( search_cycle = %d )", search_cycle);
- XBT_DEBUG("State : graph=%p, automaton=%p(%s), %u interleave", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id,MC_state_interleave_size(current_pair->graph_state));
- //XBT_DEBUG("Restore : %d", restore);
+ XBT_DEBUG("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("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
-
- //sleep(1);
mc_stats_pair->visited_pairs++;
smx_req_t req = NULL;
char *req_str;
- mc_pairs_t pair_succ;
+ mc_pair_t pair_succ;
xbt_transition_t transition_succ;
unsigned int cursor;
int res;
- //int enabled_transition = 0;
- xbt_dynar_t successors = xbt_dynar_new(sizeof(mc_pairs_t), NULL);
- xbt_dynar_t elses = xbt_dynar_new(sizeof(mc_pairs_t), NULL);
+ xbt_dynar_t successors = xbt_dynar_new(sizeof(mc_pair_t), NULL);
- mc_pairs_t next_pair;
+ mc_pair_t next_pair;
mc_snapshot_t next_snapshot;
mc_snapshot_t current_snapshot;
MC_UNSET_RAW_MEM;
xbt_dynar_reset(successors);
- xbt_dynar_reset(elses);
cursor = 0;
xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
res = MC_automaton_evaluate_label(a, transition_succ->label);
MC_SET_RAW_MEM;
- next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst);
-
- //XBT_DEBUG("Next pair : %p", next_pair);
- if(res == 1){ // enabled transition in automaton
+ if((res == 1) || (res == 2)){ // enabled transition in automaton
+ next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst);
xbt_dynar_push(successors, &next_pair);
- }else{
- if(res == 2){ // enabled transition in automaton
- xbt_dynar_push(elses, &next_pair);
- }
}
MC_UNSET_RAW_MEM;
//XBT_DEBUG("Search visited pair : graph=%p, automaton=%p", pair_succ->graph_state, pair_succ->automaton_state);
- if((search_cycle == 1) && (reached(pair_succ->graph_state, pair_succ->automaton_state) == 1)){
+ if((search_cycle == 1) && (reached(pair_succ) == 1)){
XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
XBT_INFO("| ACCEPTANCE CYCLE |");
XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
XBT_INFO("Counter-example that violates formula :");
- MC_show_snapshot_stack(mc_snapshot_stack);
- MC_dump_snapshot_stack(mc_snapshot_stack);
+ MC_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(visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle) == 0){
-
- //XBT_DEBUG("Unvisited pair !");
+ if(visited(pair_succ, search_cycle) == 0){
mc_stats_pair->executed_transitions++;
MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_snapshot_stack, pair_succ);
+ xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ);
+ set_pair_visited(pair_succ, search_cycle);
MC_UNSET_RAW_MEM;
- set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle);
- MC_dfs(a, search_cycle, 0);
+ MC_vddfs_stateful(a, search_cycle, 0);
if((search_cycle == 0) && (current_pair->automaton_state->type == 1)){
xbt_swag_foreach(process, simix_global->process_list){
if(MC_process_is_enabled(process)){
- //XBT_DEBUG("Pid : %lu", process->pid);
MC_state_interleave_process(current_pair->graph_state, process);
}
}
- set_pair_reached(current_pair->graph_state, current_pair->automaton_state);
+ set_pair_reached(current_pair);
XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id);
- MC_dfs(a, 1, 1);
+ MC_vddfs_stateful(a, 1, 1);
}
- }
- }
-
- cursor = 0;
- xbt_dynar_foreach(elses, cursor, pair_succ){
+ }else{
- //XBT_DEBUG("Search visited pair : graph=%p, automaton=%p", pair_succ->graph_state, pair_succ->automaton_state);
+ XBT_DEBUG("Pair already visited !");
- if((search_cycle == 1) && (reached(pair_succ->graph_state, pair_succ->automaton_state) == 1)){
- XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
- XBT_INFO("| ACCEPTANCE CYCLE |");
- XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
- XBT_INFO("Counter-example that violates formula :");
- MC_show_snapshot_stack(mc_snapshot_stack);
- MC_dump_snapshot_stack(mc_snapshot_stack);
- MC_print_statistics_pairs(mc_stats_pair);
- exit(0);
- }
-
- if(visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle) == 0){
-
- //XBT_DEBUG("Unvisited pair !");
-
- mc_stats_pair->executed_transitions++;
-
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_snapshot_stack, pair_succ);
- MC_UNSET_RAW_MEM;
-
- set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle);
- MC_dfs(a, search_cycle, 0);
-
- if((search_cycle == 0) && (current_pair->automaton_state->type == 1)){
-
- MC_restore_snapshot(current_pair->system_state);
- MC_UNSET_RAW_MEM;
-
- xbt_swag_foreach(process, simix_global->process_list){
- if(MC_process_is_enabled(process)){
- //XBT_DEBUG("Pid : %lu", process->pid);
- MC_state_interleave_process(current_pair->graph_state, process);
- }
- }
-
- set_pair_reached(current_pair->graph_state, current_pair->automaton_state);
- XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id);
- MC_dfs(a, 1, 1);
-
- }
}
}
if(MC_state_interleave_size(current_pair->graph_state) > 0){
MC_restore_snapshot(current_snapshot);
MC_UNSET_RAW_MEM;
- //XBT_DEBUG("Snapshot restored");
}
}
MC_SET_RAW_MEM;
- //remove_pair_reached(current_pair->graph_state);
- xbt_fifo_shift(mc_snapshot_stack);
- XBT_DEBUG("State (graph=%p, automaton =%p) shifted in snapshot_stack", current_pair->graph_state, current_pair->automaton_state);
+ xbt_fifo_shift(mc_stack_liveness_stateful);
+ XBT_DEBUG("Pair (graph=%p, automaton =%p) shifted in snapshot_stack", current_pair->graph_state, current_pair->automaton_state);
MC_UNSET_RAW_MEM;
}
-void MC_show_snapshot_stack(xbt_fifo_t stack){
- int value;
- mc_pairs_t pair;
- xbt_fifo_item_t item;
- smx_req_t req;
- char *req_str = NULL;
-
- for (item = xbt_fifo_get_last_item(stack);
- (item ? (pair = (mc_pairs_t) (xbt_fifo_get_item_content(item)))
- : (NULL)); item = xbt_fifo_get_prev_item(item)) {
- req = MC_state_get_executed_request(pair->graph_state, &value);
- if(req){
- req_str = MC_request_to_string(req, value);
- XBT_INFO("%s", req_str);
- xbt_free(req_str);
- }
- }
-}
-void MC_dump_snapshot_stack(xbt_fifo_t stack){
- mc_pairs_t pair;
- MC_SET_RAW_MEM;
- while ((pair = (mc_pairs_t) xbt_fifo_pop(stack)) != NULL)
- MC_pair_delete(pair);
- MC_UNSET_RAW_MEM;
-}
+/********************* Double-DFS stateful without visited state *******************/
-void MC_pair_delete(mc_pairs_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 MC_automaton_evaluate_label(xbt_automaton_t a, 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);
- 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);
- return (left_res && right_res);
- break;
- }
- case 2 : {
- int res = MC_automaton_evaluate_label(a, 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){
- if(strcmp(p->pred, l->u.predicat) == 0){
- int (*f)() = p->function;
- return (*f)();
- }
- }
- return -1;
- break;
- }
- case 4 : {
- return 2;
- break;
- }
- default :
- return -1;
- }
-}
-
-void MC_stateful_dpor_init(xbt_automaton_t a){
+void MC_ddfs_stateful_init(xbt_automaton_t a){
XBT_DEBUG("**************************************************");
- XBT_DEBUG("DPOR stateful init");
+ XBT_DEBUG("Double-DFS stateful without visited state init");
XBT_DEBUG("**************************************************");
-
- mc_pairs_t initial_pair;
+
+ mc_pair_t mc_initial_pair;
mc_state_t initial_graph_state;
smx_process_t process;
- mc_snapshot_t initial_snapshot;
-
+ mc_snapshot_t init_snapshot;
+
MC_wait_for_requests();
MC_SET_RAW_MEM;
- initial_snapshot = xbt_new0(s_mc_snapshot_t, 1);
+ 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)){
MC_state_interleave_process(initial_graph_state, process);
- break;
}
}
- visited_pairs = xbt_dynar_new(sizeof(mc_visited_pairs_t), NULL);
- reached_pairs = xbt_dynar_new(sizeof(mc_reached_pairs_t), NULL);
+ reached_pairs = xbt_dynar_new(sizeof(char *), NULL);
- MC_take_snapshot(initial_snapshot);
+ MC_take_snapshot(init_snapshot);
MC_UNSET_RAW_MEM;
+ /* regarder dans l'automate toutes les transitions activables grâce à l'état initial du système
+ -> donnera les états initiaux de la propriété consistants avec l'état initial du système */
+
unsigned int cursor = 0;
unsigned int cursor2 = 0;
xbt_state_t state = NULL;
int res;
xbt_transition_t transition_succ;
+ xbt_dynar_t successors = xbt_dynar_new(sizeof(mc_pair_t), NULL);
+ mc_pair_t pair_succ;
xbt_dynar_foreach(a->states, cursor, state){
if(state->type == -1){
MC_SET_RAW_MEM;
- initial_pair = new_pair(initial_snapshot, initial_graph_state, transition_succ->dst);
- xbt_fifo_unshift(mc_snapshot_stack, initial_pair);
+ mc_initial_pair = new_pair(init_snapshot, initial_graph_state, transition_succ->dst);
+ xbt_dynar_push(successors, &mc_initial_pair);
MC_UNSET_RAW_MEM;
- set_pair_visited(initial_pair->graph_state, initial_pair->automaton_state, 0);
-
- MC_stateful_dpor(a, 0, 0);
-
- break;
-
- }
+ }
}
}
-
- if(xbt_fifo_size(mc_snapshot_stack)>0)
- break;
}
- if(xbt_fifo_size(mc_snapshot_stack) == 0){
+ cursor = 0;
- cursor = 0;
-
+ if(xbt_dynar_length(successors) == 0){
xbt_dynar_foreach(a->states, cursor, state){
if(state->type == -1){
-
MC_SET_RAW_MEM;
- initial_pair = new_pair(initial_snapshot, initial_graph_state, state);
- xbt_fifo_unshift(mc_snapshot_stack, initial_pair);
-
- MC_UNSET_RAW_MEM;
-
- set_pair_visited(initial_pair->graph_state, initial_pair->automaton_state, 0);
-
- MC_stateful_dpor(a, 0, 0);
+ mc_initial_pair = new_pair(init_snapshot, initial_graph_state, transition_succ->dst);
+ xbt_dynar_push(successors, &mc_initial_pair);
- break;
+ MC_UNSET_RAW_MEM;
}
}
-
}
+ cursor = 0;
+ xbt_dynar_foreach(successors, cursor, pair_succ){
+ MC_SET_RAW_MEM;
+
+ xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ);
+
+ MC_UNSET_RAW_MEM;
+
+ if(cursor == 0){
+ MC_ddfs_stateful(a, 0, 0);
+ }else{
+ MC_ddfs_stateful(a, 0, 1);
+ }
+ }
}
-void MC_stateful_dpor(xbt_automaton_t a, int search_cycle, int restore){
+
+void MC_ddfs_stateful(xbt_automaton_t a, int search_cycle, int restore){
smx_process_t process = NULL;
-
- if(xbt_fifo_size(mc_snapshot_stack) == 0)
+
+
+ if(xbt_fifo_size(mc_stack_liveness_stateful) == 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){
+ 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("************************************************** ( search_cycle = %d )", search_cycle);
+ XBT_DEBUG("Pair : graph=%p, automaton=%p(%s), %u interleave", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id,MC_state_interleave_size(current_pair->graph_state));
+
+
+ mc_stats_pair->visited_pairs++;
+
int value;
mc_state_t next_graph_state = NULL;
- smx_req_t req = NULL, prev_req = NULL;
+ smx_req_t req = NULL;
char *req_str;
- xbt_fifo_item_t item = NULL;
- //mc_pairs_t pair_succ;
+ mc_pair_t pair_succ;
xbt_transition_t transition_succ;
unsigned int cursor;
int res;
- mc_pairs_t next_pair;
+ xbt_dynar_t successors = xbt_dynar_new(sizeof(mc_pair_t), NULL);
+
+ mc_pair_t next_pair;
mc_snapshot_t next_snapshot;
mc_snapshot_t current_snapshot;
- mc_pairs_t current_pair;
- mc_pairs_t prev_pair;
- int new_pair_created;
+
+
+ while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){
+
+ MC_SET_RAW_MEM;
+ current_snapshot = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot(current_snapshot);
+ MC_UNSET_RAW_MEM;
+
+
+ /* Debug information */
+ if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ req_str = MC_request_to_string(req, value);
+ XBT_DEBUG("Execute: %s", req_str);
+ xbt_free(req_str);
+ }
- while(xbt_fifo_size(mc_snapshot_stack) > 0){
+ MC_state_set_executed_request(current_pair->graph_state, req, value);
- current_pair = (mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack));
+ /* Answer the request */
+ SIMIX_request_pre(req, value);
+ /* Wait for requests (schedules processes) */
+ MC_wait_for_requests();
+
+
+ /* Create the new expanded graph_state */
+ MC_SET_RAW_MEM;
+
+ next_graph_state = MC_state_pair_new();
- XBT_DEBUG("**************************************************");
- XBT_DEBUG("Depth : %d, State : g=%p, a=%p(%s), %u interleave", xbt_fifo_size(mc_snapshot_stack),current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id,MC_state_interleave_size(current_pair->graph_state));
+ /* Get enabled process and insert it in the interleave set of the next graph_state */
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
+ MC_state_interleave_process(next_graph_state, process);
+ }
+ }
+
+ next_snapshot = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot(next_snapshot);
+
+ MC_UNSET_RAW_MEM;
+
+ xbt_dynar_reset(successors);
- mc_stats_pair->visited_pairs++;
+ cursor = 0;
+ xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
- if((xbt_fifo_size(mc_snapshot_stack) < MAX_DEPTH) && (req = MC_state_get_request(current_pair->graph_state, &value))){
+ res = MC_automaton_evaluate_label(a, transition_succ->label);
MC_SET_RAW_MEM;
- current_snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot(current_snapshot);
+
+ if((res == 1) || (res == 2)){ // enabled transition in automaton
+ next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst);
+ xbt_dynar_push(successors, &next_pair);
+ }
+
MC_UNSET_RAW_MEM;
+ }
- /* Debug information */
- if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
- req_str = MC_request_to_string(req, value);
- XBT_DEBUG("Execute: %s", req_str);
- xbt_free(req_str);
- }
+
+ if(xbt_dynar_length(successors) == 0){
- MC_state_set_executed_request(current_pair->graph_state, req, value);
- mc_stats_pair->executed_transitions++;
+ 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;
+
+ }
- /* Answer the request */
- SIMIX_request_pre(req, value);
-
- /* Wait for requests (schedules processes) */
- MC_wait_for_requests();
-
- /* Create the new expanded graph_state */
+
+ cursor = 0;
+ xbt_dynar_foreach(successors, cursor, pair_succ){
+
+ //XBT_DEBUG("Search visited pair : graph=%p, automaton=%p", pair_succ->graph_state, pair_succ->automaton_state);
+
+ if((search_cycle == 1) && (reached(pair_succ) == 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;
-
- next_graph_state = MC_state_pair_new();
-
- /* Get an enabled process and insert it in the interleave set of the next graph_state */
- xbt_swag_foreach(process, simix_global->process_list){
- if(MC_process_is_enabled(process)){
- MC_state_interleave_process(next_graph_state, process);
- break;
+ xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ);
+ MC_UNSET_RAW_MEM;
+
+ MC_ddfs_stateful(a, search_cycle, 0);
+
+ if((search_cycle == 0) && (current_pair->automaton_state->type == 1)){
+
+ MC_restore_snapshot(current_pair->system_state);
+ MC_UNSET_RAW_MEM;
+
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
+ MC_state_interleave_process(current_pair->graph_state, process);
+ }
}
+
+ set_pair_reached(current_pair);
+ XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id);
+ MC_ddfs_stateful(a, 1, 1);
+
}
+ }
+
+
+ if(MC_state_interleave_size(current_pair->graph_state) > 0){
+ MC_restore_snapshot(current_snapshot);
+ MC_UNSET_RAW_MEM;
+ }
+ }
- next_snapshot = xbt_new0(s_mc_snapshot_t, 1);
- MC_take_snapshot(next_snapshot);
-
+
+ MC_SET_RAW_MEM;
+ xbt_fifo_shift(mc_stack_liveness_stateful);
+ XBT_DEBUG("Pair (graph=%p, automaton =%p) shifted in snapshot_stack", current_pair->graph_state, current_pair->automaton_state);
+ 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;
+}
+
+
+int reached_stateless(mc_pair_stateless_t pair){
+
+ char* hash_reached = malloc(sizeof(char)*160);
+ unsigned int c= 0;
+
+ MC_SET_RAW_MEM;
+ char *hash = malloc(sizeof(char)*160);
+ xbt_sha((char *)&pair, hash);
+ xbt_dynar_foreach(reached_pairs, c, hash_reached){
+ if(strcmp(hash, hash_reached) == 0){
MC_UNSET_RAW_MEM;
+ return 1;
+ }
+ }
+
+ MC_UNSET_RAW_MEM;
+ return 0;
+}
- new_pair_created = 0;
-
- cursor = 0;
- xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
- res = MC_automaton_evaluate_label(a, transition_succ->label);
+void set_pair_stateless_reached(mc_pair_stateless_t pair){
- if((res == 1) || (res == 2)){
+ if(reached_stateless(pair) == 0){
+ MC_SET_RAW_MEM;
+ char *hash = malloc(sizeof(char)*160) ;
+ xbt_sha((char *)&pair, hash);
+ xbt_dynar_push(reached_pairs, &hash);
+ MC_UNSET_RAW_MEM;
+ }
-
- MC_SET_RAW_MEM;
- next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst);
- xbt_fifo_unshift(mc_snapshot_stack, next_pair);
- MC_UNSET_RAW_MEM;
+}
- new_pair_created = 1;
- break;
+void MC_ddfs_stateless_init(xbt_automaton_t a){
+
+ XBT_DEBUG("**************************************************");
+ XBT_DEBUG("Double-DFS without visited state and with restore snapshot init");
+ XBT_DEBUG("**************************************************");
+
+ mc_pair_stateless_t mc_initial_pair;
+ mc_state_t initial_graph_state;
+ 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(char *), NULL);
+
+ MC_UNSET_RAW_MEM;
+
+ /* regarder dans l'automate toutes les transitions activables grâce à l'état initial du système
+ -> donnera les états initiaux de la propriété consistants avec l'état initial du système */
+
+ unsigned int cursor = 0;
+ unsigned int cursor2 = 0;
+ xbt_state_t state = NULL;
+ int res;
+ xbt_transition_t transition_succ;
+ xbt_dynar_t successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL);
+ mc_pair_stateless_t pair_succ;
+
+ xbt_dynar_foreach(a->states, cursor, state){
+ if(state->type == -1){
+ xbt_dynar_foreach(state->out, cursor2, transition_succ){
+ res = MC_automaton_evaluate_label(a, transition_succ->label);
+
+ if((res == 1) || (res == 2)){
+ MC_SET_RAW_MEM;
+
+ mc_initial_pair = new_pair_stateless(initial_graph_state, transition_succ->dst);
+ xbt_dynar_push(successors, &mc_initial_pair);
+
+ MC_UNSET_RAW_MEM;
+
}
}
+ }
+ }
+
+ cursor = 0;
- /* Pas d'avancement possible dans l'automate */
- if(new_pair_created == 0){
-
+ if(xbt_dynar_length(successors) == 0){
+ xbt_dynar_foreach(a->states, cursor, state){
+ if(state->type == -1){
MC_SET_RAW_MEM;
- next_pair = new_pair(next_snapshot,next_graph_state,current_pair->automaton_state);
- xbt_fifo_unshift(mc_snapshot_stack, next_pair);
- MC_UNSET_RAW_MEM;
+ mc_initial_pair = new_pair_stateless(initial_graph_state, transition_succ->dst);
+ xbt_dynar_push(successors, &mc_initial_pair);
+
+ MC_UNSET_RAW_MEM;
}
+ }
+ }
+
+ cursor = 0;
+ xbt_dynar_foreach(successors, cursor, pair_succ){
+ MC_SET_RAW_MEM;
+
+ xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ);
+
+ MC_UNSET_RAW_MEM;
+ if(cursor == 0){
+ MC_ddfs_stateless(a, 0, 0);
}else{
- XBT_DEBUG("There are no more processes to interleave.");
-
- /* Trash the current state, no longer needed */
- MC_SET_RAW_MEM;
- xbt_fifo_shift(mc_snapshot_stack);
- MC_UNSET_RAW_MEM;
+ MC_ddfs_stateless(a, 0, 1);
+ }
+ }
+}
- while((current_pair = xbt_fifo_shift(mc_snapshot_stack)) != NULL){
- req = MC_state_get_internal_request(current_pair->graph_state);
- xbt_fifo_foreach(mc_snapshot_stack, item, prev_pair, mc_pairs_t) {
- if(MC_request_depend(req, MC_state_get_internal_request(prev_pair->graph_state))){
- if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
- XBT_DEBUG("Dependent Transitions:");
- prev_req = MC_state_get_executed_request(prev_pair->graph_state, &value);
- req_str = MC_request_to_string(prev_req, value);
- XBT_DEBUG("%s (state=%p)", req_str, prev_pair->graph_state);
- xbt_free(req_str);
- prev_req = MC_state_get_executed_request(current_pair->graph_state, &value);
- req_str = MC_request_to_string(prev_req, value);
- XBT_DEBUG("%s (state=%p)", req_str, current_pair->graph_state);
- xbt_free(req_str);
- }
-
- if(!MC_state_process_is_done(prev_pair->graph_state, req->issuer))
- MC_state_interleave_process(prev_pair->graph_state, req->issuer);
- else
- XBT_DEBUG("Process %p is in done set", req->issuer);
-
- break;
- }
- }
-
- if(MC_state_interleave_size(current_pair->graph_state)){
- MC_restore_snapshot(current_pair->system_state);
- xbt_fifo_unshift(mc_snapshot_stack, current_pair);
- XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_snapshot_stack));
- MC_UNSET_RAW_MEM;
- break;
- }
- }
- MC_UNSET_RAW_MEM;
+void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int restore){
- }
- }
- MC_UNSET_RAW_MEM;
- return;
+
}
+
