X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f88cea0e25ce1a9212c14b414322b882e796d72c..a0c5f40f68a69e5fd2c22643c98aed7570191e21:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index f0b4a60e76..ef53fb71af 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -1,182 +1,624 @@ -#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; xbt_dynar_t reached_pairs; -extern mc_snapshot_t initial_snapshot; +xbt_dynar_t reached_pairs_hash; +xbt_dynar_t visited_pairs; +xbt_dynar_t visited_pairs_hash; +xbt_dynar_t successors; + +xbt_dynar_t hosts_table; + + +/* fast implementation of djb2 algorithm */ +unsigned int hash_region(char *str, int str_len){ + + int c; + register unsigned int hash = 5381; + + while (str_len--) { + c = *str++; + hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ + } + + return hash; -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; - mc_stats_pair->expanded_pairs++; - return p; - } -int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){ +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)); - if(s1->num_reg != s2->num_reg) - return 1; + int status; + switch(fork()){ + case 0: + // We are the child process -- run the actual program + abort(); + break; + + 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 = malloc(20); + sprintf(core_name,"core_%d", pair); + rename("core", core_name); + free(core_name); + } + } + + return 0; +} + +int reached(xbt_state_t st){ + + raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - int i, errors=0; + if(xbt_dynar_is_empty(reached_pairs) || !compare){ - for(i=0 ; i< s1->num_reg ; i++){ + return 0; + + }else{ + + MC_SET_RAW_MEM; + + 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 = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(new_pair->system_state); - if(s1->regions[i]->size != s2->regions[i]->size) - return 1; + /* 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); + } + + cursor = 0; + mc_pair_reached_t pair_test = NULL; + + xbt_dynar_foreach(reached_pairs, cursor, pair_test){ + XBT_INFO("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(pair_test->system_state, new_pair->system_state) == 0){ + + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + + return 1; + } + }else{ + XBT_INFO("Different values of propositional symbols"); + } + }else{ + XBT_INFO("Different automaton state"); + } + } + + /* New pair reached */ + xbt_dynar_push(reached_pairs, &new_pair); + + create_dump(xbt_dynar_length(reached_pairs)); + + MC_UNSET_RAW_MEM; + + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + + compare = 0; - if(s1->regions[i]->start_addr != s2->regions[i]->start_addr) - return 1; + return 0; - if(s1->regions[i]->type != s2->regions[i]->type) - return 1; - - if(s1->regions[i]->type == 0){ - if(mmalloc_compare_heap(s1->regions[i]->start_addr, s2->regions[i]->start_addr)){ - XBT_DEBUG("Different heap (mmalloc_compare)"); - //sleep(1); - errors++; - } - }else{ - if(memcmp(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){ - XBT_DEBUG("Different memcmp for data in libsimgrid (%d)", i); - //sleep(2); - errors++; + } +} + + +void set_pair_reached(xbt_state_t st){ + + 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 = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(pair->system_state); + + /* Get values of propositional symbols */ + unsigned int cursor = 0; + xbt_propositional_symbol_t ps = NULL; + int res; + 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); + } + + xbt_dynar_push(reached_pairs, &pair); + + MC_UNSET_RAW_MEM; + + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + +} + + +int reached_hash(xbt_state_t st){ + + raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + + 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); + } + + + /* 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_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(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; + + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + + return 1; + }else{ + XBT_INFO("Different snapshot"); + } + }else{ + XBT_INFO("Different values of propositional symbols"); + } + }else{ + XBT_INFO("Different automaton state"); } + + region_diff = 0; } + MC_free_snapshot(sn); + xbt_dynar_reset(prop_ato); + xbt_free(prop_ato); + MC_UNSET_RAW_MEM; + + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + + return 0; } +} + +void set_pair_reached_hash(xbt_state_t st){ + + raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + + 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_void_t f; - return (errors>0); + 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_hash, &pair); + + MC_free_snapshot(sn); + + MC_UNSET_RAW_MEM; + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + } -int reached(xbt_automaton_t a, mc_snapshot_t s){ - XBT_DEBUG("Test reached"); +int visited(xbt_state_t st, int sc){ + + raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + + if(xbt_dynar_is_empty(visited_pairs)){ - if(xbt_dynar_is_empty(reached_pairs)){ return 0; + }else{ + MC_SET_RAW_MEM; - - mc_pair_reached_t pair = NULL; - pair = xbt_new0(s_mc_pair_reached_t, 1); - pair->automaton_state = a->current_state; - pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); - pair->system_state = s; - + + 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; - xbt_dynar_foreach(a->propositional_symbols, cursor, ps){ - int (*f)() = ps->function; - int res = (*f)(); - xbt_dynar_push_as(pair->prop_ato, int, res); + int res; + 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(prop_ato, int, res); } - + cursor = 0; - mc_pair_reached_t pair_test; - //int (*compare_dynar)(const void*, const void*) = &propositional_symbols_compare_value; - xbt_dynar_foreach(reached_pairs, cursor, pair_test){ - if(automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){ - if(propositional_symbols_compare_value(pair_test->prop_ato, pair->prop_ato) == 0){ - if(snapshot_compare(pair_test->system_state, pair->system_state) == 0){ - MC_UNSET_RAW_MEM; - return 1; - } - } + 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; + + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + + return 1; + + }else{ + XBT_INFO("Different snapshot"); + } + }else{ + XBT_INFO("Different values of propositional symbols"); + } + }else{ + XBT_INFO("Different automaton state"); + } + }else{ + XBT_INFO("Different value of search_cycle"); } } + + MC_free_snapshot(sn); + xbt_dynar_reset(prop_ato); + xbt_free(prop_ato); MC_UNSET_RAW_MEM; + + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + return 0; } } -int set_pair_reached(xbt_automaton_t a, mc_snapshot_t s){ - if(reached(a, s) == 0){ +int visited_hash(xbt_state_t st, int sc){ + + raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + + if(xbt_dynar_is_empty(visited_pairs_hash)){ + + return 0; + + }else{ MC_SET_RAW_MEM; - mc_pair_reached_t pair = NULL; - pair = xbt_new0(s_mc_pair_reached_t, 1); - pair->automaton_state = a->current_state; - pair->prop_ato = xbt_dynar_new(sizeof(int), NULL); - pair->system_state = s; + 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); + } + /* 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; - xbt_dynar_foreach(a->propositional_symbols, cursor, ps){ - int (*f)() = ps->function; - int res = (*f)(); - xbt_dynar_push_as(pair->prop_ato, int, res); + int res; + 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(prop_ato, int, res); } - - xbt_dynar_push(reached_pairs, &pair); - + + 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; + + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + + return 1; + }else{ + //XBT_INFO("Different snapshot"); + } + }else{ + //XBT_INFO("Different values of propositional symbols"); + } + }else{ + //XBT_INFO("Different automaton state"); + } + }else{ + //XBT_INFO("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; + + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + + return 0; + + } +} - return 1; +void set_pair_visited_hash(xbt_state_t st, int sc){ + raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + + 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_void_t f; - return 0; + 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(visited_pairs_hash, &pair); + + MC_free_snapshot(sn); + + MC_UNSET_RAW_MEM; + + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + +} + +void set_pair_visited(xbt_state_t st, int sc){ + + raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + + 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); + + + /* Get values of propositional symbols */ + unsigned int cursor = 0; + xbt_propositional_symbol_t ps = NULL; + int res; + 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); + } + + xbt_dynar_push(visited_pairs, &pair); + + MC_UNSET_RAW_MEM; + + if(raw_mem_set) + MC_SET_RAW_MEM; + else + 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){ + +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; @@ -184,42 +626,41 @@ int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l){ } - - - /********************* 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->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 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){ + raw_mem_set = (mmalloc_get_current_heap() == raw_heap); -void MC_ddfs_stateless_init(xbt_automaton_t a){ + XBT_INFO("**************************************************"); + XBT_INFO("Double-DFS init"); + XBT_INFO("**************************************************"); - 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; + initial_graph_state = MC_state_pair_new(); xbt_swag_foreach(process, simix_global->process_list){ if(MC_process_is_enabled(process)){ @@ -227,86 +668,94 @@ void MC_ddfs_stateless_init(xbt_automaton_t a){ } } - reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL); + 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); - initial_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(initial_snapshot); + /* Save the initial state */ + initial_snapshot_liveness = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(initial_snapshot_liveness); MC_UNSET_RAW_MEM; unsigned int cursor = 0; 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_stateless(initial_graph_state, state); - xbt_fifo_unshift(mc_stack_liveness_stateless, 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_stateless(a, 0, 0); - }else{ - MC_restore_snapshot(initial_snapshot); - MC_UNSET_RAW_MEM; - MC_ddfs_stateless(a, 0, 0); + 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); - xbt_fifo_unshift(mc_stack_liveness_stateless, mc_initial_pair); - 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); - } + 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); + } } - } + } + + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + } -void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay){ +void MC_ddfs(int search_cycle){ + + 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_stateless) == 0) + if(xbt_fifo_size(mc_stack_liveness) == 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); - } - } - } /* Get current pair */ - current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateless)); + 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 */ - a->current_state = current_pair->automaton_state; - - 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)); + _mc_property_automaton->current_state = current_pair->automaton_state; - + + XBT_INFO("********************* ( 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; xbt_transition_t transition_succ; @@ -315,423 +764,345 @@ void MC_ddfs_stateless(xbt_automaton_t a, int search_cycle, int replay){ mc_pair_stateless_t next_pair = NULL; mc_pair_stateless_t pair_succ; - mc_snapshot_t next_snapshot = NULL; - mc_snapshot_t current_snapshot = NULL; - - xbt_dynar_t successors = NULL; - MC_SET_RAW_MEM; - successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL); - MC_UNSET_RAW_MEM; + if(xbt_fifo_size(mc_stack_liveness) < MAX_DEPTH_LIVENESS){ - 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; + //set_pair_visited(current_pair->automaton_state, search_cycle); + //set_pair_visited_hash(current_pair->automaton_state, search_cycle); - /* 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_INFO("Visited pairs : %lu", xbt_dynar_length(visited_pairs)); + //XBT_INFO("Visited pairs : %lu", xbt_dynar_length(visited_pairs_hash)); - //sleep(1); + if(current_pair->requests > 0){ - MC_state_set_executed_request(current_pair->graph_state, req, value); - - /* 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_INFO("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); - 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(); - /* 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); - - xbt_dynar_reset(successors); + /* Create the new expanded graph_state */ + next_graph_state = MC_state_pair_new(); - if(snapshot_compare(current_snapshot,next_snapshot)){ - XBT_DEBUG("Different snapshot"); - //sleep(2); - - } + /* 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_UNSET_RAW_MEM; - + xbt_dynar_reset(successors); - cursor= 0; - xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + MC_UNSET_RAW_MEM; - 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); - 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); - cursor = 0; + 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){ + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - res = MC_automaton_evaluate_label(a, 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); - 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){ - cursor = 0; + if(search_cycle == 1){ - xbt_dynar_foreach(successors, cursor, pair_succ){ - - if((search_cycle == 1) && (reached(a, next_snapshot) == 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; + 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_INFO("Next pair (depth = %d, %u interleave) already reached !", xbt_fifo_size(mc_stack_liveness) + 1, MC_state_interleave_size(pair_succ->graph_state)); - MC_ddfs_stateless(a, search_cycle, 0); + 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); - - if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ + }else{ - XBT_DEBUG("Acceptance pair %p : graph=%p, automaton=%p(%s)", pair_succ, pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); - int res = set_pair_reached(a, next_snapshot); + XBT_INFO("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); - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness_stateless, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs_stateless(a, 1, 1); - - if(res){ - MC_SET_RAW_MEM; - xbt_dynar_pop(reached_pairs, NULL); - MC_UNSET_RAW_MEM; - } - } - } + XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash)); - 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); - } - - } - - 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); - MC_UNSET_RAW_MEM; + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); -} + } -/********************* Double-DFS stateful without visited state *******************/ + }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{ -void MC_ddfs_stateful_init(xbt_automaton_t a){ + XBT_INFO("Next pair already visited ! "); - XBT_DEBUG("**************************************************"); - XBT_DEBUG("Double-DFS stateful without 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; - - MC_wait_for_requests(); + }*/ + + } - MC_SET_RAW_MEM; + }else{ + + if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ - init_snapshot = xbt_new0(s_mc_snapshot_t, 1); + XBT_INFO("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); - 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); - } - } + search_cycle = 1; - reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL); + XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash)); - MC_take_snapshot(init_snapshot); + } - MC_UNSET_RAW_MEM; + //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{ - unsigned int cursor = 0; - xbt_state_t state = NULL; + XBT_INFO("Next pair already visited ! "); - xbt_dynar_foreach(a->states, cursor, state){ - if(state->type == -1){ + }*/ + + } + + + /* Restore system before checking others successors */ + if(cursor != (xbt_dynar_length(successors) - 1)) + MC_replay_liveness(mc_stack_liveness, 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_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(MC_state_interleave_size(current_pair->graph_state) > 0){ + XBT_INFO("Backtracking to depth %d", xbt_fifo_size(mc_stack_liveness)); + MC_replay_liveness(mc_stack_liveness, 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); - } - } - } - } -} + + }else{ /*No request to execute, search evolution in Büchi automaton */ -void MC_ddfs_stateful(xbt_automaton_t a, int search_cycle, int restore){ + MC_SET_RAW_MEM; - smx_process_t process = NULL; - mc_pair_t current_pair = NULL; + /* Create the new expanded graph_state */ + next_graph_state = MC_state_pair_new(); - if(xbt_fifo_size(mc_stack_liveness_stateful) == 0) - return; + xbt_dynar_reset(successors); - if(restore == 1){ - current_pair = (mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateful)); - MC_restore_snapshot(current_pair->system_state); - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - MC_state_interleave_process(current_pair->graph_state, process); - } - } - MC_UNSET_RAW_MEM; - } + MC_UNSET_RAW_MEM; - /* Get current state */ - current_pair = (mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness_stateful)); + cursor= 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - 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)); + res = MC_automaton_evaluate_label(transition_succ->label); - a->current_state = current_pair->automaton_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; + } - mc_stats_pair->visited_pairs++; + } - int value; - mc_state_t next_graph_state = NULL; - smx_req_t req = NULL; - char *req_str; + 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; + } - mc_pair_t pair_succ; - xbt_transition_t transition_succ; - unsigned int cursor; - int res; + } - xbt_dynar_t successors = NULL; + cursor = 0; + + xbt_dynar_foreach(successors, cursor, pair_succ){ - mc_pair_t next_pair = NULL; - mc_snapshot_t next_snapshot = NULL; - mc_snapshot_t current_snapshot = NULL; + if(search_cycle == 1){ - //sleep(1); - MC_SET_RAW_MEM; - successors = xbt_dynar_new(sizeof(mc_pair_t), NULL); - MC_UNSET_RAW_MEM; - - while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ + if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ - MC_SET_RAW_MEM; - current_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; - - - /* Debug information */ - if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){ - req_str = MC_request_to_string(req, value); - XBT_DEBUG("Execute: %s", req_str); - xbt_free(req_str); - } + if(reached(pair_succ->automaton_state)){ + //if(reached_hash(pair_succ->automaton_state)){ - MC_state_set_executed_request(current_pair->graph_state, req, value); + 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); + exit(0); - /* Answer the request */ - SIMIX_request_pre(req, value); + }else{ - /* Wait for requests (schedules processes) */ - MC_wait_for_requests(); + XBT_INFO("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); + + XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + //XBT_INFO("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); - /* 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); - } - } + }else{ - next_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(next_snapshot); + //if(!visited_hash(pair_succ->automaton_state, search_cycle)){ + //if(!visited(pair_succ->automaton_state, search_cycle)){ - xbt_dynar_reset(successors); + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); + + /*}else{ - MC_UNSET_RAW_MEM; + XBT_INFO("Next pair already visited ! "); - - 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){ // enabled transition in automaton - 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; - } + }*/ + } + - } + }else{ + + if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ - 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){ // transition always enabled in automaton - 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; - } + set_pair_reached(pair_succ->automaton_state); + //set_pair_reached_hash(pair_succ->automaton_state); + + search_cycle = 1; - - } + XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash)); - - 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(!visited_hash(pair_succ->automaton_state, search_cycle)){ + //if(!visited(pair_succ->automaton_state, search_cycle)){ - //XBT_DEBUG("Successors in automaton %lu", xbt_dynar_length(successors)); + MC_SET_RAW_MEM; + xbt_fifo_unshift(mc_stack_liveness, pair_succ); + MC_UNSET_RAW_MEM; + + MC_ddfs(search_cycle); + + /*}else{ - 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(a, next_snapshot) == 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; + XBT_INFO("Next pair already visited ! "); - MC_ddfs_stateful(a, search_cycle, 0); - - - if((search_cycle == 0) && ((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ - - int res = set_pair_reached(a, next_snapshot); - 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); - - if(res){ - MC_SET_RAW_MEM; - xbt_dynar_pop(reached_pairs, NULL); - MC_UNSET_RAW_MEM; - } - } + }*/ - } + } - if(MC_state_interleave_size(current_pair->graph_state) > 0){ - XBT_DEBUG("Backtracking to depth %u", xbt_fifo_size(mc_stack_liveness_stateful)); - MC_restore_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; + /* Restore system before checking others successors */ + if(cursor != xbt_dynar_length(successors) - 1) + MC_replay_liveness(mc_stack_liveness, 1); + + + } + } + + }else{ + + XBT_INFO("Max depth reached"); + + } + if(xbt_fifo_size(mc_stack_liveness) == MAX_DEPTH_LIVENESS ){ + XBT_INFO("Pair (graph=%p, automaton =%p, search_cycle = %d, 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_INFO("Pair (graph=%p, automaton =%p, search_cycle = %d, depth = %d) shifted in stack", current_pair->graph_state, current_pair->automaton_state, search_cycle, xbt_fifo_size(mc_stack_liveness) ); } 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); + 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_UNSET_RAW_MEM; + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + }