From: Marion Guthmuller Date: Mon, 20 Jun 2011 14:00:37 +0000 (+0200) Subject: model-checker : test dpor without replay from initial state but with X-Git-Tag: exp_20120216~133^2~88 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1d31b17008f739a67f54a3fcd4095fe8057831ed model-checker : test dpor without replay from initial state but with restore snapshot -> ok for safety properties, need more specifications for liveness --- diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index d3e40510e4..4a71b6c0c2 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -363,7 +363,7 @@ set(MC_SRC src/mc/mc_dpor.c src/mc/mc_request.c src/mc/private.h - src/mc/mc_dfs.c + src/mc/mc_liveness.c ) set(RNGSTREAM_SRC diff --git a/examples/msg/mc/example_automaton.c b/examples/msg/mc/example_automaton.c index 8780f17d5c..940dd89733 100644 --- a/examples/msg/mc/example_automaton.c +++ b/examples/msg/mc/example_automaton.c @@ -14,7 +14,7 @@ extern xbt_automaton_t automaton; int p=1; -int r=1; +int r=0; int q=1; int e=1; int d=1; @@ -55,9 +55,9 @@ int server(int argc, char *argv[]) } MSG_task_receive(&task, "mymailbox"); count++; - r=(r+1)%3; + //r=(r+1)%3; //d=(d+1)%2; - XBT_INFO("r (server) = %d", r); + //XBT_INFO("r (server) = %d", r); } MC_assert_pair(atoi(MSG_task_get_name(task)) == 3); @@ -78,7 +78,7 @@ int client(int argc, char *argv[]) XBT_INFO("Sent!"); //r=(r+1)%3; - XBT_INFO("r (client) = %d", r); + //XBT_INFO("r (client) = %d", r); return 0; } diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index d363a57da1..6a4600130c 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -76,7 +76,8 @@ void MC_init_with_automaton(xbt_automaton_t a){ MC_UNSET_RAW_MEM; - MC_dfs_init(a); + //MC_dfs_init(a); + MC_stateful_dpor_init(a); } @@ -293,9 +294,9 @@ void MC_assert_pair(int prop){ XBT_INFO("*** PROPERTY NOT VALID ***"); XBT_INFO("**************************"); //XBT_INFO("Counter-example execution trace:"); - //MC_show_snapshot_stack(mc_snapshot_stack); + MC_show_snapshot_stack(mc_snapshot_stack); //MC_dump_snapshot_stack(mc_snapshot_stack); - //MC_print_statistics(mc_stats); + MC_print_statistics_pairs(mc_stats_pair); xbt_abort(); } } diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index f01ccb9d42..b04a36308b 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -1,8 +1,8 @@ #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; @@ -13,10 +13,11 @@ 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; } @@ -114,9 +115,9 @@ int visited(mc_state_t gs, xbt_state_t as, int sc){ 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; @@ -321,7 +322,7 @@ void MC_dfs(xbt_automaton_t a, int search_cycle, int restore){ /* 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); @@ -344,7 +345,6 @@ void MC_dfs(xbt_automaton_t a, int search_cycle, int restore){ /* 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); } } @@ -369,11 +369,9 @@ void MC_dfs(xbt_automaton_t a, int search_cycle, int restore){ if(res == 1){ // enabled transition in automaton 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++; } } @@ -386,7 +384,6 @@ void MC_dfs(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_stats_pair->expanded_pairs++; MC_UNSET_RAW_MEM; } @@ -584,279 +581,251 @@ int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l){ } } -/*void MC_dfs(xbt_automaton_t a, int search_cycle){ +void MC_stateful_dpor_init(xbt_automaton_t a){ - 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; + XBT_DEBUG("**************************************************"); + XBT_DEBUG("DPOR stateful init"); + XBT_DEBUG("**************************************************"); - //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); - } - } - } + mc_pairs_t initial_pair; + mc_state_t initial_graph_state; + smx_process_t process; + mc_snapshot_t initial_snapshot; - 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); - }*/ + MC_wait_for_requests(); + MC_SET_RAW_MEM; -/* void MC_dfs(xbt_automaton_t a, int search_cycle, int restore){ */ + initial_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; + } + } -/* if(xbt_fifo_size(mc_snapshot_stack) == 0) */ -/* return; */ + visited_pairs = xbt_dynar_new(sizeof(mc_visited_pairs_t), NULL); + reached_pairs = xbt_dynar_new(sizeof(mc_reached_pairs_t), NULL); -/* 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; */ -/* } */ + MC_take_snapshot(initial_snapshot); + MC_UNSET_RAW_MEM; -/* //XBT_DEBUG("Lpv length after restore snapshot: %lu", xbt_dynar_length(visited_pairs)); */ + unsigned int cursor = 0; + unsigned int cursor2 = 0; + xbt_state_t state = NULL; + int res; + xbt_transition_t transition_succ; -/* /\* 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_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; -/* 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; */ - -/* while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ */ + initial_pair = new_pair(initial_snapshot, initial_graph_state, transition_succ->dst); + xbt_fifo_unshift(mc_snapshot_stack, initial_pair); -/* //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)); */ + MC_UNSET_RAW_MEM; -/* 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); */ -/* } */ + 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_stateful_dpor(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; */ + 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; + + set_pair_visited(initial_pair->graph_state, initial_pair->automaton_state, 0); + + MC_stateful_dpor(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); */ +void MC_stateful_dpor(xbt_automaton_t a, int search_cycle, int restore){ -/* //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; */ -/* } */ + smx_process_t process = NULL; + + if(xbt_fifo_size(mc_snapshot_stack) == 0) + return; - -/* if((xbt_dynar_length(successors) == 0) && (xbt_dynar_length(elses) == 0) ){ */ + 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; -/* 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; */ - -/* } */ + //mc_pairs_t pair_succ; + xbt_transition_t transition_succ; + unsigned int cursor; + int res; + + 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; -/* //XBT_DEBUG("Successors length : %lu", xbt_dynar_length(successors)); */ -/* //XBT_DEBUG("Elses length : %lu", xbt_dynar_length(elses)); */ + while(xbt_fifo_size(mc_snapshot_stack) > 0){ -/* if(xbt_dynar_length(successors) > 0){ */ + current_pair = (mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack)); -/* cursor = 0; */ -/* xbt_dynar_foreach(successors, cursor, pair_succ){ */ -/* MC_SET_RAW_MEM; */ -/* xbt_dynar_push(all_successors, &pair_succ); */ -/* MC_UNSET_RAW_MEM; */ -/* } */ + + 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++; -/* }else{ */ + if((xbt_fifo_size(mc_snapshot_stack) < MAX_DEPTH) && (req = MC_state_get_request(current_pair->graph_state, &value))){ -/* cursor = 0; */ -/* xbt_dynar_foreach(elses, cursor, pair_succ){ */ -/* MC_SET_RAW_MEM; */ -/* xbt_dynar_push(all_successors, &pair_succ); */ -/* MC_UNSET_RAW_MEM; */ -/* } */ + 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); + } + + MC_state_set_executed_request(current_pair->graph_state, req, value); + mc_stats_pair->executed_transitions++; + + /* 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; + } + } -/* } */ + next_snapshot = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot(next_snapshot); + + MC_UNSET_RAW_MEM; -/* MC_restore_snapshot(current_snapshot); */ -/* MC_UNSET_RAW_MEM; */ - -/* } */ + 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); -/* //XBT_DEBUG("All successors : %lu", xbt_dynar_length(all_successors)); */ + if((res == 1) || (res == 2)){ -/* cursor = 0; */ + + 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; -/* xbt_dynar_foreach(all_successors, cursor, pair_succ){ */ + new_pair_created = 1; -/* 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){ */ + break; + + } + } -/* //XBT_DEBUG("New pair in stack"); */ - -/* MC_SET_RAW_MEM; */ -/* xbt_fifo_unshift(mc_snapshot_stack, pair_succ); */ -/* MC_UNSET_RAW_MEM; */ + /* 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; -/* set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle); */ -/* MC_dfs(a, search_cycle, 1); */ + } -/* 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); */ + }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_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; */ + MC_UNSET_RAW_MEM; -/* } */ + } + } + MC_UNSET_RAW_MEM; + return; +} diff --git a/src/mc/mc_request.c b/src/mc/mc_request.c index 4f484495b5..f2956a4d92 100644 --- a/src/mc/mc_request.c +++ b/src/mc/mc_request.c @@ -10,6 +10,7 @@ int MC_request_depend(smx_req_t r1, smx_req_t r2) { if(_surf_do_model_check == 2) return TRUE; + if (r1->issuer == r2->issuer) return FALSE; @@ -145,6 +146,7 @@ int MC_request_depend(smx_req_t r1, smx_req_t r2) && r2->comm_wait.comm->comm.dst_buff != r1->comm_test.comm->comm.src_buff) return FALSE; + return TRUE; } diff --git a/src/mc/private.h b/src/mc/private.h index a815f64525..1f840dd4ea 100644 --- a/src/mc/private.h +++ b/src/mc/private.h @@ -214,5 +214,9 @@ void MC_pair_delete(mc_pairs_t pair); void MC_exit_with_automaton(void); mc_state_t MC_state_pair_new(void); +/********************************** Stateful DPOR **************************************/ + +void MC_stateful_dpor(xbt_automaton_t a, int search_cycle, int restore); +void MC_stateful_dpor_init(xbt_automaton_t a); #endif