X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ca2459a5a9672bb1764ee4a95e59c01c82dcea78..87bc879019fc94e7ff1bc1ada77ecf85b0b588af:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index 2ea1786d8e..8067a737c0 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -1,449 +1,370 @@ -#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 reached_pairs; -extern mc_snapshot_t initial_snapshot; - -mc_pair_t new_pair(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st){ - mc_pair_t p = NULL; - p = xbt_new0(s_mc_pair_t, 1); - p->system_state = sn; - p->automaton_state = st; - p->graph_state = sg; - p->num = max_pair; - max_pair++; - mc_stats_pair->expanded_pairs++; - return p; - -} - -int reached(mc_pair_t pair){ - - if(xbt_dynar_is_empty(reached_pairs)){ - return 0; - }else{ - MC_SET_RAW_MEM; - char hash[41]; - xbt_sha((const char *)&pair, hash); - if(xbt_dynar_member(reached_pairs, hash)){ - MC_UNSET_RAW_MEM; - return 1; - }else{ - MC_UNSET_RAW_MEM; - return 0; - } - } - -} - -void set_pair_reached(mc_pair_t pair){ - - if(reached(pair) == 0){ - MC_SET_RAW_MEM; - char hash[41]; - xbt_sha((const char *)&pair, hash); - xbt_dynar_push(reached_pairs, &hash); - MC_UNSET_RAW_MEM; - } - -} - -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){ +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; - 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; + 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; - } - default : + + 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); + } } -} - - - -/******************************* DFS with visited state *******************************/ - -xbt_dynar_t visited_pairs; - -void set_pair_visited(mc_pair_t pair, int sc){ - - MC_SET_RAW_MEM; - mc_visited_pair_t p = NULL; - p = xbt_new0(s_mc_visited_pair_t, 1); - p->pair = pair; - p->search_cycle = sc; - char hash[41]; - xbt_sha((const char *)&p, hash); - xbt_dynar_push(visited_pairs, &hash); - MC_UNSET_RAW_MEM; + return 0; } -int visited(mc_pair_t pair, int sc){ +int reached(xbt_state_t st){ + + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); MC_SET_RAW_MEM; - mc_visited_pair_t p = NULL; - p = xbt_new0(s_mc_visited_pair_t, 1); - p->pair = pair; - p->search_cycle = sc; - char hash[41]; - xbt_sha((const char *)&p, hash); - if(xbt_dynar_member(visited_pairs, hash)){ - MC_UNSET_RAW_MEM; - return 1; - }else{ - MC_UNSET_RAW_MEM; - return 0; + 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; + + if(xbt_dynar_is_empty(reached_pairs)/* || !compare*/){ -void MC_vddfs_stateful_init(xbt_automaton_t a){ + MC_SET_RAW_MEM; + /* New pair reached */ + xbt_dynar_push(reached_pairs, &new_pair); + MC_UNSET_RAW_MEM; - XBT_DEBUG("**************************************************"); - XBT_DEBUG("Double-DFS stateful with visited state init"); - XBT_DEBUG("**************************************************"); - - mc_pair_t mc_initial_pair; - mc_state_t initial_graph_state; - smx_process_t process; - mc_snapshot_t init_snapshot; + if(raw_mem_set) + MC_SET_RAW_MEM; - MC_wait_for_requests(); - - MC_SET_RAW_MEM; + return 0; - init_snapshot = xbt_new0(s_mc_snapshot_t, 1); + }else{ - 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); + 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"); + } } - } - - 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; - xbt_dynar_foreach(a->states, cursor, state){ - if(state->type == -1){ + /* New pair reached */ + xbt_dynar_push(reached_pairs, &new_pair); - MC_SET_RAW_MEM; - mc_initial_pair = new_pair(init_snapshot, initial_graph_state, state); - xbt_fifo_unshift(mc_stack_liveness_stateful, mc_initial_pair); - MC_UNSET_RAW_MEM; + MC_UNSET_RAW_MEM; - if(cursor == 0){ - MC_vddfs_stateful(a, 0, 0); - }else{ - MC_restore_snapshot(init_snapshot); - MC_UNSET_RAW_MEM; - MC_vddfs_stateful(a, 0, 0); - } - }else{ - if(state->type == 2){ + if(raw_mem_set) + MC_SET_RAW_MEM; + + compare = 0; - MC_SET_RAW_MEM; - mc_initial_pair = new_pair(init_snapshot, initial_graph_state, state); - xbt_fifo_unshift(mc_stack_liveness_stateful, mc_initial_pair); - MC_UNSET_RAW_MEM; - - if(cursor == 0){ - MC_vddfs_stateful(a, 1, 0); - }else{ - MC_restore_snapshot(init_snapshot); - MC_UNSET_RAW_MEM; - MC_vddfs_stateful(a, 1, 0); - } - } - } - } + return 0; + + } } -void MC_vddfs_stateful(xbt_automaton_t a, int search_cycle, int restore){ +void set_pair_reached(xbt_state_t st){ - smx_process_t process = NULL; + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + + MC_SET_RAW_MEM; + 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(); - if(xbt_fifo_size(mc_stack_liveness_stateful) == 0) - return; + /* Get values of propositional symbols */ + unsigned int cursor = 0; + xbt_propositional_symbol_t ps = NULL; + int res; + int_f_void_t f; - if(restore == 1){ - MC_restore_snapshot(((mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateful)))->system_state); - MC_UNSET_RAW_MEM; + 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); } + xbt_dynar_push(reached_pairs, &pair); + + MC_UNSET_RAW_MEM; - /* Get current state */ - mc_pair_t current_pair = (mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateful)); + if(raw_mem_set) + MC_SET_RAW_MEM; + +} - if(restore == 1){ - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - MC_state_interleave_process(current_pair->graph_state, process); - } - } - } +int visited(xbt_state_t st){ - XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness_stateful), search_cycle); - XBT_DEBUG("Pair : graph=%p, automaton=%p(%s), %u interleave", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id,MC_state_interleave_size(current_pair->graph_state)); - + if(_sg_mc_visited == 0) + return 0; - mc_stats_pair->visited_pairs++; + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - int value; - mc_state_t next_graph_state = NULL; - smx_req_t req = NULL; - char *req_str; + MC_SET_RAW_MEM; + 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(); - xbt_transition_t transition_succ; - unsigned int cursor; + /* Get values of propositional symbols */ int res; - - xbt_dynar_t successors = NULL; - - mc_pair_t next_pair = NULL; - mc_snapshot_t next_snapshot = NULL; - mc_snapshot_t current_snapshot = NULL; - mc_pair_t pair_succ = NULL;; + 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); - - successors = xbt_dynar_new(sizeof(mc_pair_t), NULL); - - MC_UNSET_RAW_MEM; - - 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){ - MC_SET_RAW_MEM; - next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst); - 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(a, transition_succ->label); - - if(res == 2){ - MC_SET_RAW_MEM; - next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst); - xbt_dynar_push(successors, &next_pair); - MC_UNSET_RAW_MEM; + 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"); } } + if(xbt_dynar_length(visited_pairs) == _sg_mc_visited){ + xbt_dynar_remove_at(visited_pairs, 0, NULL); + } - - if(xbt_dynar_length(successors) == 0){ + /* New pair visited */ + xbt_dynar_push(visited_pairs, &new_pair); + + MC_UNSET_RAW_MEM; + if(raw_mem_set) 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; - - } + + return 0; + + } +} + +void MC_pair_delete(mc_pair_t pair){ + xbt_free(pair->graph_state->proc_status); + xbt_free(pair->graph_state); + xbt_free(pair); +} - //XBT_DEBUG("Successors length %lu", xbt_dynar_length(successors)); - cursor = 0; +int MC_automaton_evaluate_label(xbt_exp_label_t l){ - xbt_dynar_foreach(successors, cursor, pair_succ){ - - XBT_DEBUG("Search reached pair %p : graph=%p, automaton=%p", pair_succ, pair_succ->graph_state, pair_succ->automaton_state); - char hash[41]; - XBT_DEBUG("Const char pair %s", (const char *)&pair_succ); - xbt_sha((const char *)&pair_succ, hash); - XBT_DEBUG("Hash pair_succ %s", hash); - - if((search_cycle == 1) && (reached(pair_succ) == 1)){ - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("| ACCEPTANCE CYCLE |"); - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("Counter-example that violates formula :"); - MC_show_stack_liveness_stateful(mc_stack_liveness_stateful); - MC_dump_stack_liveness_stateful(mc_stack_liveness_stateful); - MC_print_statistics_pairs(mc_stats_pair); - exit(0); + switch(l->type){ + case 0 : { + 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); + } + case 1 : { + 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); + } + case 2 : { + int res = MC_automaton_evaluate_label(l->u.exp_not); + return (!res); + } + case 3 : { + unsigned int cursor = 0; + xbt_propositional_symbol_t p = NULL; + int_f_void_t f; + xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, p){ + if(strcmp(p->pred, l->u.predicat) == 0){ + f = (int_f_void_t)p->function; + return (*f)(); } + } + return -1; + } + case 4 : { + return 2; + } + default : + return -1; + } +} - XBT_DEBUG("Search visited pair %p : graph %p, automaton %p", pair_succ, pair_succ->graph_state, pair_succ->automaton_state); - - if(visited(pair_succ, search_cycle) == 0){ - - //mc_stats_pair->executed_transitions++; - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ); - set_pair_visited(pair_succ, search_cycle); - MC_UNSET_RAW_MEM; - - MC_vddfs_stateful(a, search_cycle, 0); - - //XBT_DEBUG("Pair (graph=%p, automaton=%p) expanded", pair_succ->graph_state, pair_succ->automaton_state); - - if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ - - set_pair_reached(pair_succ); - XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ); - MC_UNSET_RAW_MEM; - - MC_vddfs_stateful(a, 1, 1); - - //MC_SET_RAW_MEM; - xbt_dynar_pop(reached_pairs, NULL); - //MC_UNSET_RAW_MEM; - - } - - }else{ - - XBT_DEBUG("Pair already visited !"); - } - } +/********************* Double-DFS stateless *******************/ - - if(MC_state_interleave_size(current_pair->graph_state) > 0){ - MC_restore_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; - - } +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); } +} - - MC_SET_RAW_MEM; - xbt_fifo_shift(mc_stack_liveness_stateful); - XBT_DEBUG("Pair (graph=%p, automaton =%p) shifted in stack", current_pair->graph_state, current_pair->automaton_state); - MC_UNSET_RAW_MEM; +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; +} +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); + } +} -/********************* Double-DFS stateful without visited state *******************/ +void pair_reached_free_voidp(void *p){ + pair_reached_free((mc_pair_reached_t) * (void **) p); +} +void MC_ddfs_init(void){ -void MC_ddfs_stateful_init(xbt_automaton_t a){ + initial_state_liveness->raw_mem_set = (mmalloc_get_current_heap() == raw_heap); XBT_DEBUG("**************************************************"); - XBT_DEBUG("Double-DFS stateful without visited state init"); + XBT_DEBUG("Double-DFS init"); XBT_DEBUG("**************************************************"); - - mc_pair_t mc_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 init_snapshot; + MC_wait_for_requests(); 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)){ @@ -451,564 +372,426 @@ void MC_ddfs_stateful_init(xbt_automaton_t a){ } } - reached_pairs = xbt_dynar_new(sizeof(char *), 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(init_snapshot); + /* Save the initial state */ + initial_state_liveness->snapshot = MC_take_snapshot(); MC_UNSET_RAW_MEM; - + unsigned int cursor = 0; - xbt_state_t state = NULL; + xbt_state_t state; - xbt_dynar_foreach(a->states, cursor, state){ + xbt_dynar_foreach(_mc_property_automaton->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_stack_liveness_stateful, mc_initial_pair); + 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_ddfs_stateful(a, 0, 0); - }else{ - MC_restore_snapshot(init_snapshot); - MC_UNSET_RAW_MEM; - MC_ddfs_stateful(a, 0, 0); + + if(cursor != 0){ + MC_restore_snapshot(initial_state_liveness->snapshot); + MC_UNSET_RAW_MEM; } + + MC_ddfs(0); + }else{ - if(state->type == 2){ - - MC_SET_RAW_MEM; - mc_initial_pair = new_pair(init_snapshot, initial_graph_state, state); - xbt_fifo_unshift(mc_stack_liveness_stateful, mc_initial_pair); - MC_UNSET_RAW_MEM; - - if(cursor == 0){ - MC_ddfs_stateful(a, 1, 0); - }else{ - MC_restore_snapshot(init_snapshot); - MC_UNSET_RAW_MEM; - MC_ddfs_stateful(a, 1, 0); - } - } + 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; + + set_pair_reached(state); + + if(cursor != 0){ + MC_restore_snapshot(initial_state_liveness->snapshot); + MC_UNSET_RAW_MEM; + } + + MC_ddfs(1); + + } } - } + } + + if(initial_state_liveness->raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + + } -void MC_ddfs_stateful(xbt_automaton_t a, int search_cycle, int restore){ +void MC_ddfs(int search_cycle){ - smx_process_t process = NULL; + //initial_state_liveness->raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + smx_process_t process; + mc_pair_stateless_t current_pair = NULL; - if(xbt_fifo_size(mc_stack_liveness_stateful) == 0) + if(xbt_fifo_size(mc_stack_liveness) == 0) return; - if(restore == 1){ - MC_restore_snapshot(((mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateful)))->system_state); - MC_UNSET_RAW_MEM; - } - /* Get current state */ - mc_pair_t current_pair = (mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateful)); + /* Get current pair */ + current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness)); - if(restore==1){ - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - MC_state_interleave_process(current_pair->graph_state, process); - } - } - } - - XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness_stateful), search_cycle); - XBT_DEBUG("Pair : graph=%p, automaton=%p(%s), %u interleave", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id,MC_state_interleave_size(current_pair->graph_state)); + /* 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; + smx_simcall_t req = NULL; char *req_str; - mc_pair_t pair_succ; xbt_transition_t transition_succ; - unsigned int cursor; + unsigned int cursor = 0; int res; - xbt_dynar_t successors; - - mc_pair_t next_pair; - mc_snapshot_t next_snapshot; - mc_snapshot_t current_snapshot; + mc_pair_stateless_t next_pair = NULL; + mc_pair_stateless_t pair_succ; - //sleep(1); + mc_pair_stateless_t remove_pair; + mc_pair_reached_t remove_pair_reached; - - while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ - - MC_SET_RAW_MEM; - current_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; - - - /* Debug information */ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - req_str = MC_request_to_string(req, value); - XBT_DEBUG("%u Execute: %s", search_cycle, req_str); - xbt_free(req_str); - } + if(xbt_fifo_size(mc_stack_liveness) < _sg_mc_max_depth){ - MC_state_set_executed_request(current_pair->graph_state, req, value); + if(current_pair->requests > 0){ - /* Answer the request */ - SIMIX_request_pre(req, value); + 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); - /* Wait for requests (schedules processes) */ - MC_wait_for_requests(); + MC_state_set_executed_request(current_pair->graph_state, req, value); + /* Answer the request */ + SIMIX_simcall_pre(req, value); - /* Create the new expanded graph_state */ - MC_SET_RAW_MEM; + /* Wait for requests (schedules processes) */ + MC_wait_for_requests(); - 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); - } - } + MC_SET_RAW_MEM; - next_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(next_snapshot); - - successors = xbt_dynar_new(sizeof(mc_pair_t), NULL); + /* Create the new expanded graph_state */ + next_graph_state = MC_state_pair_new(); - MC_UNSET_RAW_MEM; + /* 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_dynar_reset(successors); - - cursor = 0; - xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ + MC_state_interleave_process(next_graph_state, process); + } + } - res = MC_automaton_evaluate_label(a, transition_succ->label); + xbt_dynar_reset(successors); - MC_SET_RAW_MEM; - - if(res == 1){ // enabled transition in automaton - next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst); - xbt_dynar_push(successors, &next_pair); - } + MC_UNSET_RAW_MEM; - MC_UNSET_RAW_MEM; - } - cursor = 0; - xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + cursor= 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - res = MC_automaton_evaluate_label(a, transition_succ->label); + res = MC_automaton_evaluate_label(transition_succ->label); - MC_SET_RAW_MEM; - - if(res == 2){ // transition always enabled in automaton - next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst); - xbt_dynar_push(successors, &next_pair); - } + 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; + } - MC_UNSET_RAW_MEM; - } + } + cursor = 0; - 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; - - } - - //XBT_DEBUG("Successors in automaton %lu", xbt_dynar_length(successors)); - - cursor = 0; - xbt_dynar_foreach(successors, cursor, pair_succ){ - - //XBT_DEBUG("Search visited pair : graph=%p, automaton=%p", pair_succ->graph_state, pair_succ->automaton_state); - - if((search_cycle == 1) && (reached(pair_succ) == 1)){ - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("| ACCEPTANCE CYCLE |"); - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("Counter-example that violates formula :"); - MC_show_stack_liveness_stateful(mc_stack_liveness_stateful); - MC_dump_stack_liveness_stateful(mc_stack_liveness_stateful); - MC_print_statistics_pairs(mc_stats_pair); - exit(0); - } - - //mc_stats_pair->executed_transitions++; - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs_stateful(a, search_cycle, 0); - - - if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ - - set_pair_reached(pair_succ); - XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness_stateful, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs_stateful(a, 1, 1); - - //MC_SET_RAW_MEM; - xbt_dynar_pop(reached_pairs, NULL); - //MC_UNSET_RAW_MEM; - } - - } - - if(MC_state_interleave_size(current_pair->graph_state) > 0){ - MC_restore_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; - } + 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; - MC_SET_RAW_MEM; - xbt_fifo_shift(mc_stack_liveness_stateful); - XBT_DEBUG("Pair (graph=%p, automaton =%p) shifted in stack", current_pair->graph_state, current_pair->automaton_state); - MC_UNSET_RAW_MEM; + 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(); -/********************* Double-DFS stateless *******************/ + }else{ -void MC_pair_stateless_delete(mc_pair_stateless_t pair){ - xbt_free(pair->graph_state->proc_status); - xbt_free(pair->graph_state); - //xbt_free(pair->automaton_state); -> FIXME : à implémenter - xbt_free(pair); -} - -mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st){ - mc_pair_stateless_t p = NULL; - p = xbt_new0(s_mc_pair_stateless_t, 1); - p->automaton_state = st; - p->graph_state = sg; - mc_stats_pair->expanded_pairs++; - return p; -} + if(visited(pair_succ->automaton_state)){ + XBT_DEBUG("Next pair already visited !"); + break; + + }else{ -int reached_stateless(mc_pair_stateless_t pair){ + XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id); - if(xbt_dynar_is_empty(reached_pairs)){ - return 0; - }else{ - MC_SET_RAW_MEM; - - char hash[41] =""; - xbt_sha((const char*)&pair, hash); - XBT_DEBUG("Hash : %s", hash); - if(xbt_dynar_member(reached_pairs, hash)){ - XBT_DEBUG("Pair already reached"); - MC_UNSET_RAW_MEM; - return 1; - }else{ - MC_UNSET_RAW_MEM; - return 0; - } - } -} + XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); -void set_pair_stateless_reached(mc_pair_stateless_t pair){ + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); + + } - //MC_SET_RAW_MEM; - char hash[41] = ""; - xbt_sha((const char*)&pair, hash); - XBT_DEBUG("Hash to pushed %s", hash); - if(strcmp(hash, "da39a3ee5e6b4b0d3255bfef95601890afd80709") == 0){ - XBT_DEBUG("Error in hash, pair empty !"); - sleep(4); - } - - xbt_dynar_push(reached_pairs, &hash); - //MC_UNSET_RAW_MEM; + } -} + }else{ + if(visited(pair_succ->automaton_state)){ -void MC_ddfs_stateless_init(xbt_automaton_t a){ + XBT_DEBUG("Next pair already visited !"); + break; + + }else{ - XBT_DEBUG("**************************************************"); - XBT_DEBUG("Double-DFS stateless init"); - XBT_DEBUG("**************************************************"); - - mc_pair_stateless_t mc_initial_pair = NULL; - mc_state_t initial_graph_state = NULL; - smx_process_t process; - - MC_wait_for_requests(); + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); + } + + } - MC_SET_RAW_MEM; - initial_graph_state = MC_state_pair_new(); - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - MC_state_interleave_process(initial_graph_state, process); - } - } + }else{ - reached_pairs = xbt_dynar_new(sizeof(char *), NULL); - MC_UNSET_RAW_MEM; + if(visited(pair_succ->automaton_state)){ - unsigned int cursor = 0; - xbt_state_t state; + XBT_DEBUG("Next pair already visited !"); + break; + + }else{ + + if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ - xbt_dynar_foreach(a->states, cursor, state){ - if(state->type == -1){ + XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id); - MC_SET_RAW_MEM; - mc_initial_pair = new_pair_stateless(initial_graph_state, state); - xbt_fifo_unshift(mc_stack_liveness_stateless, mc_initial_pair); - - initial_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(initial_snapshot); - - MC_UNSET_RAW_MEM; - - if(cursor == 0){ - MC_ddfs_stateless(a, 0, 0); - }else{ - MC_restore_snapshot(initial_snapshot); - MC_UNSET_RAW_MEM; - MC_ddfs_stateless(a, 0, 0); - } - }else{ - if(state->type == 2){ - - MC_SET_RAW_MEM; - mc_initial_pair = new_pair_stateless(initial_graph_state, state); - xbt_fifo_unshift(mc_stack_liveness_stateless, mc_initial_pair); - - initial_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(initial_snapshot); - - MC_UNSET_RAW_MEM; - - if(cursor == 0){ - MC_ddfs_stateless(a, 1, 0); - }else{ - MC_restore_snapshot(initial_snapshot); - MC_UNSET_RAW_MEM; - MC_ddfs_stateless(a, 1, 0); - } - } - } - } + set_pair_reached(pair_succ->automaton_state); -} + search_cycle = 1; + XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); -void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay){ + } - smx_process_t process; - mc_pair_stateless_t current_pair = NULL; + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); - if(xbt_fifo_size(mc_stack_liveness_stateless) == 0) - return; + } + + } - if(replay == 1){ - MC_replay_liveness(mc_stack_liveness_stateless); - current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateless)); - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - MC_state_interleave_process(current_pair->graph_state, process); + /* 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); + } } - } - } - /* Get current state */ - current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateless)); - XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness_stateless), search_cycle); - XBT_DEBUG("Pair : graph=%p, automaton=%p(%s), %u interleave", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id,MC_state_interleave_size(current_pair->graph_state)); - - //sleep(1); - - mc_stats_pair->visited_pairs++; - - /*if(MC_state_interleave_size(current_pair->graph_state) == 0 && (current_pair->automaton_state->type == 1)){ - xbt_fifo_shift(mc_stack_liveness_stateless); - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("| ACCEPTANCE CYCLE |"); - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("Counter-example that violates formula :"); - MC_show_stack_liveness_stateless(mc_stack_liveness_stateless); - MC_dump_stack_liveness_stateless(mc_stack_liveness_stateless); - MC_print_statistics_pairs(mc_stats_pair); - exit(0); - }*/ - - int value; - mc_state_t next_graph_state = NULL; - smx_req_t req = NULL; - char *req_str; - - xbt_transition_t transition_succ; - unsigned int cursor = 0; - int res; - - mc_pair_stateless_t next_pair = NULL; - mc_pair_stateless_t pair_succ; - - xbt_dynar_t successors = NULL; - - MC_SET_RAW_MEM; - successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL); - MC_UNSET_RAW_MEM; - - while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ - - //XBT_DEBUG("Interleave size %u", MC_state_interleave_size(current_pair->graph_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); - } - - //sleep(1); + }else{ + + XBT_DEBUG("No more request to execute in this state, search evolution in Büchi Automaton."); - MC_state_set_executed_request(current_pair->graph_state, req, value); - - /* Answer the request */ - SIMIX_request_pre(req, value); + MC_SET_RAW_MEM; - /* Wait for requests (schedules processes) */ - MC_wait_for_requests(); + /* Create the new expanded graph_state */ + next_graph_state = MC_state_pair_new(); + xbt_dynar_reset(successors); - MC_SET_RAW_MEM; - /* Create the new expanded graph_state */ + MC_UNSET_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); - } - } - - xbt_dynar_reset(successors); + cursor= 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - 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); - res = MC_automaton_evaluate_label(a, 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; + } - if(res == 1){ // enabled transition in automaton - MC_SET_RAW_MEM; - next_pair = new_pair_stateless(next_graph_state, transition_succ->dst); - xbt_dynar_push(successors, &next_pair); - MC_UNSET_RAW_MEM; } - } - - cursor = 0; + cursor = 0; - xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - res = MC_automaton_evaluate_label(a, transition_succ->label); - - if(res == 2){ // enabled transition in automaton - MC_SET_RAW_MEM; - next_pair = new_pair_stateless(next_graph_state, transition_succ->dst); - xbt_dynar_push(successors, &next_pair); - MC_UNSET_RAW_MEM; - } + 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; + } - } + } - - if(xbt_dynar_length(successors) == 0){ - MC_SET_RAW_MEM; - next_pair = new_pair_stateless(next_graph_state, current_pair->automaton_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); + + } + - cursor = 0; + }else{ + + if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ - //XBT_DEBUG("Successors length %lu", xbt_dynar_length(successors)); + set_pair_reached(pair_succ->automaton_state); + + search_cycle = 1; - xbt_dynar_foreach(successors, cursor, pair_succ){ - - if((search_cycle == 1) && (reached_stateless(pair_succ) == 1)){ - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("| ACCEPTANCE CYCLE |"); - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("Counter-example that violates formula :"); - MC_show_stack_liveness_stateless(mc_stack_liveness_stateless); - MC_dump_stack_liveness_stateless(mc_stack_liveness_stateless); - MC_print_statistics_pairs(mc_stats_pair); - exit(0); - } - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ); - MC_UNSET_RAW_MEM; + XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); - MC_ddfs_stateless(a, search_cycle, 0); + } - + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); + + } - //XBT_DEBUG("Stack size %u", xbt_fifo_size(mc_stack_liveness_stateless)); + /* Restore system before checking others successors */ + if(cursor != xbt_dynar_length(successors) - 1) + MC_replay_liveness(mc_stack_liveness, 1); - if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ + } - XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); - set_pair_stateless_reached(pair_succ); - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs_stateless(a, 1, 1); - - MC_SET_RAW_MEM; - xbt_dynar_pop(reached_pairs, NULL); - 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(MC_state_interleave_size(current_pair->graph_state) > 0){ - XBT_DEBUG("Backtracking to depth %u", xbt_fifo_size(mc_stack_liveness_stateless)); - MC_replay_liveness(mc_stack_liveness_stateless); - } - + 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; - xbt_fifo_shift(mc_stack_liveness_stateless); - XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle); + 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; -} + /*if(initial_state_liveness->raw_mem_set) + MC_SET_RAW_MEM;*/ +}