#include "private.h"
#include "unistd.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dfs, mc,
- "Logging specific to MC DFS algorithm");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc,
+ "Logging specific to algorithms for liveness properties verification");
xbt_dynar_t initial_pairs = NULL;
int max_pair = 0;
xbt_dynar_t visited_pairs;
xbt_dynar_t reached_pairs;
+int expanded = 0;
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);
p->system_state = sn;
- p->automaton_state = st;
+ p->automaton_state = st;
p->graph_state = sg;
p->num = max_pair;
max_pair++;
+ mc_stats_pair->expanded_pairs++;
return p;
}
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;
+ char *hash = malloc(sizeof(char)*160);
+ xbt_sha((char *)&p, hash);
+ xbt_dynar_push(visited_pairs, &hash);
+ 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 ){
- mc_reached_pairs_t rp = NULL;
+ /*mc_reached_pairs_t rp = NULL;
unsigned int c= 0;
unsigned int i;
int different_process;
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; */
}
}
+ MC_UNSET_RAW_MEM;
+ return 0;*/
+ //XBT_DEBUG("Search acceptance pair already reach !");
+
+ char* hash_reached = malloc(sizeof(char)*160);
+ unsigned int c= 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;
+ char *hash = malloc(sizeof(char)*160);
+ xbt_sha((char *)&p, hash);
+ //XBT_DEBUG("Hash : %s", hash);
+ xbt_dynar_foreach(reached_pairs, c, hash_reached){
+ if(strcmp(hash, hash_reached) == 0){
+ MC_UNSET_RAW_MEM;
+ //XBT_DEBUG("Pair (graph=%p, automaton=%p(%s)) already reached !", gs, as, as->id);
+ return 1;
+ }
+ }
+
MC_UNSET_RAW_MEM;
return 0;
}
void set_pair_reached(mc_state_t gs, xbt_state_t as){
//XBT_DEBUG("Set pair (graph=%p, automaton=%p) reached ", gs, as);
- //if(reached(gs, as) == 0){
+ if(reached(gs, as) == 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 *)&p, hash);
+ xbt_dynar_push(reached_pairs, &hash);
+ //XBT_DEBUG("New reached pair : graph=%p, automaton=%p(%s)", gs, as, as->id);
MC_UNSET_RAW_MEM;
- //}
+ }
}
int visited(mc_state_t gs, xbt_state_t as, int sc){
- unsigned int c = 0;
+ /*unsigned int c = 0;
mc_visited_pairs_t p = NULL;
unsigned int i;
int different_process;
}
}
MC_UNSET_RAW_MEM;
+ return 0;*/
+
+ //XBT_DEBUG("Test visited pair");
+
+ char* hash_visited = malloc(sizeof(char)*160);
+ unsigned int c= 0;
+
+ 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;
+ char *hash = malloc(sizeof(char)*160);
+ xbt_sha((char *)&p, hash);
+ //XBT_DEBUG("Hash : %s", 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;
+ //XBT_DEBUG("End test visited pair");
return 0;
}
void MC_dfs_init(xbt_automaton_t a){
- XBT_DEBUG("**************************************************");
- XBT_DEBUG("DFS init");
- XBT_DEBUG("**************************************************");
+ XBT_DEBUG("**************************************************");
+ XBT_DEBUG("DFS init");
+ XBT_DEBUG("**************************************************");
mc_pairs_t mc_initial_pair;
mc_state_t initial_graph_state;
}
}
- 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);
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_foreach(a->states, cursor, state){
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 );
+ set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, 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)){
+ if(cursor == 0){
MC_dfs(a, 0, 0);
}else{
MC_dfs(a, 0, 1);
}
}
+
+
+
+
}
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));
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("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
-
- //sleep(1);
mc_stats_pair->visited_pairs++;
//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);
mc_pairs_t next_pair;
mc_snapshot_t next_snapshot;
/* Debug information */
- if(XBT_LOG_ISENABLED(mc_dfs, xbt_log_priority_debug)){
+ 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);
/* 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)){
- XBT_DEBUG("Pid : %lu", process->pid);
MC_state_interleave_process(next_graph_state, process);
}
}
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);
- mc_stats_pair->expanded_pairs++;
- }else{
- if(res == 2){ // enabled transition in automaton
- xbt_dynar_push(elses, &next_pair);
- mc_stats_pair->expanded_pairs++;
- }
}
MC_UNSET_RAW_MEM;
MC_SET_RAW_MEM;
next_pair = new_pair(next_snapshot, next_graph_state, current_pair->automaton_state);
xbt_dynar_push(successors, &next_pair);
- mc_stats_pair->expanded_pairs++;
MC_UNSET_RAW_MEM;
}
MC_SET_RAW_MEM;
xbt_fifo_unshift(mc_snapshot_stack, pair_succ);
+ set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, 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);
if((search_cycle == 0) && (current_pair->automaton_state->type == 1)){
MC_dfs(a, 1, 1);
}
- }
- }
-
- cursor = 0;
- xbt_dynar_foreach(elses, 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->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)){
+ }else{
- 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);
+ XBT_DEBUG("Pair already visited !");
- }
}
}
}
}
-/*void MC_dfs(xbt_automaton_t a, int search_cycle){
- xbt_state_t current_state = (xbt_state_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(stack_automaton_dfs));
- xbt_transition_t transition_succ = NULL;
- xbt_state_t successor = NULL;
- unsigned int cursor = 0;
- xbt_dynar_t elses = xbt_dynar_new(sizeof(xbt_transition_t), NULL);
- int res;
+/********************* Double DFS using color pair *********************/
- //printf("++ current state : %s\n", current_state->id);
-
- xbt_dynar_foreach(current_state->out, cursor, transition_succ){
- successor = transition_succ->dst;
- res = MC_automaton_evaluate_label(a, transition_succ->label);
- //printf("-- state : %s, transition_label : %d, res = %d\n", successor->id, transition_succ->label->type, res);
- if(res == 1){
- if(search_cycle == 1 && reached_dfs != NULL){
- if(strcmp(reached_dfs->id, successor->id) == 0){
- xbt_dynar_push(state_automaton_visited_dfs, &successor);
- printf("\n-*-*-*-*-*-*- ACCEPTANCE CYCLE -*-*-*-*-*-*-\n");
- printf("Visited states : \n");
- unsigned int cursor2 = 0;
- xbt_state_t visited_state = NULL;
- xbt_dynar_foreach(state_automaton_visited_dfs, cursor2, visited_state){
- printf("State : %s\n", visited_state->id);
- }
- exit(1);
- }
- }
- if(successor->visited == 0){
- successor->visited = 1;
- xbt_fifo_unshift(stack_automaton_dfs, successor);
- xbt_dynar_push(state_automaton_visited_dfs, &successor);
- MC_dfs(a, search_cycle);
- if(search_cycle == 0 && successor->type == 1){
- reached_dfs = successor;
- MC_dfs(a, 1);
- }
- }
- }else{
- if(res == 2){
- xbt_dynar_push(elses,&transition_succ);
- }
- }
- }
-
- cursor = 0;
- xbt_dynar_foreach(elses, cursor, transition_succ){
- successor = transition_succ->dst;
- if(search_cycle == 1 && reached_dfs != NULL){
- if(strcmp(reached_dfs->id, successor->id) == 0){
- xbt_dynar_push(state_automaton_visited_dfs, &successor);
- printf("\n-*-*-*-*-*-*- ACCEPTANCE CYCLE -*-*-*-*-*-*-\n");
- printf("Visited states : \n");
- unsigned int cursor2 = 0;
- xbt_state_t visited_state = NULL;
- xbt_dynar_foreach(state_automaton_visited_dfs, cursor2, visited_state){
- printf("State : %s\n", visited_state->id);
- }
- exit(1);
- }
- }
- if(successor->visited == 0){
- successor->visited = 1;
- xbt_fifo_unshift(stack_automaton_dfs, successor);
- xbt_dynar_push(state_automaton_visited_dfs, &successor);
- MC_dfs(a, search_cycle);
- if(search_cycle == 0 && successor->type == 1){
- reached_dfs = successor;
- MC_dfs(a, 1);
- }
- }
- }
- xbt_fifo_shift(stack_automaton_dfs);
- }*/
-/* void MC_dfs(xbt_automaton_t a, int search_cycle, int restore){ */
-/* if(xbt_fifo_size(mc_snapshot_stack) == 0) */
-/* return; */
+/********************* DPOR without replay *********************/
-/* 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_UNSET_RAW_MEM; */
-/* } */
-/* //XBT_DEBUG("Lpv length after restore snapshot: %lu", xbt_dynar_length(visited_pairs)); */
+void MC_dpor_with_restore_snapshot_init(xbt_automaton_t a){
-/* /\* Get current state *\/ */
-/* mc_pairs_t current_pair = (mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack)); */
+ XBT_DEBUG("**************************************************");
+ XBT_DEBUG("DPOR (with restore snapshot) init");
+ XBT_DEBUG("**************************************************");
-/* 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("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); */
-
-/* //sleep(1); */
-
-/* smx_process_t process = NULL; */
-/* int value; */
-/* mc_state_t next_graph_state = NULL; */
-/* smx_req_t req = NULL; */
-/* char *req_str; */
-
-/* mc_pairs_t pair_succ; */
-/* xbt_transition_t transition_succ; */
-/* unsigned int cursor; */
-/* int res; */
-/* //int enabled_transition = 0; */
-
-/* xbt_dynar_t elses = xbt_dynar_new(sizeof(mc_pairs_t), NULL); */
-/* xbt_dynar_t successors = xbt_dynar_new(sizeof(mc_pairs_t), NULL); */
-/* xbt_dynar_reset(all_successors); */
-
-/* mc_pairs_t next_pair; */
-/* mc_snapshot_t next_snapshot; */
-/* mc_snapshot_t current_snapshot; */
+ mc_pairs_t initial_pair;
+ mc_state_t initial_graph_state;
+ smx_process_t process;
+ mc_snapshot_t initial_snapshot;
-/* while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ */
+ MC_wait_for_requests();
+
+ MC_SET_RAW_MEM;
-/* //XBT_DEBUG("Current pair : %p (%u interleave)", current_pair, MC_state_interleave_size(current_pair->graph_state)+1); */
-/* //XBT_DEBUG("Visited pairs : %lu", xbt_dynar_length(visited_pairs)); */
+ initial_snapshot = xbt_new0(s_mc_snapshot_t, 1);
-/* 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_dfs, xbt_log_priority_debug)){ */
-/* req_str = MC_request_to_string(req, value); */
-/* XBT_DEBUG("Execute: %s", req_str); */
-/* xbt_free(req_str); */
-/* } */
+ 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);
+
+ MC_take_snapshot(initial_snapshot);
+
+ MC_UNSET_RAW_MEM;
+
+ unsigned int cursor = 0;
+ unsigned int cursor2 = 0;
+ xbt_state_t state = NULL;
+ int res;
+ xbt_transition_t transition_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;
+
+ initial_pair = new_pair(initial_snapshot, initial_graph_state, transition_succ->dst);
+ xbt_fifo_unshift(mc_snapshot_stack, initial_pair);
+
+ MC_UNSET_RAW_MEM;
+
+ /* Add pair to list of visited pairs*/
+ set_pair_visited(initial_pair->graph_state, initial_pair->automaton_state, 0);
-/* MC_state_set_executed_request(current_pair->graph_state, req, value); */
-/* //mc_stats->executed_transitions++; */
+ MC_dpor_with_restore_snapshot(a, 0, 0);
-/* /\* Answer the request *\/ */
-/* SIMIX_request_pre(req, value); */
+ break;
-/* /\* Wait for requests (schedules processes) *\/ */
-/* MC_wait_for_requests(); */
+ }
+ }
+ }
+ if(xbt_fifo_size(mc_snapshot_stack)>0)
+ break;
+ }
-/* /\* Create the new expanded graph_state *\/ */
-/* MC_SET_RAW_MEM; */
+ /* Initial state of automaton is initial state for initial pair*/
+ if(xbt_fifo_size(mc_snapshot_stack) == 0){
-/* next_graph_state = MC_state_new(); */
+ cursor = 0;
-/* /\* 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_foreach(a->states, cursor, state){
+ if(state->type == -1){
+
+ MC_SET_RAW_MEM;
-/* xbt_dynar_reset(elses); */
-/* xbt_dynar_reset(successors); */
+ initial_pair = new_pair(initial_snapshot, initial_graph_state, state);
+ xbt_fifo_unshift(mc_snapshot_stack, initial_pair);
-/* cursor = 0; */
-/* xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ */
+ MC_UNSET_RAW_MEM;
+
+ /* Add pair to list of visited pairs*/
+ set_pair_visited(initial_pair->graph_state, initial_pair->automaton_state, 0);
+
+ MC_dpor_with_restore_snapshot(a, 0, 0);
+
+ break;
+ }
+ }
-/* 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 */
-/* xbt_dynar_push(successors, &next_pair); */
-/* //XBT_DEBUG("New Successors length : %lu", xbt_dynar_length(successors)); */
-/* }else{ */
-/* if(res == 2){ */
-/* xbt_dynar_push(elses, &next_pair); */
-/* //XBT_DEBUG("New Elses length : %lu", xbt_dynar_length(elses)); */
-/* } */
-/* } */
-
-/* MC_UNSET_RAW_MEM; */
-/* } */
-
-/* if((xbt_dynar_length(successors) == 0) && (xbt_dynar_length(elses) == 0) ){ */
+/* Test du dpor sans rejeu des états de la pile à partir de l'état initial du système mais avec restauration au milieu de l'arbre -> s'applique aux safety properties mais pas d'intégration pour les liveness */
+void MC_dpor_with_restore_snapshot(xbt_automaton_t a, int search_cycle, int restore){
-/* 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; */
-
-/* } */
+ smx_process_t process = NULL;
+
+ if(xbt_fifo_size(mc_snapshot_stack) == 0)
+ return;
-/* //XBT_DEBUG("Successors length : %lu", xbt_dynar_length(successors)); */
-/* //XBT_DEBUG("Elses length : %lu", xbt_dynar_length(elses)); */
+ int value;
+ mc_state_t next_graph_state = NULL;
+ smx_req_t req = NULL, prev_req = NULL;
+ char *req_str;
+ xbt_fifo_item_t item = NULL;
-/* if(xbt_dynar_length(successors) > 0){ */
+ xbt_transition_t transition_succ;
+ unsigned int cursor;
+ int res;
-/* cursor = 0; */
-/* xbt_dynar_foreach(successors, cursor, pair_succ){ */
-/* MC_SET_RAW_MEM; */
-/* xbt_dynar_push(all_successors, &pair_succ); */
-/* MC_UNSET_RAW_MEM; */
-/* } */
+ mc_pairs_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;
-/* }else{ */
+ while(xbt_fifo_size(mc_snapshot_stack) > 0){
-/* cursor = 0; */
-/* xbt_dynar_foreach(elses, cursor, pair_succ){ */
-/* MC_SET_RAW_MEM; */
-/* xbt_dynar_push(all_successors, &pair_succ); */
-/* MC_UNSET_RAW_MEM; */
-/* } */
+ current_pair = (mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack));
-/* } */
+
+ 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));
+
+ mc_stats_pair->visited_pairs++;
-/* MC_restore_snapshot(current_snapshot); */
-/* MC_UNSET_RAW_MEM; */
-
-/* } */
+ /* Add pair to list of visited pairs*/
+ set_pair_visited(current_pair->graph_state, current_pair->automaton_state, search_cycle);
-/* //XBT_DEBUG("All successors : %lu", xbt_dynar_length(all_successors)); */
+ if((xbt_fifo_size(mc_snapshot_stack) < MAX_DEPTH) && (req = MC_state_get_request(current_pair->graph_state, &value))){
-/* cursor = 0; */
+ MC_SET_RAW_MEM;
+ current_snapshot = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot(current_snapshot);
+ MC_UNSET_RAW_MEM;
-/* xbt_dynar_foreach(all_successors, cursor, pair_succ){ */
+ /* 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((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); */
-/* exit(0); */
-/* } */
-
-/* if(visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle) == 0){ */
+ MC_state_set_executed_request(current_pair->graph_state, req, value);
-/* //XBT_DEBUG("New pair in stack"); */
-
-/* MC_SET_RAW_MEM; */
-/* xbt_fifo_unshift(mc_snapshot_stack, pair_succ); */
-/* 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 */
+ 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;
+ }
+ }
-/* set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle); */
-/* MC_dfs(a, search_cycle, 1); */
+ next_snapshot = xbt_new0(s_mc_snapshot_t, 1);
+ MC_take_snapshot(next_snapshot);
+
+ MC_UNSET_RAW_MEM;
-/* if((search_cycle == 0) && (pair_succ->automaton_state->type == 1)){ */
-
-/* set_pair_reached(pair_succ->graph_state, pair_succ->automaton_state); */
-/* XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); */
-/* MC_dfs(a, 1, 1); */
+ 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);
-/* } */
-/* } */
+ if((res == 1) || (res == 2)){
+
+ 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;
-/* } */
-
-/* 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); */
-/* MC_UNSET_RAW_MEM; */
+ break;
+
+ }
+ }
+
+ /* Pas d'avancement possible dans l'automate */
+ if(new_pair_created == 0){
+
+ 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;
+
+ }
+
+ }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;
+
+ 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;
+
+ }
+ }
+ MC_UNSET_RAW_MEM;
+ return;
+}
