X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2c25e0bae01a59891fac21447f3210ba26302c5..3d28e83ea2a5f93c7654087eb70ab2e873553628:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index f01ccb9d42..38dc7bd64c 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -1,862 +1,1310 @@ -#include "private.h" -#include "unistd.h" +/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved. */ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dfs, mc, - "Logging specific to MC DFS algorithm"); +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + +#include "mc_private.h" +#include + +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, + "Logging specific to algorithms for liveness properties verification"); -xbt_dynar_t initial_pairs = NULL; -int max_pair = 0; -xbt_dynar_t visited_pairs; xbt_dynar_t reached_pairs; +xbt_dynar_t reached_pairs_hash; +xbt_dynar_t visited_pairs; +xbt_dynar_t visited_pairs_hash; +xbt_dynar_t successors; -mc_pairs_t new_pair(mc_snapshot_t sn, mc_state_t sg, xbt_state_t st){ - mc_pairs_t p = NULL; - p = xbt_new0(s_mc_pairs_t, 1); - p->system_state = sn; - p->automaton_state = st; - p->graph_state = sg; - p->num = max_pair; - max_pair++; - return p; - -} +xbt_dynar_t hosts_table; -void set_pair_visited(mc_state_t gs, xbt_state_t as, int sc){ - //XBT_DEBUG("New visited pair : graph=%p, automaton=%p", gs, as); - MC_SET_RAW_MEM; - mc_visited_pairs_t p = NULL; - p = xbt_new0(s_mc_visited_pairs_t, 1); - p->graph_state = gs; - p->automaton_state = as; - p->search_cycle = sc; - xbt_dynar_push(visited_pairs, &p); - //XBT_DEBUG("New visited pair , length of visited pairs : %lu", xbt_dynar_length(visited_pairs)); - MC_UNSET_RAW_MEM; +/* 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; - //XBT_DEBUG("New visited pair , length of visited pairs : %lu", xbt_dynar_length(visited_pairs)); } -int reached(mc_state_t gs, xbt_state_t as ){ +int data_program_region_compare(void *d1, void *d2, size_t size){ + int distance = 0; + int i; + + for(i=0; iautomaton_state == as){ - different_process=0; - for(i=0; i < gs->max_pid; i++){ - if(gs->proc_status[i].state != rp->graph_state->proc_status[i].state){ - different_process++; - } - } - if(different_process==0){ - MC_UNSET_RAW_MEM; - XBT_DEBUG("Pair (graph=%p, automaton=%p(%s)) already reached (graph=%p)!", gs, as, as->id, rp->graph_state); - return 1; - } - /* XBT_DEBUG("Pair (graph=%p, automaton=%p(%s)) already reached !", gs, as, as->id); */ - /* return 1; */ +int data_libsimgrid_region_compare(void *d1, void *d2, size_t size){ + int distance = 0; + int i; + + for(i=0; igraph_state = gs; - p->automaton_state = as; - xbt_dynar_push(reached_pairs, &p); - XBT_DEBUG("New reached pair : graph=%p, automaton=%p(%s)", gs, as, as->id); - MC_UNSET_RAW_MEM; - //} + + if(s1->num_reg != s2->num_reg){ + XBT_INFO("Different num_reg (s1 = %u, s2 = %u)", s1->num_reg, s2->num_reg); + return 1; + } -} + int i; + int errors = 0; -int visited(mc_state_t gs, xbt_state_t as, int sc){ - unsigned int c = 0; - mc_visited_pairs_t p = NULL; - unsigned int i; - int different_process; + for(i=0 ; i< s1->num_reg ; i++){ - //XBT_DEBUG("Visited pair length : %lu", xbt_dynar_length(visited_pairs)); + if(s1->regions[i]->type != s2->regions[i]->type){ + XBT_INFO("Different type of region"); + errors++; + } - MC_SET_RAW_MEM; - xbt_dynar_foreach(visited_pairs, c, p){ - //XBT_DEBUG("Test pair visited"); - //sleep(1); - if((p->automaton_state == as) && (p->search_cycle == sc)){ - different_process=0; - for(i=0; i < gs->max_pid; i++){ - if(gs->proc_status[i].state != p->graph_state->proc_status[i].state){ - different_process++; - } + switch(s1->regions[i]->type){ + case 0: + if(s1->regions[i]->size != s2->regions[i]->size){ + XBT_INFO("Different size of heap (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size); + errors++; } - if(different_process==0){ - MC_UNSET_RAW_MEM; - return 1; + if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){ + XBT_INFO("Different start addr of heap (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); + errors++; + } + if(mmalloc_compare_heap(s1->regions[i]->data, s2->regions[i]->data, s_heap, r_heap)){ + XBT_INFO("Different heap (mmalloc_compare)"); + errors++; + } + break; + case 1 : + if(s1->regions[i]->size != s2->regions[i]->size){ + XBT_INFO("Different size of libsimgrid (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size); + errors++; } + if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){ + XBT_INFO("Different start addr of libsimgrid (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); + errors++; + } + if(data_libsimgrid_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){ + XBT_INFO("Different memcmp for data in libsimgrid"); + errors++; + } + break; + case 2 : + if(s1->regions[i]->size != s2->regions[i]->size){ + XBT_INFO("Different size of data program (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size); + errors++; + } + if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){ + XBT_INFO("Different start addr of data program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr); + errors++; + } + if(data_program_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){ + XBT_INFO("Different memcmp for data in program"); + errors++; + } + break; + default: + break; } } - MC_UNSET_RAW_MEM; - return 0; + return (errors > 0); + } -void MC_dfs_init(xbt_automaton_t a){ +int reached(xbt_state_t st){ - XBT_DEBUG("**************************************************"); - XBT_DEBUG("DFS init"); - XBT_DEBUG("**************************************************"); - - mc_pairs_t mc_initial_pair; - mc_state_t initial_graph_state; - smx_process_t process; - mc_snapshot_t init_snapshot; - - MC_wait_for_requests(); - - MC_SET_RAW_MEM; - - init_snapshot = xbt_new0(s_mc_snapshot_t, 1); - initial_graph_state = MC_state_pair_new(); - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - MC_state_interleave_process(initial_graph_state, process); - } - } + if(xbt_dynar_is_empty(reached_pairs)){ - visited_pairs = xbt_dynar_new(sizeof(mc_visited_pairs_t), NULL); - reached_pairs = xbt_dynar_new(sizeof(mc_reached_pairs_t), NULL); + return 0; - MC_take_snapshot(init_snapshot); + }else{ - MC_UNSET_RAW_MEM; + MC_SET_RAW_MEM; - /* unsigned int cursor = 0; */ - /* xbt_state_t state = NULL; */ - /* int nb_init_state = 0; */ + 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_void_t f; - /* xbt_dynar_foreach(a->states, cursor, state){ */ - /* if(state->type == -1){ */ + /* Get values of propositional symbols */ + unsigned int cursor = 0; + xbt_propositional_symbol_t ps = NULL; + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ + f = (int_f_void_t)ps->function; + res = (*f)(); + xbt_dynar_push_as(prop_ato, int, res); + } - /* MC_SET_RAW_MEM; */ - /* mc_initial_pair = new_pair(init_snapshot, initial_graph_state, state); */ + cursor = 0; + mc_pair_reached_t pair_test = NULL; - /* xbt_fifo_unshift(mc_snapshot_stack, mc_initial_pair); */ + //xbt_dict_t current_rdv_points = SIMIX_get_rdv_points(); + + 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, prop_ato) == 0){ + //XBT_INFO("Rdv points size %d - %d", xbt_dict_length(pair_test->rdv_points), xbt_dict_length(current_rdv_points)); + //if(xbt_dict_length(pair_test->rdv_points) == xbt_dict_length(current_rdv_points)){ + //if(rdv_points_compare(pair_test->rdv_points, current_rdv_points) == 0){ + if(snapshot_compare(pair_test->system_state, sn, std_heap, raw_heap) == 0){ + + MC_free_snapshot(sn); + xbt_dynar_reset(prop_ato); + xbt_free(prop_ato); + MC_UNSET_RAW_MEM; + return 1; + } + /* } + }else{ + XBT_INFO("Different size of rdv points (%d - %d)",xbt_dict_length(pair_test->rdv_points), xbt_dict_length(current_rdv_points) ); + }*/ + }else{ + XBT_INFO("Different values of propositional symbols"); + } + }else{ + XBT_INFO("Different automaton state"); + } + } - /* XBT_DEBUG("**************************************************"); */ - /* XBT_DEBUG("Initial state=%p ", mc_initial_pair); */ + MC_free_snapshot(sn); + xbt_dynar_reset(prop_ato); + xbt_free(prop_ato); + MC_UNSET_RAW_MEM; + return 0; + + } +} - /* MC_UNSET_RAW_MEM; */ +int rdv_points_compare(xbt_dict_t d1, xbt_dict_t d2){ /* d1 = pair_test, d2 = current_pair */ + + xbt_dict_cursor_t cursor_dict = NULL; + char *key; + char *data; + smx_rdv_t rdv1, rdv2; + xbt_fifo_item_t item1, item2; + smx_action_t action1, action2; + xbt_fifo_item_t item_req1, item_req2; + smx_simcall_t req1, req2; + int i=0; + int j=0; + + xbt_dict_foreach(d1, cursor_dict, key, data){ + rdv1 = (smx_rdv_t)data; + rdv2 = xbt_dict_get_or_null(d2, rdv1->name); + if(rdv2 == NULL){ + XBT_INFO("Rdv point unknown"); + return 1; + }else{ + if(xbt_fifo_size(rdv1->comm_fifo) != xbt_fifo_size(rdv2->comm_fifo)){ + XBT_INFO("Different total of actions in mailbox \"%s\" (%d - %d)", rdv1->name, xbt_fifo_size(rdv1->comm_fifo),xbt_fifo_size(rdv2->comm_fifo) ); + return 1; + }else{ + + XBT_INFO("Total of actions in mailbox \"%s\" : %d", rdv1->name, xbt_fifo_size(rdv1->comm_fifo)); + + item1 = xbt_fifo_get_first_item(rdv1->comm_fifo); + item2 = xbt_fifo_get_first_item(rdv2->comm_fifo); + + while(icomm_fifo)){ + action1 = (smx_action_t) xbt_fifo_get_item_content(item1); + action2 = (smx_action_t) xbt_fifo_get_item_content(item2); + + if(action1->type != action2->type){ + XBT_INFO("Different type of action"); + return 1; + } + + if(action1->state != action2->state){ + XBT_INFO("Different state of action"); + return 1; + } + + if(xbt_fifo_size(action1->simcalls) != xbt_fifo_size(action2->simcalls)){ + XBT_INFO("Different size of simcall list (%d - %d", xbt_fifo_size(action1->simcalls), xbt_fifo_size(action2->simcalls)); + return 1; + }else{ + + item_req1 = xbt_fifo_get_first_item(action1->simcalls); + item_req2 = xbt_fifo_get_first_item(action2->simcalls); + + while(jsimcalls)){ + + req1 = (smx_simcall_t) xbt_fifo_get_item_content(item_req1); + req2 = (smx_simcall_t) xbt_fifo_get_item_content(item_req2); + + if(req1->call != req2->call){ + XBT_INFO("Different simcall call in simcalls of action (%d - %d)", (int)req1->call, (int)req2->call); + return 1; + } + if(req1->issuer->pid != req2->issuer->pid){ + XBT_INFO("Different simcall issuer in simcalls of action (%lu- %lu)", req1->issuer->pid, req2->issuer->pid); + return 1; + } + + item_req1 = xbt_fifo_get_next_item(item_req1); + item_req2 = xbt_fifo_get_next_item(item_req2); + j++; + + } + } + + switch(action1->type){ + case 0: /* execution */ + case 1: /* parallel execution */ + if(strcmp(action1->execution.host->name, action2->execution.host->name) != 0) + return 1; + break; + case 2: /* comm */ + if(action1->comm.type != action2->comm.type) + return 1; + //XBT_INFO("Type of comm : %d", action1->comm.type); + + switch(action1->comm.type){ + case 0: /* SEND */ + if(action1->comm.src_proc->pid != action2->comm.src_proc->pid) + return 1; + if(strcmp(action1->comm.src_proc->smx_host->name, action2->comm.src_proc->smx_host->name) != 0) + return 1; + break; + case 1: /* RECEIVE */ + if(action1->comm.dst_proc->pid != action2->comm.dst_proc->pid) + return 1; + if(strcmp(action1->comm.dst_proc->smx_host->name, action2->comm.dst_proc->smx_host->name) != 0) + return 1; + break; + case 2: /* READY */ + if(action1->comm.src_proc->pid != action2->comm.src_proc->pid) + return 1; + if(strcmp(action1->comm.src_proc->smx_host->name, action2->comm.src_proc->smx_host->name) != 0) + return 1; + if(action1->comm.dst_proc->pid != action2->comm.dst_proc->pid) + return 1; + if(strcmp(action1->comm.dst_proc->smx_host->name, action2->comm.dst_proc->smx_host->name) != 0) + return 1; + break; + case 3: /* DONE */ + if(action1->comm.src_proc->pid != action2->comm.src_proc->pid) + return 1; + if(strcmp(action1->comm.src_proc->smx_host->name, action2->comm.src_proc->smx_host->name) != 0) + return 1; + if(action1->comm.dst_proc->pid != action2->comm.dst_proc->pid) + return 1; + if(strcmp(action1->comm.dst_proc->smx_host->name, action2->comm.dst_proc->smx_host->name) != 0) + return 1; + break; + + } /* end of switch on type of comm */ + + if(action1->comm.refcount != action2->comm.refcount) + return 1; + if(action1->comm.detached != action2->comm.detached) + return 1; + if(action1->comm.rate != action2->comm.rate) + return 1; + if(action1->comm.task_size != action2->comm.task_size) + return 1; + if(action1->comm.src_buff != action2->comm.src_buff) + return 1; + if(action1->comm.dst_buff != action2->comm.dst_buff) + return 1; + if(action1->comm.src_data != action2->comm.src_data) + return 1; + if(action1->comm.dst_data != action2->comm.dst_data) + return 1; + + break; + case 3: /* sleep */ + if(strcmp(action1->sleep.host->name, action2->sleep.host->name) != 0) + return 1; + break; + case 4: /* synchro */ + + break; + default: + break; + } + + item1 = xbt_fifo_get_next_item(item1); + item2 = xbt_fifo_get_next_item(item2); + i++; + } + } + } + } - /* set_pair_visited(mc_initial_pair->graph_state, mc_initial_pair->automaton_state, 0); */ - - /* if(nb_init_state == 0) */ - /* MC_dfs(a, 0, 0); */ - /* else */ - /* MC_dfs(a, 0, 1); */ - - /* nb_init_state++; */ - /* } */ - /* } */ + return 0; + +} - /* regarder dans l'automate toutes les transitions activables grâce à l'état initial du système - -> donnera les états initiaux de la propriété consistants avec l'état initial du système */ +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->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); + //pair->rdv_points = xbt_dict_new(); + MC_take_snapshot_liveness(pair->system_state); + + /* Get values of propositional symbols */ unsigned int cursor = 0; - unsigned int cursor2 = 0; - xbt_state_t state = NULL; + xbt_propositional_symbol_t ps = NULL; int res; - xbt_transition_t transition_succ; - xbt_dynar_t successors = xbt_dynar_new(sizeof(mc_pairs_t), NULL); - xbt_dynar_t elses = xbt_dynar_new(sizeof(mc_pairs_t), NULL); - mc_pairs_t pair_succ; - - xbt_dynar_foreach(a->states, cursor, state){ - if(state->type == -1){ - xbt_dynar_foreach(state->out, cursor2, transition_succ){ - res = MC_automaton_evaluate_label(a, transition_succ->label); - - if(res == 1){ - - MC_SET_RAW_MEM; - - mc_initial_pair = new_pair(init_snapshot, initial_graph_state, transition_succ->dst); - xbt_dynar_push(successors, &mc_initial_pair); - - MC_UNSET_RAW_MEM; + int_f_void_t f; - }else{ - if(res == 2){ - - MC_SET_RAW_MEM; + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ + f = (int_f_void_t)ps->function; + res = (*f)(); + xbt_dynar_push_as(pair->prop_ato, int, res); + } - mc_initial_pair = new_pair(init_snapshot, initial_graph_state, transition_succ->dst); - xbt_dynar_push(elses, &mc_initial_pair); + /*xbt_dict_t rdv_points = SIMIX_get_rdv_points(); - MC_UNSET_RAW_MEM; - } - } - } + xbt_dict_cursor_t cursor_dict = NULL; + char *key; + char *data; + xbt_fifo_item_t item; + smx_action_t action; + + xbt_dict_foreach(rdv_points, cursor_dict, key, data){ + smx_rdv_t new_rdv = xbt_new0(s_smx_rvpoint_t, 1); + new_rdv->name = strdup(((smx_rdv_t)data)->name); + new_rdv->comm_fifo = xbt_fifo_new(); + xbt_fifo_foreach(((smx_rdv_t)data)->comm_fifo, item, action, smx_action_t) { + smx_action_t a = xbt_new0(s_smx_action_t, 1); + memcpy(a, action, sizeof(s_smx_action_t)); + xbt_fifo_push(new_rdv->comm_fifo, a); + XBT_INFO("New action (type = %d, state = %d) in mailbox \"%s\"", action->type, action->state, key); + if(action->type==2) + XBT_INFO("Type of communication : %d, Ref count = %d", action->comm.type, action->comm.refcount); } - } - + //new_rdv->comm_fifo = xbt_fifo_copy(((smx_rdv_t)data)->comm_fifo); + xbt_dict_set(pair->rdv_points, new_rdv->name, new_rdv, NULL); + }*/ - cursor = 0; - xbt_dynar_foreach(successors, cursor, pair_succ){ - MC_SET_RAW_MEM; + xbt_dynar_push(reached_pairs, &pair); - xbt_fifo_unshift(mc_snapshot_stack, pair_succ); + MC_UNSET_RAW_MEM; + +} - XBT_DEBUG("**************************************************"); - XBT_DEBUG("Initial pair=%p (graph=%p, automaton=%p(%s)) ", pair_succ, pair_succ->graph_state, pair_succ->automaton_state,pair_succ->automaton_state->id ); - MC_UNSET_RAW_MEM; +int reached_hash(xbt_state_t st){ - set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, 0); - if(cursor == 0){ - MC_dfs(a, 0, 0); - }else{ - MC_dfs(a, 0, 1); - } - } + if(xbt_dynar_is_empty(reached_pairs_hash)){ - cursor = 0; - xbt_dynar_foreach(elses, cursor, pair_succ){ - MC_SET_RAW_MEM; + return 0; - xbt_fifo_unshift(mc_snapshot_stack, pair_succ); + }else{ - XBT_DEBUG("**************************************************"); - XBT_DEBUG("Initial pair=%p (graph=%p, automaton=%p(%s)) ", pair_succ, pair_succ->graph_state, pair_succ->automaton_state,pair_succ->automaton_state->id ); + MC_SET_RAW_MEM; - MC_UNSET_RAW_MEM; + mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(sn); - set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, 0); + 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); + } - if((xbt_dynar_length(successors) == 0) && (cursor == 0)){ - MC_dfs(a, 0, 0); - }else{ - MC_dfs(a, 0, 1); + + /* 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(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; -void MC_dfs(xbt_automaton_t a, int search_cycle, int restore){ + int region_diff = 0; - smx_process_t process = NULL; + cursor = 0; + xbt_dynar_foreach(reached_pairs_hash, cursor, pair_test){ - if(xbt_fifo_size(mc_snapshot_stack) == 0) - return; + 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_INFO("Different snapshot"); + } + }else{ + XBT_INFO("Different values of propositional symbols"); + } + }else{ + XBT_INFO("Different automaton state"); + } - if(restore == 1){ - MC_restore_snapshot(((mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack)))->system_state); + region_diff = 0; + } + + MC_free_snapshot(sn); + xbt_dynar_reset(prop_ato); + xbt_free(prop_ato); MC_UNSET_RAW_MEM; + return 0; + } +} - //XBT_DEBUG("Lpv length after restore snapshot: %lu", xbt_dynar_length(visited_pairs)); +void set_pair_reached_hash(xbt_state_t st){ + + MC_SET_RAW_MEM; - /* Get current state */ - mc_pairs_t current_pair = (mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack)); + 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; - if(restore==1){ - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - //XBT_DEBUG("Pid : %lu", process->pid); - MC_state_interleave_process(current_pair->graph_state, process); - } - } + for(i=0 ; i< sn->num_reg ; i++){ + pair->hash_regions[i] = hash_region(sn->regions[i]->data, sn->regions[i]->size); } - - XBT_DEBUG("************************************************** ( search_cycle = %d )", search_cycle); - XBT_DEBUG("State : graph=%p, automaton=%p(%s), %u interleave", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id,MC_state_interleave_size(current_pair->graph_state)); - //XBT_DEBUG("Restore : %d", restore); - - //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); - //sleep(1); - - mc_stats_pair->visited_pairs++; - - int value; - mc_state_t next_graph_state = NULL; - smx_req_t req = NULL; - char *req_str; - - mc_pairs_t pair_succ; - xbt_transition_t transition_succ; - unsigned int cursor; + /* Get values of propositional symbols */ + unsigned int cursor = 0; + xbt_propositional_symbol_t ps = NULL; int res; - //int enabled_transition = 0; + int_f_void_t f; - xbt_dynar_t successors = xbt_dynar_new(sizeof(mc_pairs_t), NULL); - xbt_dynar_t elses = xbt_dynar_new(sizeof(mc_pairs_t), NULL); - - mc_pairs_t next_pair; - mc_snapshot_t next_snapshot; - mc_snapshot_t current_snapshot; - + xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){ + f = (int_f_void_t)ps->function; + res = (*f)(); + xbt_dynar_push_as(pair->prop_ato, int, res); + } - while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ + xbt_dynar_push(reached_pairs_hash, &pair); - MC_SET_RAW_MEM; - current_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; - + MC_free_snapshot(sn); + + MC_UNSET_RAW_MEM; - /* Debug information */ - if(XBT_LOG_ISENABLED(mc_dfs, xbt_log_priority_debug)){ - req_str = MC_request_to_string(req, value); - XBT_DEBUG("Execute: %s", req_str); - xbt_free(req_str); - } +} - MC_state_set_executed_request(current_pair->graph_state, req, value); - /* Answer the request */ - SIMIX_request_pre(req, value); +int visited(xbt_state_t st, int sc){ - /* Wait for requests (schedules processes) */ - MC_wait_for_requests(); + if(xbt_dynar_is_empty(visited_pairs)){ - /* Create the new expanded graph_state */ - MC_SET_RAW_MEM; + return 0; - next_graph_state = MC_state_pair_new(); - - /* Get enabled process and insert it in the interleave set of the next graph_state */ - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - XBT_DEBUG("Pid : %lu", process->pid); - MC_state_interleave_process(next_graph_state, process); - } - } + }else{ - next_snapshot = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot(next_snapshot); - - MC_UNSET_RAW_MEM; + MC_SET_RAW_MEM; - xbt_dynar_reset(successors); - xbt_dynar_reset(elses); - - cursor = 0; - xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(sn); - res = MC_automaton_evaluate_label(a, transition_succ->label); + xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL); - MC_SET_RAW_MEM; - next_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst); + /* 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(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_visited_t pair_test = NULL; - //XBT_DEBUG("Next pair : %p", next_pair); + 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, std_heap, raw_heap) == 0){ + + MC_free_snapshot(sn); + xbt_dynar_reset(prop_ato); + xbt_free(prop_ato); + MC_UNSET_RAW_MEM; + + return 1; - if(res == 1){ // enabled transition in automaton - xbt_dynar_push(successors, &next_pair); - mc_stats_pair->expanded_pairs++; - }else{ - if(res == 2){ // enabled transition in automaton - xbt_dynar_push(elses, &next_pair); - mc_stats_pair->expanded_pairs++; + }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_UNSET_RAW_MEM; } - - if(xbt_dynar_length(successors) == 0){ - MC_SET_RAW_MEM; - next_pair = new_pair(next_snapshot, next_graph_state, current_pair->automaton_state); - xbt_dynar_push(successors, &next_pair); - mc_stats_pair->expanded_pairs++; - MC_UNSET_RAW_MEM; - - } + MC_free_snapshot(sn); + xbt_dynar_reset(prop_ato); + xbt_free(prop_ato); + MC_UNSET_RAW_MEM; + return 0; + + } +} - cursor = 0; - xbt_dynar_foreach(successors, cursor, pair_succ){ - - //XBT_DEBUG("Search visited pair : graph=%p, automaton=%p", pair_succ->graph_state, pair_succ->automaton_state); - - if((search_cycle == 1) && (reached(pair_succ->graph_state, pair_succ->automaton_state) == 1)){ - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("| ACCEPTANCE CYCLE |"); - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("Counter-example that violates formula :"); - MC_show_snapshot_stack(mc_snapshot_stack); - MC_dump_snapshot_stack(mc_snapshot_stack); - MC_print_statistics_pairs(mc_stats_pair); - exit(0); - } - - if(visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle) == 0){ +int visited_hash(xbt_state_t st, int sc){ - //XBT_DEBUG("Unvisited pair !"); - mc_stats_pair->executed_transitions++; - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_snapshot_stack, pair_succ); - MC_UNSET_RAW_MEM; + if(xbt_dynar_is_empty(visited_pairs_hash)){ - set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle); - MC_dfs(a, search_cycle, 0); + return 0; - if((search_cycle == 0) && (current_pair->automaton_state->type == 1)){ + }else{ - MC_restore_snapshot(current_pair->system_state); - MC_UNSET_RAW_MEM; - - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - //XBT_DEBUG("Pid : %lu", process->pid); - MC_state_interleave_process(current_pair->graph_state, process); - } - } - - set_pair_reached(current_pair->graph_state, current_pair->automaton_state); - XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id); - MC_dfs(a, 1, 1); - - } - } - } + MC_SET_RAW_MEM; - cursor = 0; - xbt_dynar_foreach(elses, cursor, pair_succ){ - - //XBT_DEBUG("Search visited pair : graph=%p, automaton=%p", pair_succ->graph_state, pair_succ->automaton_state); - - if((search_cycle == 1) && (reached(pair_succ->graph_state, pair_succ->automaton_state) == 1)){ - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("| ACCEPTANCE CYCLE |"); - XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); - XBT_INFO("Counter-example that violates formula :"); - MC_show_snapshot_stack(mc_snapshot_stack); - MC_dump_snapshot_stack(mc_snapshot_stack); - MC_print_statistics_pairs(mc_stats_pair); - exit(0); - } - - if(visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle) == 0){ + mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(sn); - //XBT_DEBUG("Unvisited pair !"); + 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); + } - mc_stats_pair->executed_transitions++; - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_snapshot_stack, pair_succ); - MC_UNSET_RAW_MEM; + + /* 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(automaton->propositional_symbols, cursor, ps){ + f = (int_f_void_t)ps->function; + res = (*f)(); + xbt_dynar_push_as(prop_ato, int, res); + } - set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle); - MC_dfs(a, search_cycle, 0); + mc_pair_visited_hash_t pair_test = NULL; - if((search_cycle == 0) && (current_pair->automaton_state->type == 1)){ + int region_diff = 0; + cursor = 0; - MC_restore_snapshot(current_pair->system_state); - MC_UNSET_RAW_MEM; - - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - //XBT_DEBUG("Pid : %lu", process->pid); - MC_state_interleave_process(current_pair->graph_state, process); + 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_INFO("Different snapshot"); } + }else{ + //XBT_INFO("Different values of propositional symbols"); } - - set_pair_reached(current_pair->graph_state, current_pair->automaton_state); - XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id); - MC_dfs(a, 1, 1); - + }else{ + //XBT_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; + return 0; - if(MC_state_interleave_size(current_pair->graph_state) > 0){ - MC_restore_snapshot(current_snapshot); - MC_UNSET_RAW_MEM; - //XBT_DEBUG("Snapshot restored"); - } } +} - +void set_pair_visited_hash(xbt_state_t st, int sc){ + MC_SET_RAW_MEM; - //remove_pair_reached(current_pair->graph_state); - xbt_fifo_shift(mc_snapshot_stack); - XBT_DEBUG("State (graph=%p, automaton =%p) shifted in snapshot_stack", current_pair->graph_state, current_pair->automaton_state); - MC_UNSET_RAW_MEM; -} + mc_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; -void MC_show_snapshot_stack(xbt_fifo_t stack){ - int value; - mc_pairs_t pair; - xbt_fifo_item_t item; - smx_req_t req; - char *req_str = NULL; + for(i=0 ; i< sn->num_reg ; i++){ + pair->hash_regions[i] = hash_region(sn->regions[i]->data, sn->regions[i]->size); + } - for (item = xbt_fifo_get_last_item(stack); - (item ? (pair = (mc_pairs_t) (xbt_fifo_get_item_content(item))) - : (NULL)); item = xbt_fifo_get_prev_item(item)) { - req = MC_state_get_executed_request(pair->graph_state, &value); - if(req){ - req_str = MC_request_to_string(req, value); - XBT_INFO("%s", req_str); - xbt_free(req_str); - } + /* 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(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; + } -void MC_dump_snapshot_stack(xbt_fifo_t stack){ - mc_pairs_t pair; +void set_pair_visited(xbt_state_t st, int sc){ + MC_SET_RAW_MEM; - while ((pair = (mc_pairs_t) xbt_fifo_pop(stack)) != NULL) - MC_pair_delete(pair); + + 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(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; + + } -void MC_pair_delete(mc_pairs_t pair){ +void MC_pair_delete(mc_pair_t pair){ xbt_free(pair->graph_state->proc_status); xbt_free(pair->graph_state); - //xbt_free(pair->automaton_state); -> FIXME : à implémenter xbt_free(pair); } -int MC_automaton_evaluate_label(xbt_automaton_t a, xbt_exp_label_t l){ + +int MC_automaton_evaluate_label(xbt_exp_label_t l){ switch(l->type){ case 0 : { - int left_res = MC_automaton_evaluate_label(a, l->u.or_and.left_exp); - int right_res = MC_automaton_evaluate_label(a, l->u.or_and.right_exp); + int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp); + int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp); return (left_res || right_res); - break; } case 1 : { - int left_res = MC_automaton_evaluate_label(a, l->u.or_and.left_exp); - int right_res = MC_automaton_evaluate_label(a, l->u.or_and.right_exp); + int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp); + int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp); return (left_res && right_res); - break; } case 2 : { - int res = MC_automaton_evaluate_label(a, l->u.exp_not); + int res = MC_automaton_evaluate_label(l->u.exp_not); return (!res); - break; } case 3 : { unsigned int cursor = 0; xbt_propositional_symbol_t p = NULL; - xbt_dynar_foreach(a->propositional_symbols, cursor, p){ + int_f_void_t f; + xbt_dynar_foreach(automaton->propositional_symbols, cursor, p){ if(strcmp(p->pred, l->u.predicat) == 0){ - int (*f)() = p->function; + f = (int_f_void_t)p->function; return (*f)(); } } return -1; - break; } case 4 : { return 2; - break; } default : return -1; } } -/*void MC_dfs(xbt_automaton_t a, int search_cycle){ - xbt_state_t current_state = (xbt_state_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(stack_automaton_dfs)); - xbt_transition_t transition_succ = NULL; - xbt_state_t successor = NULL; +/********************* 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_INFO("**************************************************"); + XBT_INFO("Double-DFS init"); + XBT_INFO("**************************************************"); + + 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); + } + } + + 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_liveness(initial_snapshot_liveness); + + MC_UNSET_RAW_MEM; + unsigned int cursor = 0; - xbt_dynar_t elses = xbt_dynar_new(sizeof(xbt_transition_t), NULL); - int res; + xbt_state_t state; - //printf("++ current state : %s\n", current_state->id); - - xbt_dynar_foreach(current_state->out, cursor, transition_succ){ - successor = transition_succ->dst; - res = MC_automaton_evaluate_label(a, transition_succ->label); - //printf("-- state : %s, transition_label : %d, res = %d\n", successor->id, transition_succ->label->type, res); - if(res == 1){ - if(search_cycle == 1 && reached_dfs != NULL){ - if(strcmp(reached_dfs->id, successor->id) == 0){ - xbt_dynar_push(state_automaton_visited_dfs, &successor); - printf("\n-*-*-*-*-*-*- ACCEPTANCE CYCLE -*-*-*-*-*-*-\n"); - printf("Visited states : \n"); - unsigned int cursor2 = 0; - xbt_state_t visited_state = NULL; - xbt_dynar_foreach(state_automaton_visited_dfs, cursor2, visited_state){ - printf("State : %s\n", visited_state->id); - } - exit(1); - } - } - if(successor->visited == 0){ - successor->visited = 1; - xbt_fifo_unshift(stack_automaton_dfs, successor); - xbt_dynar_push(state_automaton_visited_dfs, &successor); - MC_dfs(a, search_cycle); - if(search_cycle == 0 && successor->type == 1){ - reached_dfs = successor; - MC_dfs(a, 1); - } + xbt_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(res == 2){ - xbt_dynar_push(elses,&transition_succ); + 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); + } } - } - - cursor = 0; - xbt_dynar_foreach(elses, cursor, transition_succ){ - successor = transition_succ->dst; - if(search_cycle == 1 && reached_dfs != NULL){ - if(strcmp(reached_dfs->id, successor->id) == 0){ - xbt_dynar_push(state_automaton_visited_dfs, &successor); - printf("\n-*-*-*-*-*-*- ACCEPTANCE CYCLE -*-*-*-*-*-*-\n"); - printf("Visited states : \n"); - unsigned int cursor2 = 0; - xbt_state_t visited_state = NULL; - xbt_dynar_foreach(state_automaton_visited_dfs, cursor2, visited_state){ - printf("State : %s\n", visited_state->id); - } - exit(1); - } - } - if(successor->visited == 0){ - successor->visited = 1; - xbt_fifo_unshift(stack_automaton_dfs, successor); - xbt_dynar_push(state_automaton_visited_dfs, &successor); - MC_dfs(a, search_cycle); - if(search_cycle == 0 && successor->type == 1){ - reached_dfs = successor; - MC_dfs(a, 1); - } - } - } + } - xbt_fifo_shift(stack_automaton_dfs); - }*/ +} -/* void MC_dfs(xbt_automaton_t a, int search_cycle, int restore){ */ +void MC_ddfs(int search_cycle){ + smx_process_t process; + mc_pair_stateless_t current_pair = NULL; -/* if(xbt_fifo_size(mc_snapshot_stack) == 0) */ -/* return; */ + if(xbt_fifo_size(mc_stack_liveness) == 0) + return; -/* if(restore == 1){ */ -/* MC_restore_snapshot(((mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack)))->system_state); */ -/* MC_UNSET_RAW_MEM; */ -/* } */ + /* Get current pair */ + current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness)); -/* //XBT_DEBUG("Lpv length after restore snapshot: %lu", xbt_dynar_length(visited_pairs)); */ + /* Update current state in buchi automaton */ + automaton->current_state = current_pair->automaton_state; -/* /\* Get current state *\/ */ -/* mc_pairs_t current_pair = (mc_pairs_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack)); */ + + XBT_INFO("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), search_cycle); + XBT_INFO("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("************************************************** ( search_cycle = %d )", search_cycle); */ -/* XBT_DEBUG("State : graph=%p, automaton=%p(%s), %u interleave", current_pair->graph_state, current_pair->automaton_state, current_pair->automaton_state->id,MC_state_interleave_size(current_pair->graph_state)); */ - -/* //XBT_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); */ - -/* //sleep(1); */ - -/* smx_process_t process = NULL; */ -/* int value; */ -/* mc_state_t next_graph_state = NULL; */ -/* smx_req_t req = NULL; */ -/* char *req_str; */ - -/* mc_pairs_t pair_succ; */ -/* xbt_transition_t transition_succ; */ -/* unsigned int cursor; */ -/* int res; */ -/* //int enabled_transition = 0; */ - -/* xbt_dynar_t elses = xbt_dynar_new(sizeof(mc_pairs_t), NULL); */ -/* xbt_dynar_t successors = xbt_dynar_new(sizeof(mc_pairs_t), NULL); */ -/* xbt_dynar_reset(all_successors); */ - -/* mc_pairs_t next_pair; */ -/* mc_snapshot_t next_snapshot; */ -/* mc_snapshot_t current_snapshot; */ + //sleep(1); + + int value; + mc_state_t next_graph_state = NULL; + smx_simcall_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; -/* while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ */ + 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("Current pair : %p (%u interleave)", current_pair, MC_state_interleave_size(current_pair->graph_state)+1); */ -/* //XBT_DEBUG("Visited pairs : %lu", xbt_dynar_length(visited_pairs)); */ + //XBT_INFO("Visited pairs : %lu", xbt_dynar_length(visited_pairs)); + XBT_INFO("Visited pairs : %lu", xbt_dynar_length(visited_pairs_hash)); -/* MC_SET_RAW_MEM; */ -/* current_snapshot = xbt_new0(s_mc_snapshot_t, 1); */ -/* MC_take_snapshot(current_snapshot); */ -/* MC_UNSET_RAW_MEM; */ + if(current_pair->requests > 0){ + + while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ - -/* /\* Debug information *\/ */ -/* if(XBT_LOG_ISENABLED(mc_dfs, xbt_log_priority_debug)){ */ -/* req_str = MC_request_to_string(req, value); */ -/* XBT_DEBUG("Execute: %s", req_str); */ -/* xbt_free(req_str); */ -/* } */ + /* Debug information */ -/* MC_state_set_executed_request(current_pair->graph_state, req, value); */ -/* //mc_stats->executed_transitions++; */ + req_str = MC_request_to_string(req, value); + XBT_INFO("Execute: %s", req_str); + xbt_free(req_str); -/* /\* Answer the request *\/ */ -/* SIMIX_request_pre(req, value); */ + MC_state_set_executed_request(current_pair->graph_state, req, value); -/* /\* Wait for requests (schedules processes) *\/ */ -/* MC_wait_for_requests(); */ + /* Answer the request */ + SIMIX_simcall_pre(req, value); + /* Wait for requests (schedules processes) */ + MC_wait_for_requests(); -/* /\* Create the new expanded graph_state *\/ */ -/* MC_SET_RAW_MEM; */ -/* next_graph_state = MC_state_new(); */ - -/* /\* Get enabled process and insert it in the interleave set of the next graph_state *\/ */ -/* xbt_swag_foreach(process, simix_global->process_list){ */ -/* if(MC_process_is_enabled(process)){ */ -/* MC_state_interleave_process(next_graph_state, process); */ -/* } */ -/* } */ - -/* next_snapshot = xbt_new0(s_mc_snapshot_t, 1); */ -/* MC_take_snapshot(next_snapshot); */ - -/* MC_UNSET_RAW_MEM; */ + MC_SET_RAW_MEM; -/* xbt_dynar_reset(elses); */ -/* xbt_dynar_reset(successors); */ - -/* cursor = 0; */ -/* xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ */ + /* Create the new expanded graph_state */ + next_graph_state = MC_state_pair_new(); -/* res = MC_automaton_evaluate_label(a, transition_succ->label); */ + /* 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_pair = new_pair(next_snapshot,next_graph_state, transition_succ->dst); */ + xbt_dynar_reset(successors); -/* //XBT_DEBUG("Next pair : %p", next_pair); */ - -/* if(res == 1){ // enabled transition in automaton */ -/* xbt_dynar_push(successors, &next_pair); */ -/* //XBT_DEBUG("New Successors length : %lu", xbt_dynar_length(successors)); */ -/* }else{ */ -/* if(res == 2){ */ -/* xbt_dynar_push(elses, &next_pair); */ -/* //XBT_DEBUG("New Elses length : %lu", xbt_dynar_length(elses)); */ -/* } */ -/* } */ - -/* MC_UNSET_RAW_MEM; */ -/* } */ + MC_UNSET_RAW_MEM; - -/* if((xbt_dynar_length(successors) == 0) && (xbt_dynar_length(elses) == 0) ){ */ -/* MC_SET_RAW_MEM; */ -/* next_pair = new_pair(next_snapshot, next_graph_state, current_pair->automaton_state); */ -/* xbt_dynar_push(successors, &next_pair); */ -/* MC_UNSET_RAW_MEM; */ + cursor= 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + + res = MC_automaton_evaluate_label(transition_succ->label); + + if(res == 1){ // enabled transition in automaton + MC_SET_RAW_MEM; + next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state)); + xbt_dynar_push(successors, &next_pair); + MC_UNSET_RAW_MEM; + } + + } + + cursor = 0; + + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + + res = MC_automaton_evaluate_label(transition_succ->label); -/* } */ + if(res == 2){ // true transition in automaton + MC_SET_RAW_MEM; + next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state)); + xbt_dynar_push(successors, &next_pair); + MC_UNSET_RAW_MEM; + } -/* //XBT_DEBUG("Successors length : %lu", xbt_dynar_length(successors)); */ -/* //XBT_DEBUG("Elses length : %lu", xbt_dynar_length(elses)); */ + } -/* if(xbt_dynar_length(successors) > 0){ */ + cursor = 0; + + xbt_dynar_foreach(successors, cursor, pair_succ){ + + 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_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); + exit(0); + + }else{ + + 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); + + 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); + + } + + }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_INFO("Next pair already visited ! "); + + } + + } -/* cursor = 0; */ -/* xbt_dynar_foreach(successors, cursor, pair_succ){ */ -/* MC_SET_RAW_MEM; */ -/* xbt_dynar_push(all_successors, &pair_succ); */ -/* MC_UNSET_RAW_MEM; */ -/* } */ + }else{ + + if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ -/* }else{ */ + 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); -/* cursor = 0; */ -/* xbt_dynar_foreach(elses, cursor, pair_succ){ */ -/* MC_SET_RAW_MEM; */ -/* xbt_dynar_push(all_successors, &pair_succ); */ -/* MC_UNSET_RAW_MEM; */ -/* } */ + search_cycle = 1; -/* } */ + XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); + //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash)); -/* MC_restore_snapshot(current_snapshot); */ -/* MC_UNSET_RAW_MEM; */ - -/* } */ + } -/* //XBT_DEBUG("All successors : %lu", xbt_dynar_length(all_successors)); */ + 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{ -/* cursor = 0; */ + XBT_INFO("Next pair already visited ! "); -/* xbt_dynar_foreach(all_successors, cursor, pair_succ){ */ + } -/* if((search_cycle == 1) && (reached(pair_succ->graph_state, pair_succ->automaton_state) == 1)){ */ -/* XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); */ -/* XBT_INFO("| ACCEPTANCE CYCLE |"); */ -/* XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); */ -/* XBT_INFO("Counter-example that violates formula :"); */ -/* MC_show_snapshot_stack(mc_snapshot_stack); */ -/* MC_dump_snapshot_stack(mc_snapshot_stack); */ -/* exit(0); */ -/* } */ + } + + + /* Restore system before checking others successors */ + if(cursor != (xbt_dynar_length(successors) - 1)) + MC_replay_liveness(mc_stack_liveness, 1); -/* if(visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle) == 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); + } + } -/* //XBT_DEBUG("New pair in stack"); */ -/* MC_SET_RAW_MEM; */ -/* xbt_fifo_unshift(mc_snapshot_stack, pair_succ); */ -/* MC_UNSET_RAW_MEM; */ + }else{ /*No request to execute, search evolution in Büchi automaton */ + + MC_SET_RAW_MEM; + + /* Create the new expanded graph_state */ + next_graph_state = MC_state_pair_new(); + + xbt_dynar_reset(successors); + + MC_UNSET_RAW_MEM; + + + cursor= 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + + res = MC_automaton_evaluate_label(transition_succ->label); + + if(res == 1){ // enabled transition in automaton + MC_SET_RAW_MEM; + next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state)); + xbt_dynar_push(successors, &next_pair); + MC_UNSET_RAW_MEM; + } + + } + + cursor = 0; + + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + + res = MC_automaton_evaluate_label(transition_succ->label); + + if(res == 2){ // true transition in automaton + MC_SET_RAW_MEM; + next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state)); + xbt_dynar_push(successors, &next_pair); + MC_UNSET_RAW_MEM; + } + + } -/* set_pair_visited(pair_succ->graph_state, pair_succ->automaton_state, search_cycle); */ -/* MC_dfs(a, search_cycle, 1); */ + 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_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); + + }else{ + + 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); + + 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); + + } + + }else{ -/* if((search_cycle == 0) && (pair_succ->automaton_state->type == 1)){ */ + 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_INFO("Next pair already visited ! "); + + } + } + + + }else{ -/* set_pair_reached(pair_succ->graph_state, pair_succ->automaton_state); */ -/* XBT_DEBUG("Acceptance pair : graph=%p, automaton=%p(%s)", pair_succ->graph_state, pair_succ->automaton_state, pair_succ->automaton_state->id); */ -/* MC_dfs(a, 1, 1); */ + if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ + + 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(!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_INFO("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_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); + 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; + + + +} + + +#ifdef SIMGRID_TEST + +XBT_TEST_SUITE("mc_liveness", "Model checking liveness properties"); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(mc_liveness); + +XBT_TEST_UNIT("snapshots_comparison", test_compare_snapshot, "Comparison of snapshots") +{ + + MC_SET_RAW_MEM; + + /* Save first snapshot */ + mc_snapshot_t snapshot1 = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(snapshot1); + + /* Save second snapshot */ + mc_snapshot_t snapshot2 = xbt_new0(s_mc_snapshot_t, 1); + MC_take_snapshot_liveness(snapshot2); + + MC_UNSET_RAW_MEM; + + xbt_test_assert(snapshot_compare(snapshot1, snapshot2, std_heap, raw_heap) == 0, "Different consecutive snapshot"); -/* MC_SET_RAW_MEM; */ -/* //remove_pair_reached(current_pair->graph_state); */ -/* xbt_fifo_shift(mc_snapshot_stack); */ -/* XBT_DEBUG("State (graph=%p, automaton =%p) shifted in snapshot_stack", current_pair->graph_state, current_pair->automaton_state); */ -/* MC_UNSET_RAW_MEM; */ -/* } */ +} + +#endif