X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8ef9510aee1b2c8a7da1cdd3a2f062b4ad3269a..d63e6e420e35b2df639d3a774abb79d004608627:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index c0aa52a2ce..f927f2fb56 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -1,1126 +1,552 @@ -#include "private.h" -#include "unistd.h" +/* Copyright (c) 2011-2014. The SimGrid Team. + * All rights reserved. */ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, - "Logging specific to algorithms for liveness properties verification"); - -xbt_dynar_t reached_pairs; -xbt_dynar_t reached_pairs_hash; -xbt_dynar_t visited_pairs; -xbt_dynar_t visited_pairs_hash; -xbt_dynar_t successors; +/* 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 +#include -/* fast implementation of djb2 algorithm */ -unsigned int hash_region(char *str, int str_len){ +#include +#include - int c; - register unsigned int hash = 5381; +#include "mc_request.h" +#include "mc_liveness.h" +#include "mc_private.h" +#include "mc_record.h" - while (str_len--) { - c = *str++; - hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ - } +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, + "Logging specific to algorithms for liveness properties verification"); - return hash; +/********* Global variables *********/ -} +xbt_dynar_t acceptance_pairs; +xbt_dynar_t successors; +xbt_parmap_t parmap; -int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ +/********* Static functions *********/ - - if(s1->num_reg != s2->num_reg){ - XBT_DEBUG("Different num_reg (s1 = %d, s2 = %d)", s1->num_reg, s2->num_reg); - return 1; +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); + // FIXME, cross-process support + 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); } - int i; - int errors = 0; + return values; +} - for(i=0 ; i< s1->num_reg ; i++){ - if(s1->regions[i]->type != s2->regions[i]->type){ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - XBT_DEBUG("Different type of region"); - errors++; - }else{ - return 1; - } - } - - switch(s1->regions[i]->type){ - case 0: - if(s1->regions[i]->size != s2->regions[i]->size){ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - XBT_DEBUG("Different size of heap (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size); - errors++; - }else{ - return 1; - } - } - if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - XBT_DEBUG("Different start addr of heap (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); - errors++; - }else{ - return 1; - } +static mc_visited_pair_t is_reached_acceptance_pair(int pair_num, + xbt_automaton_state_t + automaton_state, + xbt_dynar_t + atomic_propositions) +{ + + int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); + + MC_SET_MC_HEAP; + + mc_visited_pair_t pair = NULL; + pair = MC_visited_pair_new(pair_num, automaton_state, atomic_propositions); + pair->acceptance_pair = 1; + + if (xbt_dynar_is_empty(acceptance_pairs)) { + + xbt_dynar_push(acceptance_pairs, &pair); + + } else { + + int min = -1, max = -1, index; + //int res; + mc_visited_pair_t pair_test; + int cursor; + + 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 + + // Parallell implementation + /*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_SET_STD_HEAP; + return ((mc_pair_t)xbt_dynar_get_as(acceptance_pairs, (min+res)-1, mc_pair_t))->num; + } */ + + cursor = min; + while (cursor <= max) { + pair_test = + (mc_visited_pair_t) xbt_dynar_get_as(acceptance_pairs, cursor, + mc_visited_pair_t); + if (xbt_automaton_state_compare + (pair_test->automaton_state, pair->automaton_state) == 0) { + if (xbt_automaton_propositional_symbols_compare_value + (pair_test->atomic_propositions, + pair->atomic_propositions) == 0) { + if (snapshot_compare(pair_test, pair) == 0) { + XBT_INFO("Pair %d already reached (equal to pair %d) !", + pair->num, pair_test->num); + + xbt_fifo_shift(mc_stack); + if (dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", + initial_global_state->prev_pair, pair_test->num, + initial_global_state->prev_req); + + if (!raw_mem_set) + MC_SET_STD_HEAP; + + return NULL; + } + } + } + cursor++; } - if(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data)){ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - XBT_DEBUG("Different heap (mmalloc_compare)"); - errors++; - }else{ - return 1; - } + xbt_dynar_insert_at(acceptance_pairs, min, &pair); + } else { + pair_test = + (mc_visited_pair_t) xbt_dynar_get_as(acceptance_pairs, index, + mc_visited_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); } - break; - case 1 : - if(s1->regions[i]->size != s2->regions[i]->size){ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - XBT_DEBUG("Different size of libsimgrid (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size); - errors++; - }else{ - return 1; - } - } - if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - XBT_DEBUG("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); - errors++; - }else{ - return 1; - } - } - if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - XBT_DEBUG("Different memcmp for data in libsimgrid"); - errors++; - }else{ - return 1; - } - } - break; - /*case 2: - if(s1->regions[i]->size != s2->regions[i]->size){ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - XBT_DEBUG("Different size of program (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size); - errors++; - }else{ - return 1; - } - } - if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - XBT_DEBUG("Different start addr of program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); - errors++; - }else{ - return 1; - } - } - if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - XBT_DEBUG("Different memcmp for data in program"); - errors++; - }else{ - return 1; - } - } - break;*/ - case 3: - if(s1->regions[i]->size != s2->regions[i]->size){ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - XBT_DEBUG("Different size of stack (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size); - errors++; - }else{ - return 1; - } - } - if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - XBT_DEBUG("Different start addr of stack (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); - errors++; - }else{ - return 1; - } - } - if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - XBT_DEBUG("Different memcmp for data in stack"); - errors++; - }else{ - return 1; - } - } - break; - default: - break; } - } - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - return (errors>0); - }else{ - return 0; } - -} - -int reached(xbt_state_t st){ + if (!raw_mem_set) + MC_SET_STD_HEAP; - if(xbt_dynar_is_empty(reached_pairs)){ + return pair; - return 0; +} - }else{ +static void remove_acceptance_pair(int pair_num) +{ - MC_SET_RAW_MEM; + int raw_mem_set = (mmalloc_get_current_heap() == mc_heap); - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn); - - xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL); - int res; - int (*f)(); + MC_SET_MC_HEAP; - /* Get values of propositional symbols */ - unsigned int cursor = 0; - xbt_propositional_symbol_t ps = NULL; - xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ - f = ps->function; - res = (*f)(); - xbt_dynar_push_as(prop_ato, int, res); - } + unsigned int cursor = 0; + mc_visited_pair_t pair_test = NULL; - cursor = 0; - mc_pair_reached_t pair_test = NULL; - - - xbt_dynar_foreach(reached_pairs, cursor, pair_test){ - if(automaton_state_compare(pair_test->automaton_state, st) == 0){ - if(propositional_symbols_compare_value(pair_test->prop_ato, prop_ato) == 0){ - XBT_DEBUG("Pair reached %d", cursor+1); - if(snapshot_compare(pair_test->system_state, sn) == 0){ - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - return 1; - }else{ - XBT_DEBUG("Different snapshot"); - } - }else{ - XBT_DEBUG("Different values of propositional symbols"); - } - }else{ - XBT_DEBUG("Different automaton state"); - } + xbt_dynar_foreach(acceptance_pairs, cursor, pair_test) { + if (pair_test->num == pair_num) { + break; } - - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - return 0; - } -} - -void set_pair_reached(xbt_state_t st){ - - MC_SET_RAW_MEM; - - mc_pair_reached_t pair = NULL; - pair = xbt_new0(s_mc_pair_reached_t, 1); - pair->automaton_state = st; - pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); - pair->system_state = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(pair->system_state); + xbt_dynar_remove_at(acceptance_pairs, cursor, &pair_test); - /* Get values of propositional symbols */ - unsigned int cursor = 0; - xbt_propositional_symbol_t ps = NULL; - int res; - int (*f)(); + pair_test->acceptance_removed = 1; - xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ - f = ps->function; - res = (*f)(); - xbt_dynar_push_as(pair->prop_ato, int, res); + if (_sg_mc_visited == 0) { + MC_visited_pair_delete(pair_test); + } else if (pair_test->visited_removed == 1) { + MC_visited_pair_delete(pair_test); } - - xbt_dynar_push(reached_pairs, &pair); - MC_UNSET_RAW_MEM; - + if (!raw_mem_set) + MC_SET_STD_HEAP; } -int reached_hash(xbt_state_t st){ +static int MC_automaton_evaluate_label(xbt_automaton_exp_label_t l, + xbt_dynar_t atomic_propositions_values) +{ - if(xbt_dynar_is_empty(reached_pairs_hash)){ - - return 0; - - }else{ - - MC_SET_RAW_MEM; - - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn); - - int j; - unsigned int hash_regions[sn->num_reg]; - for(j=0; jnum_reg; j++){ - hash_regions[j] = hash_region(sn->regions[j]->data, sn->regions[j]->size); + 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); } - - - /* Get values of propositional symbols */ - xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL); - unsigned int cursor = 0; - xbt_propositional_symbol_t ps = NULL; - int res; - int (*f)(); - - xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ - f = ps->function; - res = (*f)(); - xbt_dynar_push_as(prop_ato, int, res); - } - - mc_pair_reached_hash_t pair_test = NULL; - - int region_diff = 0; - - cursor = 0; - - xbt_dynar_foreach(reached_pairs_hash, cursor, pair_test){ - - if(automaton_state_compare(pair_test->automaton_state, st) == 0){ - if(propositional_symbols_compare_value(pair_test->prop_ato, prop_ato) == 0){ - for(j=0 ; j< sn->num_reg ; j++){ - if(hash_regions[j] != pair_test->hash_regions[j]){ - region_diff++; - } - } - if(region_diff == 0){ - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - return 1; - }else{ - XBT_DEBUG("Different snapshot"); - } - }else{ - XBT_DEBUG("Different values of propositional symbols"); - } - }else{ - XBT_DEBUG("Different automaton state"); - } - - region_diff = 0; + 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); } - - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - return 0; - - } -} - -void set_pair_reached_hash(xbt_state_t st){ - - MC_SET_RAW_MEM; - - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn); - - mc_pair_reached_hash_t pair = NULL; - pair = xbt_new0(s_mc_pair_reached_hash_t, 1); - pair->automaton_state = st; - pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); - pair->hash_regions = malloc(sizeof(unsigned int) * sn->num_reg); - - int i; - - for(i=0 ; i< sn->num_reg ; i++){ - pair->hash_regions[i] = hash_region(sn->regions[i]->data, sn->regions[i]->size); - } - - /* Get values of propositional symbols */ - unsigned int cursor = 0; - xbt_propositional_symbol_t ps = NULL; - int res; - int (*f)(); - - xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ - f = ps->function; - res = (*f)(); - xbt_dynar_push_as(pair->prop_ato, int, res); - } - - xbt_dynar_push(reached_pairs_hash, &pair); - - MC_free_snapshot(sn); - - MC_UNSET_RAW_MEM; - -} - - -int visited(xbt_state_t st, int sc){ - - - if(xbt_dynar_is_empty(visited_pairs)){ - - return 0; - - }else{ - - MC_SET_RAW_MEM; - - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn); - - xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL); - - /* Get values of propositional symbols */ - unsigned int cursor = 0; - xbt_propositional_symbol_t ps = NULL; - int res; - int (*f)(); - - xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ - f = ps->function; - res = (*f)(); - xbt_dynar_push_as(prop_ato, int, res); + case 2:{ + int res = + MC_automaton_evaluate_label(l->u.exp_not, atomic_propositions_values); + return (!res); } - - cursor = 0; - mc_pair_visited_t pair_test = NULL; - - xbt_dynar_foreach(visited_pairs, cursor, pair_test){ - if(pair_test->search_cycle == sc) { - if(automaton_state_compare(pair_test->automaton_state, st) == 0){ - if(propositional_symbols_compare_value(pair_test->prop_ato, prop_ato) == 0){ - if(snapshot_compare(pair_test->system_state, sn) == 0){ - - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - - return 1; - - }else{ - XBT_DEBUG("Different snapshot"); - } - }else{ - XBT_DEBUG("Different values of propositional symbols"); - } - }else{ - XBT_DEBUG("Different automaton state"); - } - }else{ - XBT_DEBUG("Different value of search_cycle"); + 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; } - - - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - return 0; - + case 4:{ + return 2; + } + default: + return -1; } } +void MC_pre_modelcheck_liveness(void) +{ -int visited_hash(xbt_state_t st, int sc){ - - - if(xbt_dynar_is_empty(visited_pairs_hash)){ + initial_global_state->raw_mem_set = (mmalloc_get_current_heap() == mc_heap); - return 0; + mc_pair_t initial_pair = NULL; + smx_process_t process; - }else{ + MC_wait_for_requests(); - MC_SET_RAW_MEM; + MC_SET_MC_HEAP; - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn); + acceptance_pairs = xbt_dynar_new(sizeof(mc_visited_pair_t), NULL); + visited_pairs = xbt_dynar_new(sizeof(mc_visited_pair_t), NULL); + successors = xbt_dynar_new(sizeof(mc_pair_t), NULL); - int j; - unsigned int hash_regions[sn->num_reg]; - for(j=0; jnum_reg; j++){ - hash_regions[j] = hash_region(sn->regions[j]->data, sn->regions[j]->size); - } + initial_global_state->snapshot = MC_take_snapshot(0); + initial_global_state->prev_pair = 0; - - /* Get values of propositional symbols */ - xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL); - unsigned int cursor = 0; - xbt_propositional_symbol_t ps = NULL; - int res; - int (*f)(); - - xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ - f = ps->function; - res = (*f)(); - xbt_dynar_push_as(prop_ato, int, res); - } + MC_SET_STD_HEAP; - mc_pair_visited_hash_t pair_test = NULL; - - int region_diff = 0; - cursor = 0; - - xbt_dynar_foreach(visited_pairs_hash, cursor, pair_test){ - - if(pair_test->search_cycle == sc) { - if(automaton_state_compare(pair_test->automaton_state, st) == 0){ - if(propositional_symbols_compare_value(pair_test->prop_ato, prop_ato) == 0){ - for(j=0 ; j< sn->num_reg ; j++){ - if(hash_regions[j] != pair_test->hash_regions[j]){ - region_diff++; - } - } - if(region_diff == 0){ - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - return 1; - }else{ - XBT_DEBUG("Different snapshot"); - } - }else{ - XBT_DEBUG("Different values of propositional symbols"); - } - }else{ - XBT_DEBUG("Different automaton state"); - } - }else{ - XBT_DEBUG("Different value of search_cycle"); - } - - region_diff = 0; - } - - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); - MC_UNSET_RAW_MEM; - return 0; - - } -} - -void set_pair_visited_hash(xbt_state_t st, int sc){ - - MC_SET_RAW_MEM; - - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn); - - mc_pair_visited_hash_t pair = NULL; - pair = xbt_new0(s_mc_pair_visited_hash_t, 1); - pair->automaton_state = st; - pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); - pair->search_cycle = sc; - pair->hash_regions = malloc(sizeof(unsigned int) * sn->num_reg); - - int i; - - for(i=0 ; i< sn->num_reg ; i++){ - pair->hash_regions[i] = hash_region(sn->regions[i]->data, sn->regions[i]->size); - } - - /* Get values of propositional symbols */ unsigned int cursor = 0; - xbt_propositional_symbol_t ps = NULL; - int res; - int (*f)(); - - xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ - f = ps->function; - res = (*f)(); - xbt_dynar_push_as(pair->prop_ato, int, res); - } - - xbt_dynar_push(visited_pairs_hash, &pair); - - MC_free_snapshot(sn); - - MC_UNSET_RAW_MEM; - -} + xbt_automaton_state_t automaton_state; -void set_pair_visited(xbt_state_t st, int sc){ + xbt_dynar_foreach(_mc_property_automaton->states, cursor, automaton_state) { + if (automaton_state->type == -1) { /* Initial automaton state */ - - MC_SET_RAW_MEM; - - mc_pair_visited_t pair = NULL; - pair = xbt_new0(s_mc_pair_visited_t, 1); - pair->automaton_state = st; - pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); - pair->search_cycle = sc; - pair->system_state = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(pair->system_state); + MC_SET_MC_HEAP; + 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 values of propositional symbols */ - unsigned int cursor = 0; - xbt_propositional_symbol_t ps = NULL; - int res; - int (*f)(); - - xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ - f = ps->function; - res = (*f)(); - xbt_dynar_push_as(pair->prop_ato, int, res); - } - - xbt_dynar_push(visited_pairs, &pair); - - 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); -} - - - -int MC_automaton_evaluate_label(xbt_exp_label_t l){ - - 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); - break; - } - 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); - break; - } - case 2 : { - 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; - int (*f)(); - xbt_dynar_foreach(automaton->propositional_symbols, cursor, p){ - if(strcmp(p->pred, l->u.predicat) == 0){ - f = p->function; - return (*f)(); + /* Get enabled processes and insert them 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); + } } - } - return -1; - break; - } - case 4 : { - return 2; - break; - } - default : - return -1; - } -} + initial_pair->requests = + MC_state_interleave_size(initial_pair->graph_state); + initial_pair->search_cycle = 0; + xbt_fifo_unshift(mc_stack, initial_pair); + + MC_SET_STD_HEAP; + MC_modelcheck_liveness(); - -/********************* Double-DFS stateless *******************/ - -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); -} - -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 MC_ddfs_init(void){ - - XBT_DEBUG("**************************************************"); - XBT_DEBUG("Double-DFS 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; - - 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 (cursor != 0) { + MC_restore_snapshot(initial_global_state->snapshot); + MC_SET_STD_HEAP; + } } } - reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL); - //reached_pairs_hash = xbt_dynar_new(sizeof(mc_pair_reached_hash_t), NULL); - //visited_pairs = xbt_dynar_new(sizeof(mc_pair_visited_t), NULL); - visited_pairs_hash = xbt_dynar_new(sizeof(mc_pair_visited_hash_t), NULL); - successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL); - - /* Save the initial state */ - initial_snapshot_liveness = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_to_restore_liveness(initial_snapshot_liveness); - - MC_UNSET_RAW_MEM; + if (initial_global_state->raw_mem_set) + MC_SET_MC_HEAP; + else + MC_SET_STD_HEAP; - unsigned int cursor = 0; - xbt_state_t state; - - xbt_dynar_foreach(automaton->states, cursor, state){ - if(state->type == -1){ - - 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_snapshot_liveness); - MC_UNSET_RAW_MEM; - } - - MC_ddfs(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; - - set_pair_reached(state); - //set_pair_reached_hash(state); - - if(cursor != 0){ - MC_restore_snapshot(initial_snapshot_liveness); - MC_UNSET_RAW_MEM; - } - - MC_ddfs(1); - - } - } - } } -void MC_ddfs(int search_cycle){ +void MC_modelcheck_liveness() +{ smx_process_t process; - mc_pair_stateless_t current_pair = NULL; + mc_pair_t current_pair = NULL; - if(xbt_fifo_size(mc_stack_liveness) == 0) + if (xbt_fifo_size(mc_stack) == 0) return; - /* Get current pair */ - current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness)); + current_pair = + (mc_pair_t) xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack)); /* Update current state in buchi automaton */ - automaton->current_state = current_pair->automaton_state; + _mc_property_automaton->current_state = current_pair->automaton_state; - - XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), 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)); - - mc_stats_pair->visited_pairs++; + XBT_DEBUG + ("********************* ( Depth = %d, search_cycle = %d, interleave size %d, pair_num %d)", + xbt_fifo_size(mc_stack), current_pair->search_cycle, + MC_state_interleave_size(current_pair->graph_state), current_pair->num); - sleep(1); + mc_stats->visited_pairs++; int value; - mc_state_t next_graph_state = NULL; - smx_req_t req = NULL; - char *req_str; + smx_simcall_t req = NULL; - xbt_transition_t transition_succ; + xbt_automaton_transition_t transition_succ; unsigned int cursor = 0; int res; + int visited_num; + + mc_pair_t next_pair = NULL; + xbt_dynar_t prop_values = NULL; + mc_visited_pair_t reached_pair = NULL; + int counter_example_depth = 0; + + if (xbt_fifo_size(mc_stack) < _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_pair = + is_reached_acceptance_pair(current_pair->num, + current_pair->automaton_state, + current_pair->atomic_propositions)) == + NULL) { + + counter_example_depth = xbt_fifo_size(mc_stack); + XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); + XBT_INFO("| ACCEPTANCE CYCLE |"); + XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); + XBT_INFO("Counter-example that violates formula :"); + MC_show_stack_liveness(mc_stack); + MC_dump_stack_liveness(mc_stack); + MC_print_statistics(mc_stats); + XBT_INFO("Counter-example depth : %d", counter_example_depth); + xbt_abort(); + + } + } + } - mc_pair_stateless_t next_pair = NULL; - mc_pair_stateless_t pair_succ; - - if(xbt_fifo_size(mc_stack_liveness) < MAX_DEPTH_LIVENESS){ - - //set_pair_visited(current_pair->automaton_state, search_cycle); - set_pair_visited_hash(current_pair->automaton_state, search_cycle); - - //XBT_DEBUG("Visited pairs : %lu", xbt_dynar_length(visited_pairs)); - XBT_DEBUG("Visited pairs : %lu", xbt_dynar_length(visited_pairs_hash)); - - if(current_pair->requests > 0){ - - while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ - - /* 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 ((visited_num = + is_visited_pair(reached_pair, current_pair->num, + current_pair->automaton_state, + current_pair->atomic_propositions)) != -1) { - MC_SET_RAW_MEM; + MC_SET_MC_HEAP; + if (dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", + initial_global_state->prev_pair, visited_num, + initial_global_state->prev_req); + MC_SET_STD_HEAP; - /* Create the new expanded graph_state */ - next_graph_state = MC_state_pair_new(); + } else { - /* 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); - } - } + while ((req = + MC_state_get_request(current_pair->graph_state, + &value)) != NULL) { - xbt_dynar_reset(successors); + MC_SET_MC_HEAP; + if (dot_output != NULL) { + if (initial_global_state->prev_pair != 0 + && initial_global_state->prev_pair != current_pair->num) { + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", + initial_global_state->prev_pair, current_pair->num, + initial_global_state->prev_req); + xbt_free(initial_global_state->prev_req); + } + initial_global_state->prev_pair = current_pair->num; + } + MC_SET_STD_HEAP; - MC_UNSET_RAW_MEM; + MC_LOG_REQUEST(mc_liveness, req, value); + MC_SET_MC_HEAP; + if (dot_output != NULL) { + initial_global_state->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_SET_STD_HEAP; - cursor= 0; - xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + MC_state_set_executed_request(current_pair->graph_state, req, value); + mc_stats->executed_transitions++; - res = MC_automaton_evaluate_label(transition_succ->label); + /* Answer the request */ + SIMIX_simcall_handle(req, value); - 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; - } + /* Wait for requests (schedules processes) */ + MC_wait_for_requests(); - } + MC_SET_MC_HEAP; + prop_values = get_atomic_propositions_values(); + MC_SET_STD_HEAP; - 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)){ - //if(reached_hash(pair_succ->automaton_state)){ - - XBT_DEBUG("Next pair (depth = %d, %d 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); - exit(0); - - }else{ - - XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); - - set_pair_reached(pair_succ->automaton_state); - //set_pair_reached_hash(pair_succ->automaton_state); - - XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); - //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash)); - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); - - } - - }else{ - - if(!visited_hash(pair_succ->automaton_state, search_cycle)){ - //if(!visited(pair_succ->automaton_state, search_cycle)){ - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); - - }else{ - - XBT_DEBUG("Next pair already visited ! "); - - } - - } - - }else{ - - if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ - - XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); - - set_pair_reached(pair_succ->automaton_state); - //set_pair_reached_hash(pair_succ->automaton_state); - - search_cycle = 1; - - XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); - //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash)); - - } - - if(!visited_hash(pair_succ->automaton_state, search_cycle)){ - //if(!visited(pair_succ->automaton_state, search_cycle)){ - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); - - }else{ - - XBT_DEBUG("Next pair already visited ! "); - - } - - } - - - /* 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 %u", xbt_fifo_size(mc_stack_liveness)); - MC_replay_liveness(mc_stack_liveness, 0); - } - } + int new_pair = 0; - - }else{ /*No request to execute, search evolution in Büchi automaton */ + /* Evaluate enabled transition according to atomic propositions values */ + cursor = 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, + transition_succ) { - MC_SET_RAW_MEM; + res = + MC_automaton_evaluate_label(transition_succ->label, + prop_values); - /* Create the new expanded graph_state */ - next_graph_state = MC_state_pair_new(); + if (res == 1) { // enabled transition in automaton - xbt_dynar_reset(successors); + if (new_pair) + MC_replay_liveness(mc_stack, 1); - MC_UNSET_RAW_MEM; + MC_SET_MC_HEAP; + 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(); - cursor= 0; - xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + /* Get enabled processes and insert them 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); + } + } - res = MC_automaton_evaluate_label(transition_succ->label); + next_pair->requests = + MC_state_interleave_size(next_pair->graph_state); - 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 (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, next_pair); - 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; - } + if (mc_stats->expanded_pairs % 1000000 == 0) + XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs); - } + MC_SET_STD_HEAP; - cursor = 0; - - xbt_dynar_foreach(successors, cursor, pair_succ){ + new_pair = 1; - if(search_cycle == 1){ + MC_modelcheck_liveness(); - if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ + } - if(reached(pair_succ->automaton_state)){ - //if(reached_hash(pair_succ->automaton_state)){ + } - XBT_DEBUG("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness) + 1); + /* Then, evaluate true transitions (always true, whatever atomic propositions values) */ + cursor = 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, + transition_succ) { - 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); - exit(0); + res = + MC_automaton_evaluate_label(transition_succ->label, + prop_values); - }else{ + if (res == 2) { // true transition in automaton - XBT_DEBUG("Next pair (depth = %d) -> Acceptance pair : graph=%p, automaton=%p(%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); - - set_pair_reached(pair_succ->automaton_state); - //set_pair_reached_hash(pair_succ->automaton_state); - - XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); - //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash)); + if (new_pair) + MC_replay_liveness(mc_stack, 1); - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); + MC_SET_MC_HEAP; - } + 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(); - }else{ + /* 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); + } + } - if(!visited_hash(pair_succ->automaton_state, search_cycle)){ - //if(!visited(pair_succ->automaton_state, search_cycle)){ + next_pair->requests = + MC_state_interleave_size(next_pair->graph_state); - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); - - }else{ + if (next_pair->automaton_state->type == 1 + || next_pair->automaton_state->type == 2 + || current_pair->search_cycle) + next_pair->search_cycle = 1; - XBT_DEBUG("Next pair already visited ! "); + xbt_fifo_unshift(mc_stack, next_pair); - } - } - + if (mc_stats->expanded_pairs % 1000000 == 0) + XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs); - }else{ - - if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ + MC_SET_STD_HEAP; - set_pair_reached(pair_succ->automaton_state); - //set_pair_reached_hash(pair_succ->automaton_state); - - search_cycle = 1; + new_pair = 1; - XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); - //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash)); + MC_modelcheck_liveness(); - } + } - if(!visited_hash(pair_succ->automaton_state, search_cycle)){ - //if(!visited(pair_succ->automaton_state, search_cycle)){ + } - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); - - }else{ + if (MC_state_interleave_size(current_pair->graph_state) > 0) { + XBT_DEBUG("Backtracking to depth %d", xbt_fifo_size(mc_stack)); + MC_replay_liveness(mc_stack, 0); + } - XBT_DEBUG("Next pair already visited ! "); + } - } + } - } + } - /* Restore system before checking others successors */ - if(cursor != xbt_dynar_length(successors) - 1) - MC_replay_liveness(mc_stack_liveness, 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."); } - - }else{ - - XBT_DEBUG("Max depth reached"); } - if(xbt_fifo_size(mc_stack_liveness) == MAX_DEPTH_LIVENESS ){ - XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u, depth = %d) shifted in stack, maximum depth reached", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) ); - }else{ - XBT_DEBUG("Pair (graph=%p, automaton =%p, search_cycle = %u, depth = %d) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) ); + if (xbt_fifo_size(mc_stack) == _sg_mc_max_depth) { + XBT_DEBUG("Pair %d (depth = %d) shifted in stack, maximum depth reached", + current_pair->num, xbt_fifo_size(mc_stack)); + } else { + XBT_DEBUG("Pair %d (depth = %d) shifted in stack", current_pair->num, + xbt_fifo_size(mc_stack)); } - - MC_SET_RAW_MEM; - xbt_fifo_shift(mc_stack_liveness); - if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){ - xbt_dynar_pop(reached_pairs, NULL); - //xbt_dynar_pop(reached_pairs_hash, NULL); + + MC_SET_MC_HEAP; + xbt_dynar_free(&prop_values); + current_pair = xbt_fifo_shift(mc_stack); + if (xbt_fifo_size(mc_stack) != _sg_mc_max_depth - 1 + && current_pair->requests > 0 && current_pair->search_cycle) { + remove_acceptance_pair(current_pair->num); } - MC_UNSET_RAW_MEM; - - + MC_pair_delete(current_pair); + + MC_SET_STD_HEAP; }