X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2c25e0bae01a59891fac21447f3210ba26302c5..528f5f249ef54482bce37b3745bc47e75f8485be:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index f01ccb9d42..2b3e32e595 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -1,862 +1,834 @@ -#include "private.h" -#include "unistd.h" +/* Copyright (c) 2011-2013. The SimGrid Team. + * All rights reserved. */ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dfs, mc, - "Logging specific to MC DFS algorithm"); +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ -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); - p->system_state = sn; - p->automaton_state = st; - p->graph_state = sg; - p->num = max_pair; - max_pair++; - return p; - -} +#include "mc_private.h" +#include +#include -void set_pair_visited(mc_state_t gs, xbt_state_t as, int sc){ +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, + "Logging specific to algorithms for liveness properties verification"); - //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; +/********* Global variables *********/ - //XBT_DEBUG("New visited pair , length of visited pairs : %lu", xbt_dynar_length(visited_pairs)); -} +xbt_dynar_t acceptance_pairs; +xbt_dynar_t visited_pairs; +xbt_dynar_t successors; +xbt_parmap_t parmap; -int reached(mc_state_t gs, xbt_state_t as ){ +/********* Static functions *********/ - mc_reached_pairs_t rp = NULL; - unsigned int c= 0; - unsigned int i; - int different_process; +static xbt_dynar_t get_atomic_propositions_values(){ + int res; + int_f_void_t f; + unsigned int cursor = 0; + xbt_automaton_propositional_symbol_t ps = NULL; + xbt_dynar_t values = xbt_dynar_new(sizeof(int), NULL); - 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; */ - } + xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ + f = (int_f_void_t)ps->function; + res = f(); + xbt_dynar_push_as(values, int, res); } - 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){ - 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); - MC_UNSET_RAW_MEM; - //} + return values; } -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; +static int get_search_interval(xbt_dynar_t all_pairs, mc_pair_t pair, int *min, int *max){ - //XBT_DEBUG("Visited pair length : %lu", xbt_dynar_length(visited_pairs)); + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); 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 cursor = 0, previous_cursor, next_cursor; + mc_pair_t pair_test; + int start = 0; + int end = xbt_dynar_length(all_pairs) - 1; + + while(start <= end){ + cursor = (start + end) / 2; + pair_test = (mc_pair_t)xbt_dynar_get_as(all_pairs, cursor, mc_pair_t); + if(pair_test->nb_processes < pair->nb_processes){ + start = cursor + 1; + }else if(pair_test->nb_processes > pair->nb_processes){ + end = cursor - 1; + }else{ + if(pair_test->heap_bytes_used < pair->heap_bytes_used){ + start = cursor +1; + }else if(pair_test->heap_bytes_used > pair->heap_bytes_used){ + end = cursor - 1; + }else{ + *min = *max = cursor; + previous_cursor = cursor - 1; + while(previous_cursor >= 0){ + pair_test = (mc_pair_t)xbt_dynar_get_as(all_pairs, previous_cursor, mc_pair_t); + if(pair_test->nb_processes != pair->nb_processes || pair_test->heap_bytes_used != pair->heap_bytes_used) + break; + *min = previous_cursor; + previous_cursor--; + } + next_cursor = cursor + 1; + while(next_cursor < xbt_dynar_length(all_pairs)){ + pair_test = (mc_pair_t)xbt_dynar_get_as(all_pairs, next_cursor, mc_pair_t); + if(pair_test->nb_processes != pair->nb_processes || pair_test->heap_bytes_used != pair->heap_bytes_used) + break; + *max = next_cursor; + next_cursor++; + } + if(!raw_mem_set) + MC_UNSET_RAW_MEM; + return -1; } - } + } } - MC_UNSET_RAW_MEM; - return 0; + if(!raw_mem_set) + MC_UNSET_RAW_MEM; + + return cursor; } -void MC_dfs_init(xbt_automaton_t a){ +static int is_reached_acceptance_pair(mc_pair_t pair){ - XBT_DEBUG("**************************************************"); - XBT_DEBUG("DFS init"); - XBT_DEBUG("**************************************************"); - - mc_pairs_t mc_initial_pair; - mc_state_t initial_graph_state; - smx_process_t process; - mc_snapshot_t init_snapshot; - - MC_wait_for_requests(); + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_SET_RAW_MEM; + + if(xbt_dynar_is_empty(acceptance_pairs)){ - 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); + if(pair->graph_state->system_state == NULL){ + pair->graph_state->system_state = MC_take_snapshot(); + pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap); } - } + xbt_dynar_push(acceptance_pairs, &pair); - visited_pairs = xbt_dynar_new(sizeof(mc_visited_pairs_t), NULL); - reached_pairs = xbt_dynar_new(sizeof(mc_reached_pairs_t), NULL); + if(!raw_mem_set) + MC_UNSET_RAW_MEM; - MC_take_snapshot(init_snapshot); + return -1; - MC_UNSET_RAW_MEM; + }else{ - /* unsigned int cursor = 0; */ - /* xbt_state_t state = NULL; */ - /* int nb_init_state = 0; */ + if(pair->graph_state->system_state == NULL){ + pair->graph_state->system_state = MC_take_snapshot(); + pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap); + } - /* xbt_dynar_foreach(a->states, cursor, state){ */ - /* if(state->type == -1){ */ + int min = -1, max = -1, index; + int res; + mc_pair_t pair_test; + + index = get_search_interval(acceptance_pairs, pair, &min, &max); + + if(min != -1 && max != -1){ /* Acceptance pair with same number of processes and same heap bytes used exists */ + res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(acceptance_pairs, min), (max-min)+1, pair); + if(res != -1){ + if(!raw_mem_set) + MC_UNSET_RAW_MEM; + return ((mc_pair_t)xbt_dynar_get_as(acceptance_pairs, (min+res)-1, mc_pair_t))->num; + } + xbt_dynar_insert_at(acceptance_pairs, min, &pair); + }else{ + pair_test = (mc_pair_t)xbt_dynar_get_as(acceptance_pairs, index, mc_pair_t); + if(pair_test->nb_processes < pair->nb_processes){ + xbt_dynar_insert_at(acceptance_pairs, index+1, &pair); + }else{ + if(pair_test->heap_bytes_used < pair->heap_bytes_used) + xbt_dynar_insert_at(acceptance_pairs, index + 1, &pair); + else + xbt_dynar_insert_at(acceptance_pairs, index, &pair); + } + } - /* MC_SET_RAW_MEM; */ - /* mc_initial_pair = new_pair(init_snapshot, initial_graph_state, state); */ + if(!raw_mem_set) + MC_UNSET_RAW_MEM; + + return -1; + + } + +} - /* xbt_fifo_unshift(mc_snapshot_stack, mc_initial_pair); */ - /* XBT_DEBUG("**************************************************"); */ - /* XBT_DEBUG("Initial state=%p ", mc_initial_pair); */ +static void set_acceptance_pair_reached(mc_pair_t pair){ - /* MC_UNSET_RAW_MEM; */ + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - /* 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++; */ - /* } */ - /* } */ + MC_SET_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 */ + if(xbt_dynar_is_empty(acceptance_pairs)){ - 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_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){ - if(state->type == -1){ - xbt_dynar_foreach(state->out, cursor2, transition_succ){ - res = MC_automaton_evaluate_label(a, transition_succ->label); - - if(res == 1){ - - MC_SET_RAW_MEM; - - mc_initial_pair = new_pair(init_snapshot, initial_graph_state, transition_succ->dst); - xbt_dynar_push(successors, &mc_initial_pair); - - 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; - } - } + if(pair->graph_state->system_state == NULL){ + pair->graph_state->system_state = MC_take_snapshot(); + pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap); + } + xbt_dynar_push(acceptance_pairs, &pair); + + }else{ + + if(pair->graph_state->system_state == NULL){ + pair->graph_state->system_state = MC_take_snapshot(); + pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap); + } + + size_t current_bytes_used = pair->heap_bytes_used; + int current_nb_processes = pair->nb_processes; + + int cursor = 0; + int start = 0; + int end = xbt_dynar_length(acceptance_pairs) - 1; + + mc_pair_t pair_test = NULL; + size_t bytes_used_test = 0; + int nb_processes_test; + + while(start <= end){ + cursor = (start + end) / 2; + pair_test = (mc_pair_t)xbt_dynar_get_as(acceptance_pairs, cursor, mc_pair_t); + bytes_used_test = pair_test->heap_bytes_used; + nb_processes_test = pair_test->nb_processes; + if(nb_processes_test < current_nb_processes) + start = cursor + 1; + if(nb_processes_test > current_nb_processes) + end = cursor - 1; + if(nb_processes_test == current_nb_processes){ + if(bytes_used_test < current_bytes_used) + start = cursor + 1; + if(bytes_used_test > current_bytes_used) + end = cursor - 1; + if(bytes_used_test == current_bytes_used) + break; } } + + if(bytes_used_test < current_bytes_used) + xbt_dynar_insert_at(acceptance_pairs, cursor + 1, &pair); + else + xbt_dynar_insert_at(acceptance_pairs, cursor, &pair); } - - cursor = 0; - xbt_dynar_foreach(successors, cursor, pair_succ){ - MC_SET_RAW_MEM; + if(!raw_mem_set) + MC_UNSET_RAW_MEM; + +} - xbt_fifo_unshift(mc_snapshot_stack, pair_succ); +static void remove_acceptance_pair(mc_pair_t pair){ - 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 ); + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - MC_UNSET_RAW_MEM; + MC_SET_RAW_MEM; - set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, 0); + unsigned int cursor = 0; + mc_pair_t pair_test; + int pair_found = 0; - if(cursor == 0){ - MC_dfs(a, 0, 0); - }else{ - MC_dfs(a, 0, 1); + xbt_dynar_foreach(acceptance_pairs, cursor, pair_test){ + if(pair_test->num == pair->num){ + pair_found = 1; + break; } } - cursor = 0; - xbt_dynar_foreach(elses, 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(pair_found) + xbt_dynar_remove_at(acceptance_pairs, cursor, NULL); + + pair->acceptance_removed = 1; - if((xbt_dynar_length(successors) == 0) && (cursor == 0)){ - MC_dfs(a, 0, 0); - }else{ - MC_dfs(a, 0, 1); + if(pair->stack_removed && pair->acceptance_removed){ + if(_sg_mc_visited == 0){ + MC_pair_delete(pair); + }else if(pair->visited_removed){ + MC_pair_delete(pair); } } - + + if(!raw_mem_set) + MC_UNSET_RAW_MEM; } +static int is_visited_pair(mc_pair_t pair){ -void MC_dfs(xbt_automaton_t a, int search_cycle, int restore){ + if(_sg_mc_visited == 0) + return -1; - smx_process_t process = NULL; + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + MC_SET_RAW_MEM; - if(xbt_fifo_size(mc_snapshot_stack) == 0) - return; + if(xbt_dynar_is_empty(visited_pairs)){ - 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; - } + if(pair->graph_state->system_state == NULL) + pair->graph_state->system_state = MC_take_snapshot(); + xbt_dynar_push(visited_pairs, &pair); - //XBT_DEBUG("Lpv length after restore snapshot: %lu", xbt_dynar_length(visited_pairs)); + if(!raw_mem_set) + MC_UNSET_RAW_MEM; - /* Get current state */ - mc_pairs_t current_pair = (mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack)); + return -1; - 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); + }else{ + + if(pair->graph_state->system_state == NULL) + pair->graph_state->system_state = MC_take_snapshot(); + + int min = -1, max = -1, index; + int res; + mc_pair_t pair_test; + + index = get_search_interval(visited_pairs, pair, &min, &max); + + if(min != -1 && max != -1){ /* Visited pair with same number of processes and same heap bytes used exists */ + res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(visited_pairs, min), (max-min)+1, pair); + if(res != -1){ + pair_test = (mc_pair_t)xbt_dynar_get_as(visited_pairs, (min+res)-1, mc_pair_t); + if(pair_test->other_num == -1) + pair->other_num = pair_test->num; + else + pair->other_num = pair_test->other_num; + if(dot_output == NULL) + XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", pair->num, pair_test->num); + else + XBT_DEBUG("Pair %d already visited ! (equal to pair %d (pair %d in dot_output))", pair->num, pair_test->num, pair->other_num); + xbt_dynar_remove_at(visited_pairs, (min + res) - 1, NULL); + xbt_dynar_insert_at(visited_pairs, (min+res) - 1, &pair); + pair_test->visited_removed = 1; + if(pair_test->stack_removed && pair_test->visited_removed){ + if((pair_test->automaton_state->type == 1) || (pair_test->automaton_state->type == 2)){ + if(pair_test->acceptance_removed){ + MC_pair_delete(pair_test); + } + }else{ + MC_pair_delete(pair_test); + } + } + if(!raw_mem_set) + MC_UNSET_RAW_MEM; + return pair->other_num; + } + xbt_dynar_insert_at(visited_pairs, min, &pair); + }else{ + pair_test = (mc_pair_t)xbt_dynar_get_as(visited_pairs, index, mc_pair_t); + if(pair_test->nb_processes < pair->nb_processes){ + xbt_dynar_insert_at(visited_pairs, index+1, &pair); + }else{ + if(pair_test->heap_bytes_used < pair->heap_bytes_used) + xbt_dynar_insert_at(visited_pairs, index + 1, &pair); + else + xbt_dynar_insert_at(visited_pairs, index, &pair); } } - } - - 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 value; - mc_state_t next_graph_state = NULL; - smx_req_t req = NULL; - char *req_str; + if(xbt_dynar_length(visited_pairs) > _sg_mc_visited){ + int min = mc_stats->expanded_states; + unsigned int cursor2 = 0; + unsigned int index2 = 0; + xbt_dynar_foreach(visited_pairs, cursor2, pair_test){ + if(pair_test->num < min){ + index = cursor2; + min = pair_test->num; + } + } + xbt_dynar_remove_at(visited_pairs, index2, &pair_test); + pair_test->visited_removed = 1; + if(pair_test->stack_removed && pair_test->acceptance_removed && pair_test->visited_removed) + MC_pair_delete(pair_test); + + } - mc_pairs_t pair_succ; - xbt_transition_t transition_succ; - unsigned int cursor; - int res; - //int enabled_transition = 0; + if(!raw_mem_set) + MC_UNSET_RAW_MEM; + + return -1; - 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; - mc_snapshot_t current_snapshot; - +static int MC_automaton_evaluate_label(xbt_automaton_exp_label_t l, xbt_dynar_t atomic_propositions_values){ - 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_dfs, xbt_log_priority_debug)){ - req_str = MC_request_to_string(req, value); - XBT_DEBUG("Execute: %s", req_str); - xbt_free(req_str); + switch(l->type){ + case 0 : { + int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp, atomic_propositions_values); + int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp, atomic_propositions_values); + return (left_res || right_res); + } + case 1 : { + int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp, atomic_propositions_values); + int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp, atomic_propositions_values); + return (left_res && right_res); + } + case 2 : { + int res = MC_automaton_evaluate_label(l->u.exp_not, atomic_propositions_values); + return (!res); + } + case 3 : { + unsigned int cursor = 0; + xbt_automaton_propositional_symbol_t p = NULL; + xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, p){ + if(strcmp(p->pred, l->u.predicat) == 0) + return (int)xbt_dynar_get_as(atomic_propositions_values, cursor, int); } + return -1; + } + case 4 : { + return 2; + } + default : + return -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(); +/********* DDFS Algorithm *********/ - /* Create the new expanded graph_state */ - MC_SET_RAW_MEM; +void MC_ddfs_init(void){ - 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)){ - XBT_DEBUG("Pid : %lu", process->pid); - MC_state_interleave_process(next_graph_state, process); - } - } + initial_state_liveness->raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - next_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(next_snapshot); - - MC_UNSET_RAW_MEM; + XBT_DEBUG("**************************************************"); + XBT_DEBUG("Double-DFS init"); + XBT_DEBUG("**************************************************"); - xbt_dynar_reset(successors); - xbt_dynar_reset(elses); - - cursor = 0; - xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + mc_pair_t initial_pair = NULL; + smx_process_t process; - res = MC_automaton_evaluate_label(a, transition_succ->label); + MC_wait_for_requests(); - MC_SET_RAW_MEM; - next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst); + MC_SET_RAW_MEM; - //XBT_DEBUG("Next pair : %p", next_pair); - - 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++; - } - } + acceptance_pairs = xbt_dynar_new(sizeof(mc_pair_t), NULL); + visited_pairs = xbt_dynar_new(sizeof(mc_pair_t), NULL); + successors = xbt_dynar_new(sizeof(mc_pair_t), NULL); - MC_UNSET_RAW_MEM; - } + initial_state_liveness->snapshot = MC_take_snapshot(); + initial_state_liveness->prev_pair = 0; - - if(xbt_dynar_length(successors) == 0){ + MC_UNSET_RAW_MEM; + + unsigned int cursor = 0; + xbt_automaton_state_t automaton_state; + xbt_dynar_foreach(_mc_property_automaton->states, cursor, automaton_state){ + if(automaton_state->type == -1){ /* Initial automaton state */ + 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; - - } - - cursor = 0; - xbt_dynar_foreach(successors, cursor, pair_succ){ + initial_pair = MC_pair_new(); + initial_pair->automaton_state = automaton_state; + initial_pair->graph_state = MC_state_new(); + initial_pair->atomic_propositions = get_atomic_propositions_values(); - //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); + /* Get enabled process and insert it in the interleave set of the graph_state */ + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ + MC_state_interleave_process(initial_pair->graph_state, process); + } } - - 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); + initial_pair->requests = MC_state_interleave_size(initial_pair->graph_state); + initial_pair->search_cycle = 0; - if((search_cycle == 0) && (current_pair->automaton_state->type == 1)){ + xbt_fifo_unshift(mc_stack_liveness, initial_pair); - 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); - - } + MC_UNSET_RAW_MEM; + + MC_ddfs(); + + if(cursor != 0){ + MC_restore_snapshot(initial_state_liveness->snapshot); + MC_UNSET_RAW_MEM; } - } - - 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); + }else if(automaton_state->type == 2){ /* Acceptance automaton state */ + + MC_SET_RAW_MEM; - 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); + initial_pair = MC_pair_new(); + initial_pair->automaton_state = automaton_state; + initial_pair->graph_state = MC_state_new(); + initial_pair->atomic_propositions = get_atomic_propositions_values(); + + /* Get enabled process and insert it in the interleave set of the graph_state */ + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ + MC_state_interleave_process(initial_pair->graph_state, process); + } } - - 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); + initial_pair->requests = MC_state_interleave_size(initial_pair->graph_state); + initial_pair->search_cycle = 1; + + xbt_fifo_unshift(mc_stack_liveness, initial_pair); + + MC_UNSET_RAW_MEM; - if((search_cycle == 0) && (current_pair->automaton_state->type == 1)){ + set_acceptance_pair_reached(initial_pair); + + MC_ddfs(); - 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(cursor != 0){ + MC_restore_snapshot(initial_state_liveness->snapshot); + MC_UNSET_RAW_MEM; } } - - - if(MC_state_interleave_size(current_pair->graph_state) > 0){ - MC_restore_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; - //XBT_DEBUG("Snapshot restored"); - } } + if(initial_state_liveness->raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; - 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; } -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; +void MC_ddfs(){ - MC_SET_RAW_MEM; - while ((pair = (mc_pairs_t) xbt_fifo_pop(stack)) != NULL) - MC_pair_delete(pair); - MC_UNSET_RAW_MEM; -} + smx_process_t process; + mc_pair_t current_pair = NULL; -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); -} + if(xbt_fifo_size(mc_stack_liveness) == 0) + return; + /* Get current pair */ + current_pair = (mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness)); -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; - } -} + /* Update current state in buchi automaton */ + _mc_property_automaton->current_state = current_pair->automaton_state; -/*void MC_dfs(xbt_automaton_t a, int search_cycle){ + XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d, interleave size %d)", xbt_fifo_size(mc_stack_liveness), current_pair->search_cycle, MC_state_interleave_size(current_pair->graph_state)); + + mc_stats->visited_pairs++; + + int value; + smx_simcall_t req = NULL; + char *req_str; - 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; + xbt_automaton_transition_t transition_succ; unsigned int cursor = 0; - xbt_dynar_t elses = xbt_dynar_new(sizeof(xbt_transition_t), NULL); int res; + int reached_num, visited_num; - //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); - } + mc_pair_t next_pair = NULL; + xbt_dynar_t prop_values = NULL; + + if(xbt_fifo_size(mc_stack_liveness) < _sg_mc_max_depth){ + + if(current_pair->requests > 0){ + + if(current_pair->search_cycle){ + + if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){ + + if((reached_num = is_reached_acceptance_pair(current_pair)) != -1){ + + XBT_INFO("Pair %d already reached (equal to pair %d) !", current_pair->num, reached_num); + + MC_SET_RAW_MEM; + xbt_fifo_shift(mc_stack_liveness); + if(dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_state_liveness->prev_pair, reached_num, initial_state_liveness->prev_req); + MC_UNSET_RAW_MEM; + + XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); + XBT_INFO("| ACCEPTANCE CYCLE |"); + XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); + XBT_INFO("Counter-example that violates formula :"); + MC_show_stack_liveness(mc_stack_liveness); + MC_dump_stack_liveness(mc_stack_liveness); + MC_print_statistics(mc_stats); + xbt_abort(); + + } + } } - 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); - } + + if((visited_num = is_visited_pair(current_pair)) != -1){ + + MC_SET_RAW_MEM; + if(dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_state_liveness->prev_pair, visited_num, initial_state_liveness->prev_req); + MC_UNSET_RAW_MEM; + + + }else{ + + while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ + + MC_SET_RAW_MEM; + if(dot_output != NULL){ + if(initial_state_liveness->prev_pair != 0 && initial_state_liveness->prev_pair != current_pair->num){ + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_state_liveness->prev_pair, current_pair->num, initial_state_liveness->prev_req); + xbt_free(initial_state_liveness->prev_req); + } + initial_state_liveness->prev_pair = current_pair->num; + } + 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_SET_RAW_MEM; + if(dot_output != NULL){ + initial_state_liveness->prev_req = MC_request_get_dot_output(req, value); + if(current_pair->search_cycle) + fprintf(dot_output, "%d [shape=doublecircle];\n", current_pair->num); + } + MC_UNSET_RAW_MEM; + + MC_state_set_executed_request(current_pair->graph_state, req, value); + mc_stats->executed_transitions++; + + /* Answer the request */ + SIMIX_simcall_pre(req, value); + + /* Wait for requests (schedules processes) */ + MC_wait_for_requests(); + + MC_SET_RAW_MEM; + prop_values = get_atomic_propositions_values(); + MC_UNSET_RAW_MEM; + + /* Evaluate enabled transition according to atomic propositions values */ + cursor= 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + + res = MC_automaton_evaluate_label(transition_succ->label, prop_values); + + if(res == 1){ // enabled transition in automaton + + MC_SET_RAW_MEM; + + next_pair = MC_pair_new(); + next_pair->graph_state = MC_state_new(); + next_pair->automaton_state = transition_succ->dst; + next_pair->atomic_propositions = get_atomic_propositions_values(); + + /* 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_pair->graph_state, process); + } + } + + next_pair->requests = MC_state_interleave_size(next_pair->graph_state); + + if(next_pair->automaton_state->type == 1 || next_pair->automaton_state->type == 2 || current_pair->search_cycle) + next_pair->search_cycle = 1; + + xbt_fifo_unshift(mc_stack_liveness, next_pair); + + if(mc_stats->expanded_pairs%1000000 == 0) + XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs); + + MC_UNSET_RAW_MEM; + + MC_ddfs(); + + } + + } + + /* Then, evaluate true transitions (always true, whatever atomic propositions values) */ + cursor = 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + + res = MC_automaton_evaluate_label(transition_succ->label, prop_values); + + if(res == 2){ // true transition in automaton + + MC_SET_RAW_MEM; + + next_pair = MC_pair_new(); + next_pair->graph_state = MC_state_new(); + next_pair->automaton_state = transition_succ->dst; + next_pair->atomic_propositions = get_atomic_propositions_values(); + + /* 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_pair->graph_state, process); + } + } + + next_pair->requests = MC_state_interleave_size(next_pair->graph_state); + + if(next_pair->automaton_state->type == 1 || next_pair->automaton_state->type == 2 || current_pair->search_cycle) + next_pair->search_cycle = 1; + + xbt_fifo_unshift(mc_stack_liveness, next_pair); + + if(mc_stats->expanded_pairs%1000000 == 0) + XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs); + + MC_UNSET_RAW_MEM; + + MC_ddfs(); + + } + + } + + if(MC_state_interleave_size(current_pair->graph_state) > 0){ + XBT_DEBUG("Backtracking to depth %d", xbt_fifo_size(mc_stack_liveness)); + MC_replay_liveness(mc_stack_liveness, 0); + } + + } + } + }else{ - if(res == 2){ - xbt_dynar_push(elses,&transition_succ); + + mc_stats->executed_transitions++; + + XBT_DEBUG("No request to execute in this state, search evolution in Büchi Automaton."); + + if(current_pair->search_cycle){ + + if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){ + + if((reached_num = is_reached_acceptance_pair(current_pair)) != -1){ + + XBT_INFO("Pair %d already reached (equal to pair %d) !", current_pair->num, reached_num); + + MC_SET_RAW_MEM; + xbt_fifo_shift(mc_stack_liveness); + MC_UNSET_RAW_MEM; + + XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); + XBT_INFO("| ACCEPTANCE CYCLE |"); + XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); + XBT_INFO("Counter-example that violates formula :"); + MC_show_stack_liveness(mc_stack_liveness); + MC_dump_stack_liveness(mc_stack_liveness); + MC_print_statistics(mc_stats); + xbt_abort(); + + } + } } - } - } - - 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); - }*/ + if((visited_num = is_visited_pair(current_pair)) != -1){ + XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", current_pair->num, visited_num); + + }else{ + + MC_SET_RAW_MEM; + prop_values = get_atomic_propositions_values(); + MC_UNSET_RAW_MEM; -/* void MC_dfs(xbt_automaton_t a, int search_cycle, int restore){ */ + /* Evaluate enabled transition according to atomic propositions values */ + cursor= 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + res = MC_automaton_evaluate_label(transition_succ->label, prop_values); -/* if(xbt_fifo_size(mc_snapshot_stack) == 0) */ -/* return; */ + if(res == 1){ // enabled transition in automaton -/* 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_SET_RAW_MEM; + next_pair = MC_pair_new(); + next_pair->graph_state = MC_state_new(); + next_pair->automaton_state = transition_succ->dst; + next_pair->atomic_propositions = get_atomic_propositions_values(); + next_pair->requests = MC_state_interleave_size(next_pair->graph_state); + + if(next_pair->automaton_state->type == 1 || next_pair->automaton_state->type == 2 || current_pair->search_cycle) + next_pair->search_cycle = 1; + + xbt_fifo_unshift(mc_stack_liveness, next_pair); -/* //XBT_DEBUG("Lpv length after restore snapshot: %lu", xbt_dynar_length(visited_pairs)); */ + if(mc_stats->expanded_pairs%1000 == 0) + XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_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)); */ + if(dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", current_pair->num, next_pair->num, ""); -/* 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){ */ + MC_UNSET_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)); */ + MC_ddfs(); -/* 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); */ -/* } */ + } -/* MC_state_set_executed_request(current_pair->graph_state, req, value); */ -/* //mc_stats->executed_transitions++; */ + } -/* /\* Answer the request *\/ */ -/* SIMIX_request_pre(req, value); */ + /* Then, evaluate true transitions (always true, whatever atomic propositions values) */ + cursor = 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + + res = MC_automaton_evaluate_label(transition_succ->label, prop_values); + + if(res == 2){ // true transition in automaton -/* /\* Wait for requests (schedules processes) *\/ */ -/* MC_wait_for_requests(); */ + MC_SET_RAW_MEM; + + next_pair = MC_pair_new(); + next_pair->graph_state = MC_state_new(); + next_pair->automaton_state = transition_succ->dst; + next_pair->atomic_propositions = get_atomic_propositions_values(); + next_pair->requests = MC_state_interleave_size(next_pair->graph_state); + + if(next_pair->automaton_state->type == 1 || next_pair->automaton_state->type == 2 || current_pair->search_cycle) + next_pair->search_cycle = 1; + xbt_fifo_unshift(mc_stack_liveness, next_pair); -/* /\* Create the new expanded graph_state *\/ */ -/* MC_SET_RAW_MEM; */ + if(mc_stats->expanded_pairs%1000 == 0) + XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs); + + if(dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", current_pair->num, next_pair->num, ""); -/* next_graph_state = MC_state_new(); */ - -/* /\* Get enabled process and insert it in the interleave set of the next graph_state *\/ */ -/* xbt_swag_foreach(process, simix_global->process_list){ */ -/* if(MC_process_is_enabled(process)){ */ -/* MC_state_interleave_process(next_graph_state, process); */ -/* } */ -/* } */ - -/* next_snapshot = xbt_new0(s_mc_snapshot_t, 1); */ -/* MC_take_snapshot(next_snapshot); */ - -/* MC_UNSET_RAW_MEM; */ + MC_UNSET_RAW_MEM; -/* xbt_dynar_reset(elses); */ -/* xbt_dynar_reset(successors); */ - -/* 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 */ -/* 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) ){ */ - -/* 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)); */ -/* //XBT_DEBUG("Elses length : %lu", xbt_dynar_length(elses)); */ - -/* if(xbt_dynar_length(successors) > 0){ */ - -/* cursor = 0; */ -/* xbt_dynar_foreach(successors, cursor, pair_succ){ */ -/* MC_SET_RAW_MEM; */ -/* xbt_dynar_push(all_successors, &pair_succ); */ -/* MC_UNSET_RAW_MEM; */ -/* } */ - -/* }else{ */ - -/* 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_restore_snapshot(current_snapshot); */ -/* MC_UNSET_RAW_MEM; */ - -/* } */ - -/* //XBT_DEBUG("All successors : %lu", xbt_dynar_length(all_successors)); */ - -/* cursor = 0; */ - -/* xbt_dynar_foreach(all_successors, cursor, pair_succ){ */ - -/* 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){ */ - -/* //XBT_DEBUG("New pair in stack"); */ - -/* MC_SET_RAW_MEM; */ -/* xbt_fifo_unshift(mc_snapshot_stack, pair_succ); */ -/* MC_UNSET_RAW_MEM; */ + MC_ddfs(); -/* 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_WARN("/!\\ Max depth reached ! /!\\ "); + if(MC_state_interleave_size(current_pair->graph_state) > 0){ + XBT_WARN("/!\\ But, there are still processes to interleave. Model-checker will not be able to ensure the soundness of the verification from now. /!\\ "); + if(_sg_mc_max_depth == 1000) + XBT_WARN("Notice : the default value of max depth is 1000 but you can change it with cfg=model-check/max_depth:value."); + } + + } -/* } */ -/* } */ + if(xbt_fifo_size(mc_stack_liveness) == _sg_mc_max_depth ){ + XBT_DEBUG("Pair %d (depth = %d) shifted in stack, maximum depth reached", current_pair->num, xbt_fifo_size(mc_stack_liveness) ); + }else{ + XBT_DEBUG("Pair %d (depth = %d) shifted in stack", current_pair->num, xbt_fifo_size(mc_stack_liveness) ); + } -/* } */ -/* 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_SET_RAW_MEM; + xbt_dynar_free(&prop_values); + current_pair = xbt_fifo_shift(mc_stack_liveness); + current_pair->stack_removed = 1; + if(current_pair->search_cycle){ + remove_acceptance_pair(current_pair); + }else{ + if(_sg_mc_visited == 0) + MC_pair_delete(current_pair); + else if(current_pair->visited_removed) + MC_pair_delete(current_pair); + } + + MC_UNSET_RAW_MEM; -/* } */ +}