X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c46571ef338c2b981ed72a94c12e6bceda8ee0eb..87bc879019fc94e7ff1bc1ada77ecf85b0b588af:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index 150ed78ea3..8067a737c0 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -1,552 +1,297 @@ -#include "private.h" -#include "unistd.h" +/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved. */ + +/* 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. */ + +#include "mc_private.h" +#include +#include 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->graph_state = sg; - p->num = max_pair; - max_pair++; - mc_stats_pair->expanded_pairs++; - return p; +xbt_dynar_t visited_pairs; +xbt_dynar_t successors; + +int create_dump(int pair) +{ + // Try to enable core dumps + struct rlimit core_limit; + core_limit.rlim_cur = RLIM_INFINITY; + core_limit.rlim_max = RLIM_INFINITY; + + if(setrlimit(RLIMIT_CORE, &core_limit) < 0) + fprintf(stderr, "setrlimit: %s\nWarning: core dumps may be truncated or non-existant\n", strerror(errno)); + + int status; + switch(fork()){ + case 0: + // We are the child process -- run the actual program + xbt_abort(); + break; -} - -void set_pair_visited(mc_state_t gs, xbt_state_t as, int sc){ - - 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; - char *hash = malloc(sizeof(char)*128); - xbt_sha((char *)&p, hash); - xbt_dynar_push(visited_pairs, &hash); - MC_UNSET_RAW_MEM; + case -1: + // An error occurred, shouldn't happen + perror("fork"); + return -1; + + default: + // We are the parent process -- wait for the child process to exit + if(wait(&status) < 0) + perror("wait"); + if(WIFSIGNALED(status) && WCOREDUMP(status)){ + char *core_name = xbt_malloc(20); + sprintf(core_name,"core_%d", pair); + rename("core", core_name); + free(core_name); + } + } + return 0; } -int reached(mc_state_t gs, xbt_state_t as ){ +int reached(xbt_state_t st){ - /*mc_reached_pairs_t rp = NULL; - unsigned int c= 0; - unsigned int i; - int different_process; + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); 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; - } - } - } - MC_UNSET_RAW_MEM; - return 0;*/ - //XBT_DEBUG("Search acceptance pair already reach !"); - - char* hash_reached = malloc(sizeof(char)*128); - 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)*128); - 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_pair_reached_t new_pair = NULL; + new_pair = xbt_new0(s_mc_pair_reached_t, 1); + new_pair->nb = xbt_dynar_length(reached_pairs) + 1; + new_pair->automaton_state = st; + new_pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); + new_pair->system_state = MC_take_snapshot(); + + /* Get values of propositional symbols */ + int res; + int_f_void_t f; + unsigned int cursor = 0; + xbt_propositional_symbol_t ps = NULL; + xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ + f = (int_f_void_t)ps->function; + res = (*f)(); + xbt_dynar_push_as(new_pair->prop_ato, int, res); } MC_UNSET_RAW_MEM; - return 0; -} - -void set_pair_reached(mc_state_t gs, xbt_state_t as){ + + if(xbt_dynar_is_empty(reached_pairs)/* || !compare*/){ - //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; - char *hash = malloc(sizeof(char)*128) ; - 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); + /* New pair reached */ + xbt_dynar_push(reached_pairs, &new_pair); MC_UNSET_RAW_MEM; - } -} - -int visited(mc_state_t gs, xbt_state_t as, int sc){ - /*unsigned int c = 0; - mc_visited_pairs_t p = NULL; - unsigned int i; - int different_process; + if(raw_mem_set) + MC_SET_RAW_MEM; + + return 0; - //XBT_DEBUG("Visited pair length : %lu", xbt_dynar_length(visited_pairs)); + }else{ - 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; + MC_SET_RAW_MEM; + + cursor = 0; + mc_pair_reached_t pair_test = NULL; + + xbt_dynar_foreach(reached_pairs, cursor, pair_test){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)) + XBT_DEBUG("****** Pair reached #%d ******", pair_test->nb); + if(automaton_state_compare(pair_test->automaton_state, st) == 0){ + if(propositional_symbols_compare_value(pair_test->prop_ato, new_pair->prop_ato) == 0){ + if(snapshot_compare(new_pair->system_state, pair_test->system_state) == 0){ + + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + + return 1; + } + }else{ + XBT_DEBUG("Different values of propositional symbols"); + } + }else{ + XBT_DEBUG("Different automaton state"); } } - } - MC_UNSET_RAW_MEM; - return 0;*/ - //XBT_DEBUG("Test visited pair"); - - char* hash_visited = malloc(sizeof(char)*128); - unsigned int c= 0; + /* New pair reached */ + xbt_dynar_push(reached_pairs, &new_pair); + + MC_UNSET_RAW_MEM; - 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)*128); - 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; - } + if(raw_mem_set) + MC_SET_RAW_MEM; + + compare = 0; + + return 0; + } - - 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("**************************************************"); - - 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(); +void set_pair_reached(xbt_state_t st){ + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + MC_SET_RAW_MEM; - init_snapshot = xbt_new0(s_mc_snapshot_t, 1); - - initial_graph_state = MC_state_pair_new(); - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - MC_state_interleave_process(initial_graph_state, process); - } - } - - visited_pairs = xbt_dynar_new(sizeof(char *), NULL); - reached_pairs = xbt_dynar_new(sizeof(char *), NULL); - - MC_take_snapshot(init_snapshot); - - MC_UNSET_RAW_MEM; - - /* unsigned int cursor = 0; */ - /* xbt_state_t state = NULL; */ - /* int nb_init_state = 0; */ - - /* xbt_dynar_foreach(a->states, cursor, state){ */ - /* if(state->type == -1){ */ - - /* MC_SET_RAW_MEM; */ - /* mc_initial_pair = new_pair(init_snapshot, initial_graph_state, state); */ - - /* xbt_fifo_unshift(mc_snapshot_stack, mc_initial_pair); */ - - /* XBT_DEBUG("**************************************************"); */ - /* XBT_DEBUG("Initial state=%p ", mc_initial_pair); */ - - /* MC_UNSET_RAW_MEM; */ - - /* set_pair_visited(mc_initial_pair->graph_state, mc_initial_pair->automaton_state, 0); */ - - /* if(nb_init_state == 0) */ - /* MC_dfs(a, 0, 0); */ - /* else */ - /* MC_dfs(a, 0, 1); */ - - /* nb_init_state++; */ - /* } */ - /* } */ - - /* regarder dans l'automate toutes les transitions activables grâce à l'état initial du système - -> donnera les états initiaux de la propriété consistants avec l'état initial du système */ + mc_pair_reached_t pair = NULL; + pair = xbt_new0(s_mc_pair_reached_t, 1); + pair->nb = xbt_dynar_length(reached_pairs) + 1; + pair->automaton_state = st; + pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); + pair->system_state = MC_take_snapshot(); + /* Get values of propositional symbols */ unsigned int cursor = 0; - unsigned int cursor2 = 0; - xbt_state_t state = NULL; + xbt_propositional_symbol_t ps = NULL; int res; - xbt_transition_t transition_succ; - xbt_dynar_t successors = 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) || (res == 2)){ - - 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; + int_f_void_t f; - } - } - } + xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ + f = (int_f_void_t)ps->function; + res = (*f)(); + xbt_dynar_push_as(pair->prop_ato, int, res); } - cursor = 0; - - if(xbt_dynar_length(successors) == 0){ - xbt_dynar_foreach(a->states, cursor, state){ - if(state->type == -1){ - MC_SET_RAW_MEM; - - mc_initial_pair = new_pair(init_snapshot, initial_graph_state, transition_succ->dst); - xbt_dynar_push(successors, &mc_initial_pair); - - MC_UNSET_RAW_MEM; - } - } - } + xbt_dynar_push(reached_pairs, &pair); + + MC_UNSET_RAW_MEM; - cursor = 0; - xbt_dynar_foreach(successors, cursor, pair_succ){ + if(raw_mem_set) MC_SET_RAW_MEM; - - xbt_fifo_unshift(mc_snapshot_stack, pair_succ); - set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, 0); - - MC_UNSET_RAW_MEM; - - if(cursor == 0){ - MC_dfs(a, 0, 0); - }else{ - MC_dfs(a, 0, 1); - } - } - - - - - + } +int visited(xbt_state_t st){ -void MC_dfs(xbt_automaton_t a, int search_cycle, int restore){ + if(_sg_mc_visited == 0) + return 0; - smx_process_t process = NULL; - - - if(xbt_fifo_size(mc_snapshot_stack) == 0) - return; + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - 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; - } - - - /* 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(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); - } - } - } + 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)); + mc_pair_visited_t new_pair = NULL; + new_pair = xbt_new0(s_mc_pair_visited_t, 1); + new_pair->automaton_state = st; + new_pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); + new_pair->system_state = MC_take_snapshot(); - - mc_stats_pair->visited_pairs++; - - 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; + /* Get values of propositional symbols */ int res; - //int enabled_transition = 0; - - xbt_dynar_t successors = xbt_dynar_new(sizeof(mc_pairs_t), NULL); - - mc_pairs_t next_pair; - mc_snapshot_t next_snapshot; - mc_snapshot_t current_snapshot; + int_f_void_t f; + unsigned int cursor = 0; + xbt_propositional_symbol_t ps = NULL; + xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ + f = (int_f_void_t)ps->function; + res = (*f)(); + xbt_dynar_push_as(new_pair->prop_ato, int, res); + } + MC_UNSET_RAW_MEM; - while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ + if(xbt_dynar_is_empty(visited_pairs)){ MC_SET_RAW_MEM; - current_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(current_snapshot); + /* New pair visited */ + xbt_dynar_push(visited_pairs, &new_pair); MC_UNSET_RAW_MEM; - - - /* Debug information */ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - req_str = MC_request_to_string(req, value); - XBT_DEBUG("Execute: %s", req_str); - xbt_free(req_str); - } - - 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(); + if(raw_mem_set) + MC_SET_RAW_MEM; + + return 0; + }else{ - /* Create the new expanded graph_state */ MC_SET_RAW_MEM; - - next_graph_state = MC_state_pair_new(); - - /* Get enabled process and insert it in the interleave set of the next graph_state */ - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - MC_state_interleave_process(next_graph_state, process); - } - } - - next_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(next_snapshot); - - MC_UNSET_RAW_MEM; - - 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; - - 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_pair_visited_t pair_test = NULL; + + xbt_dynar_foreach(visited_pairs, cursor, pair_test){ + if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)) + XBT_DEBUG("****** Pair visited #%d ******", cursor + 1); + if(automaton_state_compare(pair_test->automaton_state, st) == 0){ + if(propositional_symbols_compare_value(pair_test->prop_ato, new_pair->prop_ato) == 0){ + if(snapshot_compare(new_pair->system_state, pair_test->system_state) == 0){ + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + + return 1; + } + }else{ + XBT_DEBUG("Different values of propositional symbols"); + } + }else{ + XBT_DEBUG("Different automaton state"); } - - MC_UNSET_RAW_MEM; } - - if(xbt_dynar_length(successors) == 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; - + if(xbt_dynar_length(visited_pairs) == _sg_mc_visited){ + xbt_dynar_remove_at(visited_pairs, 0, NULL); } + /* New pair visited */ + xbt_dynar_push(visited_pairs, &new_pair); + + MC_UNSET_RAW_MEM; - cursor = 0; - xbt_dynar_foreach(successors, cursor, pair_succ){ - - //XBT_DEBUG("Search visited pair : graph=%p, automaton=%p", pair_succ->graph_state, pair_succ->automaton_state); - - if((search_cycle == 1) && (reached(pair_succ->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); - set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle); - MC_UNSET_RAW_MEM; - - MC_dfs(a, search_cycle, 0); - - if((search_cycle == 0) && (current_pair->automaton_state->type == 1)){ - - MC_restore_snapshot(current_pair->system_state); - MC_UNSET_RAW_MEM; - - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - //XBT_DEBUG("Pid : %lu", process->pid); - MC_state_interleave_process(current_pair->graph_state, process); - } - } - - set_pair_reached(current_pair->graph_state, current_pair->automaton_state); - XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id); - MC_dfs(a, 1, 1); - - } - }else{ - - XBT_DEBUG("Pair already visited !"); - - } - } + if(raw_mem_set) + MC_SET_RAW_MEM; + return 0; - if(MC_state_interleave_size(current_pair->graph_state) > 0){ - MC_restore_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; - //XBT_DEBUG("Snapshot restored"); - } } - - - MC_SET_RAW_MEM; - //remove_pair_reached(current_pair->graph_state); - xbt_fifo_shift(mc_snapshot_stack); - XBT_DEBUG("State (graph=%p, automaton =%p) shifted in snapshot_stack", current_pair->graph_state, current_pair->automaton_state); - MC_UNSET_RAW_MEM; - } -void MC_show_snapshot_stack(xbt_fifo_t stack){ - int value; - mc_pairs_t pair; - xbt_fifo_item_t item; - smx_req_t req; - char *req_str = NULL; - - for (item = xbt_fifo_get_last_item(stack); - (item ? (pair = (mc_pairs_t) (xbt_fifo_get_item_content(item))) - : (NULL)); item = xbt_fifo_get_prev_item(item)) { - req = MC_state_get_executed_request(pair->graph_state, &value); - if(req){ - req_str = MC_request_to_string(req, value); - XBT_INFO("%s", req_str); - xbt_free(req_str); - } - } -} - -void MC_dump_snapshot_stack(xbt_fifo_t stack){ - mc_pairs_t pair; - - MC_SET_RAW_MEM; - while ((pair = (mc_pairs_t) xbt_fifo_pop(stack)) != NULL) - MC_pair_delete(pair); - MC_UNSET_RAW_MEM; -} - -void MC_pair_delete(mc_pairs_t pair){ +void MC_pair_delete(mc_pair_t pair){ xbt_free(pair->graph_state->proc_status); xbt_free(pair->graph_state); - //xbt_free(pair->automaton_state); -> FIXME : à implémenter xbt_free(pair); } -int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l){ + +int MC_automaton_evaluate_label(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); + int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp); + int right_res = MC_automaton_evaluate_label(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); + int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp); + int right_res = MC_automaton_evaluate_label(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); + int res = MC_automaton_evaluate_label(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){ + int_f_void_t f; + xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, p){ if(strcmp(p->pred, l->u.predicat) == 0){ - int (*f)() = p->function; - return (*f)(); + f = (int_f_void_t)p->function; + return (*f)(); } } return -1; - break; } case 4 : { return 2; - break; } default : return -1; @@ -554,269 +299,499 @@ int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l){ } -/********************* Double DFS using color pair *********************/ +/********************* Double-DFS stateless *******************/ +void pair_visited_free(mc_pair_visited_t pair){ + if(pair){ + pair->automaton_state = NULL; + xbt_dynar_free(&(pair->prop_ato)); + MC_free_snapshot(pair->system_state); + xbt_free(pair); + } +} +void pair_visited_free_voidp(void *p){ + pair_visited_free((mc_pair_visited_t) * (void **) p); +} +void pair_stateless_free(mc_pair_stateless_t pair){ + xbt_free(pair->graph_state->system_state); + xbt_free(pair->graph_state->proc_status); + xbt_free(pair->graph_state); + xbt_free(pair); +} +void pair_stateless_free_voidp(void *p){ + pair_stateless_free((mc_pair_stateless_t) * (void **) p); +} +mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r){ + mc_pair_stateless_t p = NULL; + p = xbt_new0(s_mc_pair_stateless_t, 1); + p->automaton_state = st; + p->graph_state = sg; + p->requests = r; + mc_stats_pair->expanded_pairs++; + return p; +} -/********************* DPOR without replay *********************/ +void pair_reached_free(mc_pair_reached_t pair){ + if(pair){ + pair->automaton_state = NULL; + xbt_dynar_free(&(pair->prop_ato)); + MC_free_snapshot(pair->system_state); + xbt_free(pair); + } +} +void pair_reached_free_voidp(void *p){ + pair_reached_free((mc_pair_reached_t) * (void **) p); +} +void MC_ddfs_init(void){ -void MC_dpor_with_restore_snapshot_init(xbt_automaton_t a){ + initial_state_liveness->raw_mem_set = (mmalloc_get_current_heap() == raw_heap); XBT_DEBUG("**************************************************"); - XBT_DEBUG("DPOR (with restore snapshot) init"); + XBT_DEBUG("Double-DFS init"); XBT_DEBUG("**************************************************"); - mc_pairs_t initial_pair; - mc_state_t initial_graph_state; + mc_pair_stateless_t mc_initial_pair = NULL; + mc_state_t initial_graph_state = NULL; smx_process_t process; - mc_snapshot_t initial_snapshot; - + + MC_wait_for_requests(); MC_SET_RAW_MEM; - 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; } } - visited_pairs = xbt_dynar_new(sizeof(mc_visited_pairs_t), NULL); - reached_pairs = xbt_dynar_new(sizeof(mc_reached_pairs_t), NULL); + reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), pair_reached_free_voidp); + visited_pairs = xbt_dynar_new(sizeof(mc_pair_visited_t), pair_visited_free_voidp); + successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL); - MC_take_snapshot(initial_snapshot); + /* Save the initial state */ + initial_state_liveness->snapshot = MC_take_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_state_t state; - xbt_dynar_foreach(a->states, cursor, state){ + xbt_dynar_foreach(_mc_property_automaton->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_SET_RAW_MEM; + mc_initial_pair = new_pair_stateless(initial_graph_state, state, MC_state_interleave_size(initial_graph_state)); + xbt_fifo_unshift(mc_stack_liveness, mc_initial_pair); + MC_UNSET_RAW_MEM; + + if(cursor != 0){ + MC_restore_snapshot(initial_state_liveness->snapshot); + MC_UNSET_RAW_MEM; + } - MC_UNSET_RAW_MEM; - - /* Add pair to list of visited pairs*/ - set_pair_visited(initial_pair->graph_state, initial_pair->automaton_state, 0); + MC_ddfs(0); - MC_dpor_with_restore_snapshot(a, 0, 0); + }else{ + if(state->type == 2){ + + MC_SET_RAW_MEM; + mc_initial_pair = new_pair_stateless(initial_graph_state, state, MC_state_interleave_size(initial_graph_state)); + xbt_fifo_unshift(mc_stack_liveness, mc_initial_pair); + MC_UNSET_RAW_MEM; - break; + set_pair_reached(state); - } + if(cursor != 0){ + MC_restore_snapshot(initial_state_liveness->snapshot); + MC_UNSET_RAW_MEM; + } + + MC_ddfs(1); + } } - - if(xbt_fifo_size(mc_snapshot_stack)>0) - break; } - /* Initial state of automaton is initial state for initial pair*/ - if(xbt_fifo_size(mc_snapshot_stack) == 0){ - - cursor = 0; - - xbt_dynar_foreach(a->states, cursor, state){ - if(state->type == -1){ - - MC_SET_RAW_MEM; + if(initial_state_liveness->raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + - initial_pair = new_pair(initial_snapshot, initial_graph_state, state); - 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_dpor_with_restore_snapshot(a, 0, 0); - - break; - } - } +} - } -} +void MC_ddfs(int search_cycle){ + //initial_state_liveness->raw_mem_set = (mmalloc_get_current_heap() == raw_heap); -/* 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){ + smx_process_t process; + mc_pair_stateless_t current_pair = NULL; - smx_process_t process = NULL; - - if(xbt_fifo_size(mc_snapshot_stack) == 0) + if(xbt_fifo_size(mc_stack_liveness) == 0) return; + + /* Get current pair */ + current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness)); + + /* Update current state in buchi automaton */ + _mc_property_automaton->current_state = current_pair->automaton_state; + + + XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), search_cycle); + + mc_stats_pair->visited_pairs++; + + //sleep(1); + int value; mc_state_t next_graph_state = NULL; - smx_req_t req = NULL, prev_req = NULL; + smx_simcall_t req = NULL; char *req_str; - xbt_fifo_item_t item = NULL; xbt_transition_t transition_succ; - unsigned int cursor; + unsigned int cursor = 0; 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; + mc_pair_stateless_t next_pair = NULL; + mc_pair_stateless_t pair_succ; - while(xbt_fifo_size(mc_snapshot_stack) > 0){ + mc_pair_stateless_t remove_pair; + mc_pair_reached_t remove_pair_reached; + + if(xbt_fifo_size(mc_stack_liveness) < _sg_mc_max_depth){ - current_pair = (mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack)); + if(current_pair->requests > 0){ + while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ + + /* Debug information */ + + req_str = MC_request_to_string(req, value); + XBT_DEBUG("Execute: %s", req_str); + xbt_free(req_str); + + MC_state_set_executed_request(current_pair->graph_state, req, value); + + /* Answer the request */ + SIMIX_simcall_pre(req, value); + + /* Wait for requests (schedules processes) */ + MC_wait_for_requests(); + + MC_SET_RAW_MEM; + + /* Create the new expanded graph_state */ + next_graph_state = MC_state_pair_new(); + + /* Get enabled process and insert it in the interleave set of the next graph_state */ + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ + XBT_DEBUG("Process %lu enabled with simcall : %d", process->pid, (&process->simcall)->call); + } + } + + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ + MC_state_interleave_process(next_graph_state, process); + } + } + + xbt_dynar_reset(successors); + + MC_UNSET_RAW_MEM; + + + cursor= 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + + res = MC_automaton_evaluate_label(transition_succ->label); + + if(res == 1){ // enabled transition in automaton + MC_SET_RAW_MEM; + next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state)); + xbt_dynar_push(successors, &next_pair); + MC_UNSET_RAW_MEM; + } + + } + + cursor = 0; + + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + + res = MC_automaton_evaluate_label(transition_succ->label); + + if(res == 2){ // true transition in automaton + MC_SET_RAW_MEM; + next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state)); + xbt_dynar_push(successors, &next_pair); + MC_UNSET_RAW_MEM; + } + + } + + cursor = 0; + + xbt_dynar_foreach(successors, cursor, pair_succ){ + + if(search_cycle == 1){ + + if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ + + if(reached(pair_succ->automaton_state)){ + + XBT_INFO("Next pair (depth = %d, %u interleave) already reached !", xbt_fifo_size(mc_stack_liveness) + 1, MC_state_interleave_size(pair_succ->graph_state)); + + 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_pairs(mc_stats_pair); + xbt_abort(); + + }else{ + + if(visited(pair_succ->automaton_state)){ + + XBT_DEBUG("Next pair already visited !"); + break; + + }else{ + + XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id); + + XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, 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++; + MC_ddfs(search_cycle); + + } - /* Add pair to list of visited pairs*/ - set_pair_visited(current_pair->graph_state, current_pair->automaton_state, search_cycle); + } - if((xbt_fifo_size(mc_snapshot_stack) < MAX_DEPTH) && (req = MC_state_get_request(current_pair->graph_state, &value))){ + }else{ - MC_SET_RAW_MEM; - current_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; + if(visited(pair_succ->automaton_state)){ - /* 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); - } + XBT_DEBUG("Next pair already visited !"); + break; + + }else{ + + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); + } + + } - MC_state_set_executed_request(current_pair->graph_state, req, value); + }else{ - /* Answer the request */ - SIMIX_request_pre(req, value); + if(visited(pair_succ->automaton_state)){ + + XBT_DEBUG("Next pair already visited !"); + break; + + }else{ + + if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ + + XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id); - /* Wait for requests (schedules processes) */ - MC_wait_for_requests(); + set_pair_reached(pair_succ->automaton_state); + + search_cycle = 1; + + XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + + } + + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); + + } + + } + + /* Restore system before checking others successors */ + if(cursor != (xbt_dynar_length(successors) - 1)) + MC_replay_liveness(mc_stack_liveness, 1); + + } + + 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{ - /* Create the new expanded graph_state */ + XBT_DEBUG("No more request to execute in this state, search evolution in Büchi Automaton."); + MC_SET_RAW_MEM; - + + /* Create the new expanded graph_state */ 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); - + xbt_dynar_reset(successors); + MC_UNSET_RAW_MEM; - new_pair_created = 0; - - cursor = 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; - - break; - - } + + res = MC_automaton_evaluate_label(transition_succ->label); + + if(res == 1){ // enabled transition in automaton + MC_SET_RAW_MEM; + next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state)); + xbt_dynar_push(successors, &next_pair); + MC_UNSET_RAW_MEM; + } + } - /* 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; + cursor = 0; + + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + + res = MC_automaton_evaluate_label(transition_succ->label); + + if(res == 2){ // true transition in automaton + MC_SET_RAW_MEM; + next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state)); + xbt_dynar_push(successors, &next_pair); + MC_UNSET_RAW_MEM; + } } + + cursor = 0; + + xbt_dynar_foreach(successors, cursor, pair_succ){ + + if(search_cycle == 1){ + + if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ + + if(reached(pair_succ->automaton_state)){ + + XBT_INFO("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness) + 1); + + 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_pairs(mc_stats_pair); + xbt_abort(); + + }else{ + + XBT_INFO("Next pair (depth = %d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id); + + XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); + + } + + }else{ + + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); + + } - }else{ - XBT_DEBUG("There are no more processes to interleave."); + + }else{ - /* Trash the current state, no longer needed */ - MC_SET_RAW_MEM; - xbt_fifo_shift(mc_snapshot_stack); - MC_UNSET_RAW_MEM; + if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ - 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); - } + set_pair_reached(pair_succ->automaton_state); + + search_cycle = 1; - 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); - } + XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); - break; } + + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); + } - 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; - } - } + /* Restore system before checking others successors */ + if(cursor != xbt_dynar_length(successors) - 1) + MC_replay_liveness(mc_stack_liveness, 1); - MC_UNSET_RAW_MEM; + } + + } + + }else{ + + XBT_WARN("/!\\ Max depth reached ! /!\\ "); + if(current_pair->requests > 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. /!\\ "); + 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 (depth = %d) shifted in stack, maximum depth reached", xbt_fifo_size(mc_stack_liveness) ); + }else{ + XBT_DEBUG("Pair (depth = %d) shifted in stack", xbt_fifo_size(mc_stack_liveness) ); + } + + + MC_SET_RAW_MEM; + remove_pair = xbt_fifo_shift(mc_stack_liveness); + xbt_fifo_remove(mc_stack_liveness, remove_pair); + remove_pair = NULL; + if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){ + remove_pair_reached = xbt_dynar_pop_as(reached_pairs, mc_pair_reached_t); + pair_reached_free(remove_pair_reached); + remove_pair_reached = NULL; } MC_UNSET_RAW_MEM; - return; + + /*if(initial_state_liveness->raw_mem_set) + MC_SET_RAW_MEM;*/ + }