X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a17be3713cc19ed52774e3a7a5951631e2b345eb..69988d62783d470a4789a45f8c3b09f700140511:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index c0012eeb96..a360a2468d 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -1,774 +1,499 @@ -/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved. */ +/* Copyright (c) 2011-2013 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 reached_pairs; -xbt_dynar_t reached_pairs_hash; +/********* Global variables *********/ + +xbt_dynar_t acceptance_pairs; 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){ +/********* Static functions *********/ - int c; - register unsigned int hash = 5381; +static xbt_dynar_t get_atomic_propositions_values(){ + int res; + int_f_void_t f; + unsigned int cursor = 0; + xbt_automaton_propositional_symbol_t ps = NULL; + xbt_dynar_t values = xbt_dynar_new(sizeof(int), NULL); - while (str_len--) { - c = *str++; - hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ + xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ + f = (int_f_void_t)ps->function; + res = f(); + xbt_dynar_push_as(values, int, res); } - return hash; - + return values; } -int reached(xbt_state_t st){ +static int is_reached_acceptance_pair(mc_pair_t pair){ - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - - - if(xbt_dynar_is_empty(reached_pairs)){ - - return 0; - - }else{ + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + + if(xbt_dynar_is_empty(acceptance_pairs)){ MC_SET_RAW_MEM; - - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn); - - xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL); - int res; - int_f_void_t f; - - /* Get values of propositional symbols */ - 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(prop_ato, int, res); - } - - cursor = 0; - mc_pair_reached_t pair_test = NULL; - - //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) == 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 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"); - } + if(pair->graph_state->system_state == NULL){ + pair->graph_state->system_state = MC_take_snapshot(); + pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap); } - - MC_free_snapshot(sn); - xbt_dynar_reset(prop_ato); - xbt_free(prop_ato); + xbt_dynar_push(acceptance_pairs, &pair); MC_UNSET_RAW_MEM; if(raw_mem_set) MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - - return 0; - - } -} -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; - } + return -1; - if(action1->state != action2->state){ - XBT_INFO("Different state of action"); - return 1; - } + }else{ - 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{ + MC_SET_RAW_MEM; - item_req1 = xbt_fifo_get_first_item(action1->simcalls); - item_req2 = xbt_fifo_get_first_item(action2->simcalls); + if(pair->graph_state->system_state == NULL){ + pair->graph_state->system_state = MC_take_snapshot(); + pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap); + } - while(jsimcalls)){ + size_t current_bytes_used = pair->heap_bytes_used; + int current_nb_processes = pair->nb_processes; - 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; + unsigned int cursor = 0; + int previous_cursor = 0, next_cursor = 0; + int start = 0; + int end = xbt_dynar_length(acceptance_pairs) - 1; + + mc_pair_t pair_test = NULL; + size_t bytes_used_test; + int nb_processes_test; + int same_processes_and_bytes_not_found = 1; + + while(start <= end && same_processes_and_bytes_not_found){ + cursor = (start + end) / 2; + pair_test = (mc_pair_t)xbt_dynar_get_as(acceptance_pairs, cursor, mc_pair_t); + bytes_used_test = pair_test->heap_bytes_used; + nb_processes_test = pair_test->nb_processes; + if(nb_processes_test < current_nb_processes) + start = cursor + 1; + else if(nb_processes_test > current_nb_processes) + end = cursor - 1; + else if(nb_processes_test == current_nb_processes){ + if(bytes_used_test < current_bytes_used) + start = cursor + 1; + else if(bytes_used_test > current_bytes_used) + end = cursor - 1; + else if(bytes_used_test == current_bytes_used){ + same_processes_and_bytes_not_found = 0; + if(xbt_automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){ + if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, pair->atomic_propositions) == 0){ + XBT_DEBUG("Compare with state %d", pair_test->num); + if(snapshot_compare(pair->graph_state->system_state, pair_test->graph_state->system_state) == 0){ + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + return pair_test->num; } - - 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; + /* Search another pair with same number of bytes used in std_heap */ + previous_cursor = cursor - 1; + while(previous_cursor >= 0){ + pair_test = (mc_pair_t)xbt_dynar_get_as(acceptance_pairs, previous_cursor, mc_pair_t); + bytes_used_test = pair_test->heap_bytes_used; + if(bytes_used_test != current_bytes_used) 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; + if(xbt_automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){ + if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, pair->atomic_propositions) == 0){ + XBT_DEBUG("Compare with state %d", pair_test->num); + if(snapshot_compare(pair->graph_state->system_state, pair_test->graph_state->system_state) == 0){ + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + return pair_test->num; + } + } + } + previous_cursor--; + } + next_cursor = cursor + 1; + while(next_cursor < xbt_dynar_length(acceptance_pairs)){ + pair_test = (mc_pair_t)xbt_dynar_get_as(acceptance_pairs, next_cursor, mc_pair_t); + bytes_used_test = pair_test->heap_bytes_used; + if(bytes_used_test != current_bytes_used) 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; + if(xbt_automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){ + if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, pair->atomic_propositions) == 0){ + XBT_DEBUG("Compare with state %d", pair_test->num); + if(snapshot_compare(pair->graph_state->system_state, pair_test->graph_state->system_state) == 0){ + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + return pair_test->num; + } + } + } + next_cursor++; } - - item1 = xbt_fifo_get_next_item(item1); - item2 = xbt_fifo_get_next_item(item2); - i++; } } } - } - - return 0; - -} -void set_pair_reached(xbt_state_t st){ + pair_test = (mc_pair_t)xbt_dynar_get_as(acceptance_pairs, cursor, mc_pair_t); + bytes_used_test = pair_test->heap_bytes_used; - 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); - //pair->rdv_points = xbt_dict_new(); - 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; + if(bytes_used_test < current_bytes_used) + xbt_dynar_insert_at(acceptance_pairs, cursor + 1, &pair); + else + xbt_dynar_insert_at(acceptance_pairs, cursor, &pair); + + + MC_UNSET_RAW_MEM; - xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ - f = (int_f_void_t)ps->function; - res = (*f)(); - xbt_dynar_push_as(pair->prop_ato, int, res); + if(raw_mem_set) + MC_SET_RAW_MEM; + + return -1; + } - - /*xbt_dict_t rdv_points = SIMIX_get_rdv_points(); - - 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); - }*/ - 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){ +static void set_acceptance_pair_reached(mc_pair_t pair){ - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - if(xbt_dynar_is_empty(reached_pairs_hash)){ + if(xbt_dynar_is_empty(acceptance_pairs)){ - return 0; + MC_SET_RAW_MEM; + if(pair->graph_state->system_state == NULL){ + pair->graph_state->system_state = MC_take_snapshot(); + pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap); + } + xbt_dynar_push(acceptance_pairs, &pair); + MC_UNSET_RAW_MEM; }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); + if(pair->graph_state->system_state == NULL){ + pair->graph_state->system_state = MC_take_snapshot(); + pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap); } + + size_t current_bytes_used = pair->heap_bytes_used; + int current_nb_processes = pair->nb_processes; - - /* 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"); + int start = 0; + int end = xbt_dynar_length(acceptance_pairs) - 1; + + mc_pair_t pair_test = NULL; + size_t bytes_used_test = 0; + int nb_processes_test; + + while(start <= end){ + cursor = (start + end) / 2; + pair_test = (mc_pair_t)xbt_dynar_get_as(acceptance_pairs, cursor, mc_pair_t); + bytes_used_test = pair_test->heap_bytes_used; + nb_processes_test = pair_test->nb_processes; + if(nb_processes_test < current_nb_processes) + start = cursor + 1; + if(nb_processes_test > current_nb_processes) + end = cursor - 1; + if(nb_processes_test == current_nb_processes){ + if(bytes_used_test < current_bytes_used) + start = cursor + 1; + if(bytes_used_test > current_bytes_used) + end = cursor - 1; + if(bytes_used_test == current_bytes_used) + break; } - - 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; + if(bytes_used_test < current_bytes_used) + xbt_dynar_insert_at(acceptance_pairs, cursor + 1, &pair); else - MC_UNSET_RAW_MEM; + xbt_dynar_insert_at(acceptance_pairs, cursor, &pair); - return 0; + MC_UNSET_RAW_MEM; } -} -void set_pair_reached_hash(xbt_state_t st){ - - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - - MC_SET_RAW_MEM; + if(raw_mem_set) + 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; +static void remove_acceptance_pair(mc_pair_t pair){ - 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; + mc_pair_t pair_test; + int pair_found = 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_foreach(acceptance_pairs, cursor, pair_test){ + if(pair_test->num == pair->num){ + pair_found = 1; + break; + } } - - xbt_dynar_push(reached_pairs_hash, &pair); - MC_free_snapshot(sn); + if(pair_found) + xbt_dynar_remove_at(acceptance_pairs, cursor, NULL); - MC_UNSET_RAW_MEM; + pair->acceptance_removed = 1; + + if(pair->stack_removed && pair->acceptance_removed){ + if(_sg_mc_visited == 0){ + MC_pair_delete(pair); + }else if(pair->visited_removed){ + MC_pair_delete(pair); + } + } - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - } +static int is_visited_pair(mc_pair_t pair){ -int visited(xbt_state_t st, int sc){ + if(_sg_mc_visited == 0) + return -1; - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + int raw_mem_set = (mmalloc_get_current_heap() == raw_heap); if(xbt_dynar_is_empty(visited_pairs)){ - return 0; - - }else{ - MC_SET_RAW_MEM; - - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn); - - xbt_dynar_t prop_ato = xbt_dynar_new(sizeof(int), NULL); - - /* Get values of propositional symbols */ - unsigned int cursor = 0; - xbt_propositional_symbol_t ps = NULL; - int res; - int_f_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_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); + if(pair->graph_state->system_state == NULL) + pair->graph_state->system_state = MC_take_snapshot(); + xbt_dynar_push(visited_pairs, &pair); MC_UNSET_RAW_MEM; if(raw_mem_set) MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; - - return 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; + return -1; }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); - } - + if(pair->graph_state->system_state == NULL) + pair->graph_state->system_state = MC_take_snapshot(); - /* 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_visited_hash_t pair_test = NULL; + size_t current_bytes_used = pair->heap_bytes_used; + int current_nb_processes = pair->nb_processes; - 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++; + unsigned int cursor = 0; + int previous_cursor = 0, next_cursor = 0; + int start = 0; + int end = xbt_dynar_length(visited_pairs) - 1; + + mc_pair_t pair_test = NULL; + size_t bytes_used_test; + int nb_processes_test; + int same_processes_and_bytes_not_found = 1; + + while(start <= end && same_processes_and_bytes_not_found){ + cursor = (start + end) / 2; + pair_test = (mc_pair_t)xbt_dynar_get_as(visited_pairs, cursor, mc_pair_t); + bytes_used_test = pair_test->heap_bytes_used; + nb_processes_test = pair_test->nb_processes; + if(nb_processes_test < current_nb_processes) + start = cursor + 1; + else if(nb_processes_test > current_nb_processes) + end = cursor - 1; + else if(nb_processes_test == current_nb_processes){ + if(bytes_used_test < current_bytes_used) + start = cursor + 1; + else if(bytes_used_test > current_bytes_used) + end = cursor - 1; + else if(bytes_used_test == current_bytes_used){ + same_processes_and_bytes_not_found = 0; + if(xbt_automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){ + if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, pair->atomic_propositions) == 0){ + if(snapshot_compare(pair->graph_state->system_state, pair_test->graph_state->system_state) == 0){ + if(pair_test->other_num == -1) + pair->other_num = pair_test->num; + else + pair->other_num = pair_test->other_num; + if(dot_output == NULL) + XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", pair->num, pair_test->num); + else + XBT_DEBUG("Pair %d already visited ! (equal to pair %d (pair %d in dot_output))", pair->num, pair_test->num, pair->other_num); + xbt_dynar_remove_at(visited_pairs, cursor, NULL); + xbt_dynar_insert_at(visited_pairs, cursor, &pair); + pair_test->visited_removed = 1; + if(pair_test->stack_removed && pair_test->visited_removed){ + if((pair_test->automaton_state->type == 1) || (pair_test->automaton_state->type == 2)){ + if(pair_test->acceptance_removed){ + MC_pair_delete(pair_test); + } + }else{ + MC_pair_delete(pair_test); + } + } + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + return pair->other_num; } } - 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"); + } + /* Search another pair with same number of bytes used in std_heap */ + previous_cursor = cursor - 1; + while(previous_cursor >= 0){ + pair_test = (mc_pair_t)xbt_dynar_get_as(visited_pairs, previous_cursor, mc_pair_t); + bytes_used_test = pair_test->heap_bytes_used; + if(bytes_used_test != current_bytes_used) + break; + if(xbt_automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){ + if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, pair->atomic_propositions) == 0){ + if(snapshot_compare(pair->graph_state->system_state, pair_test->graph_state->system_state) == 0){ + if(pair_test->other_num == -1) + pair->other_num = pair_test->num; + else + pair->other_num = pair_test->other_num; + if(dot_output == NULL) + XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", pair->num, pair_test->num); + else + XBT_DEBUG("Pair %d already visited ! (equal to pair %d (pair %d in dot_output))", pair->num, pair_test->num, pair->other_num); + xbt_dynar_remove_at(visited_pairs, previous_cursor, NULL); + xbt_dynar_insert_at(visited_pairs, previous_cursor, &pair); + pair_test->visited_removed = 1; + if(pair_test->stack_removed && pair_test->visited_removed){ + if((pair_test->automaton_state->type == 1) || (pair_test->automaton_state->type == 2)){ + if(pair_test->acceptance_removed){ + MC_pair_delete(pair_test); + } + }else{ + MC_pair_delete(pair_test); + } + } + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + return pair->other_num; + } + } + } + previous_cursor--; + } + next_cursor = cursor + 1; + while(next_cursor < xbt_dynar_length(visited_pairs)){ + pair_test = (mc_pair_t)xbt_dynar_get_as(visited_pairs, next_cursor, mc_pair_t); + bytes_used_test = pair_test->heap_bytes_used; + if(bytes_used_test != current_bytes_used) + break; + if(xbt_automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){ + if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, pair->atomic_propositions) == 0){ + if(snapshot_compare(pair->graph_state->system_state, pair_test->graph_state->system_state) == 0){ + if(pair_test->other_num == -1) + pair->other_num = pair_test->num; + else + pair->other_num = pair_test->other_num; + if(dot_output == NULL) + XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", pair->num, pair_test->num); + else + XBT_DEBUG("Pair %d already visited ! (equal to pair %d (pair %d in dot_output))", pair->num, pair_test->num, pair->other_num); + xbt_dynar_remove_at(visited_pairs, next_cursor, NULL); + xbt_dynar_insert_at(visited_pairs, next_cursor, &pair); + pair_test->visited_removed = 1; + if(pair_test->stack_removed && pair_test->visited_removed){ + if((pair_test->automaton_state->type == 1) || (pair_test->automaton_state->type == 2)){ + if(pair_test->acceptance_removed){ + MC_pair_delete(pair_test); + } + }else{ + MC_pair_delete(pair_test); + } + } + if(raw_mem_set) + MC_SET_RAW_MEM; + else + MC_UNSET_RAW_MEM; + return pair->other_num; + } + } } - }else{ - //XBT_INFO("Different values of propositional symbols"); + next_cursor++; } - }else{ - //XBT_INFO("Different automaton state"); } - }else{ - //XBT_INFO("Different value of search_cycle"); } + } + + pair_test = (mc_pair_t)xbt_dynar_get_as(visited_pairs, cursor, mc_pair_t); + bytes_used_test = pair_test->heap_bytes_used; + + if(bytes_used_test < current_bytes_used) + xbt_dynar_insert_at(visited_pairs, cursor + 1, &pair); + else + xbt_dynar_insert_at(visited_pairs, cursor, &pair); + + if(xbt_dynar_length(visited_pairs) > _sg_mc_visited){ + int min = mc_stats->expanded_states; + unsigned int cursor2 = 0; + unsigned int index = 0; + xbt_dynar_foreach(visited_pairs, cursor2, pair_test){ + if(pair_test->num < min){ + index = cursor2; + min = pair_test->num; + } + } + xbt_dynar_remove_at(visited_pairs, index, &pair_test); + pair_test->visited_removed = 1; + if(pair_test->stack_removed && pair_test->acceptance_removed && pair_test->visited_removed) + MC_pair_delete(pair_test); - 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_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; - - 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; + return -1; - 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); + } - - -int MC_automaton_evaluate_label(xbt_exp_label_t l){ +static int MC_automaton_evaluate_label(xbt_automaton_exp_label_t l, xbt_dynar_t atomic_propositions_values){ switch(l->type){ case 0 : { - int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp); - int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp); + int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp, atomic_propositions_values); + int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp, atomic_propositions_values); return (left_res || right_res); } case 1 : { - int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp); - int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp); + int left_res = MC_automaton_evaluate_label(l->u.or_and.left_exp, atomic_propositions_values); + int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp, atomic_propositions_values); return (left_res && right_res); } case 2 : { - int res = MC_automaton_evaluate_label(l->u.exp_not); + int res = MC_automaton_evaluate_label(l->u.exp_not, atomic_propositions_values); return (!res); } case 3 : { unsigned int cursor = 0; - xbt_propositional_symbol_t p = NULL; - int_f_void_t f; + xbt_automaton_propositional_symbol_t p = NULL; xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, p){ - if(strcmp(p->pred, l->u.predicat) == 0){ - f = (int_f_void_t)p->function; - return (*f)(); - } + if(strcmp(p->pred, l->u.predicat) == 0) + return (int)xbt_dynar_get_as(atomic_propositions_values, cursor, int); } return -1; } @@ -781,101 +506,103 @@ int MC_automaton_evaluate_label(xbt_exp_label_t l){ } -/********************* Double-DFS stateless *******************/ +/********* DDFS Algorithm *********/ -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){ - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); + initial_state_liveness->raw_mem_set = (mmalloc_get_current_heap() == raw_heap); - XBT_INFO("**************************************************"); - XBT_INFO("Double-DFS init"); - XBT_INFO("**************************************************"); + XBT_DEBUG("**************************************************"); + XBT_DEBUG("Double-DFS init"); + XBT_DEBUG("**************************************************"); - mc_pair_stateless_t mc_initial_pair = NULL; - mc_state_t initial_graph_state = NULL; + mc_pair_t initial_pair = 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); + acceptance_pairs = xbt_dynar_new(sizeof(mc_pair_t), NULL); + visited_pairs = xbt_dynar_new(sizeof(mc_pair_t), NULL); + successors = xbt_dynar_new(sizeof(mc_pair_t), NULL); - /* Save the initial state */ - initial_snapshot_liveness = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(initial_snapshot_liveness); + initial_state_liveness->snapshot = MC_take_snapshot(); + initial_state_liveness->prev_pair = 0; MC_UNSET_RAW_MEM; - + unsigned int cursor = 0; - xbt_state_t state; + xbt_automaton_state_t automaton_state; - xbt_dynar_foreach(_mc_property_automaton->states, cursor, state){ - if(state->type == -1){ + xbt_dynar_foreach(_mc_property_automaton->states, cursor, automaton_state){ + if(automaton_state->type == -1){ /* Initial automaton state */ 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); + + initial_pair = MC_pair_new(); + initial_pair->automaton_state = automaton_state; + initial_pair->graph_state = MC_state_new(); + initial_pair->atomic_propositions = get_atomic_propositions_values(); + + /* Get enabled process and insert it in the interleave set of the graph_state */ + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ + MC_state_interleave_process(initial_pair->graph_state, process); + } + } + + initial_pair->requests = MC_state_interleave_size(initial_pair->graph_state); + initial_pair->search_cycle = 0; + + xbt_fifo_unshift(mc_stack_liveness, initial_pair); + MC_UNSET_RAW_MEM; + MC_ddfs(); + if(cursor != 0){ - MC_restore_snapshot(initial_snapshot_liveness); + MC_restore_snapshot(initial_state_liveness->snapshot); MC_UNSET_RAW_MEM; } - - MC_ddfs(0); - - }else{ - if(state->type == 2){ - MC_SET_RAW_MEM; - mc_initial_pair = new_pair_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); + }else if(automaton_state->type == 2){ /* Acceptance automaton state */ + + MC_SET_RAW_MEM; - if(cursor != 0){ - MC_restore_snapshot(initial_snapshot_liveness); - MC_UNSET_RAW_MEM; + initial_pair = MC_pair_new(); + initial_pair->automaton_state = automaton_state; + initial_pair->graph_state = MC_state_new(); + initial_pair->atomic_propositions = get_atomic_propositions_values(); + + /* Get enabled process and insert it in the interleave set of the graph_state */ + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ + MC_state_interleave_process(initial_pair->graph_state, process); } + } + + initial_pair->requests = MC_state_interleave_size(initial_pair->graph_state); + initial_pair->search_cycle = 1; + + xbt_fifo_unshift(mc_stack_liveness, initial_pair); + + MC_UNSET_RAW_MEM; + + set_acceptance_pair_reached(initial_pair); - MC_ddfs(1); - + MC_ddfs(); + + if(cursor != 0){ + MC_restore_snapshot(initial_state_liveness->snapshot); + MC_UNSET_RAW_MEM; } } } - if(raw_mem_set) + if(initial_state_liveness->raw_mem_set) MC_SET_RAW_MEM; else MC_UNSET_RAW_MEM; @@ -884,387 +611,350 @@ void MC_ddfs_init(void){ } -void MC_ddfs(int search_cycle){ - - raw_mem_set = (mmalloc_get_current_heap() == raw_heap); +void MC_ddfs(){ smx_process_t process; - mc_pair_stateless_t current_pair = NULL; + mc_pair_t current_pair = NULL; if(xbt_fifo_size(mc_stack_liveness) == 0) return; - /* Get current pair */ - current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness)); + current_pair = (mc_pair_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness)); /* Update current state in buchi automaton */ _mc_property_automaton->current_state = current_pair->automaton_state; + XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), current_pair->search_cycle); - 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++; - - //sleep(1); + mc_stats->visited_pairs++; int value; - mc_state_t next_graph_state = NULL; smx_simcall_t req = NULL; char *req_str; - xbt_transition_t transition_succ; + xbt_automaton_transition_t transition_succ; unsigned int cursor = 0; int res; + int reached_num, visited_num; - mc_pair_stateless_t next_pair = NULL; - mc_pair_stateless_t pair_succ; + mc_pair_t next_pair = NULL; + xbt_dynar_t prop_values = 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_INFO("Visited pairs : %lu", xbt_dynar_length(visited_pairs)); - //XBT_INFO("Visited pairs : %lu", xbt_dynar_length(visited_pairs_hash)); + if(xbt_fifo_size(mc_stack_liveness) < _sg_mc_max_depth){ if(current_pair->requests > 0){ - while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ - - /* Debug information */ + if(current_pair->search_cycle){ - req_str = MC_request_to_string(req, value); - XBT_INFO("Execute: %s", req_str); - xbt_free(req_str); - - MC_state_set_executed_request(current_pair->graph_state, req, value); - - /* Answer the request */ - SIMIX_simcall_pre(req, value); - - /* Wait for requests (schedules processes) */ - MC_wait_for_requests(); - - - MC_SET_RAW_MEM; + if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){ + + if((reached_num = is_reached_acceptance_pair(current_pair)) != -1){ + + XBT_INFO("Pair %d already reached (equal to pair %d) !", current_pair->num, reached_num); + + MC_SET_RAW_MEM; + xbt_fifo_shift(mc_stack_liveness); + if(dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_state_liveness->prev_pair, reached_num, initial_state_liveness->prev_req); + MC_UNSET_RAW_MEM; - /* Create the new expanded graph_state */ - next_graph_state = MC_state_pair_new(); + 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(mc_stats); + xbt_abort(); - /* Get enabled process and insert it in the interleave set of the next graph_state */ - xbt_swag_foreach(process, simix_global->process_list){ - if(MC_process_is_enabled(process)){ - MC_state_interleave_process(next_graph_state, process); } } + } - xbt_dynar_reset(successors); + if((visited_num = is_visited_pair(current_pair)) != -1){ + MC_SET_RAW_MEM; + if(dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_state_liveness->prev_pair, visited_num, initial_state_liveness->prev_req); MC_UNSET_RAW_MEM; + + + }else{ + while((req = MC_state_get_request(current_pair->graph_state, &value)) != NULL){ - 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; + MC_SET_RAW_MEM; + if(dot_output != NULL){ + if(initial_state_liveness->prev_pair != 0 && initial_state_liveness->prev_pair != current_pair->num){ + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_state_liveness->prev_pair, current_pair->num, initial_state_liveness->prev_req); + xbt_free(initial_state_liveness->prev_req); + } + initial_state_liveness->prev_pair = current_pair->num; } + 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; + /* 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); } - } - - cursor = 0; - - xbt_dynar_foreach(successors, cursor, pair_succ){ - - if(search_cycle == 1){ + MC_SET_RAW_MEM; + if(dot_output != NULL){ + initial_state_liveness->prev_req = MC_request_get_dot_output(req, value); + if(current_pair->search_cycle) + fprintf(dot_output, "%d [shape=doublecircle];\n", current_pair->num); + } + MC_UNSET_RAW_MEM; + + MC_state_set_executed_request(current_pair->graph_state, req, value); + mc_stats->executed_transitions++; - if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ + /* Answer the request */ + SIMIX_simcall_pre(req, value); - 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)); + /* Wait for requests (schedules processes) */ + MC_wait_for_requests(); - 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); + MC_SET_RAW_MEM; + prop_values = get_atomic_propositions_values(); + MC_UNSET_RAW_MEM; + + /* Evaluate enabled transition according to atomic propositions values */ + cursor= 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - }else{ + res = MC_automaton_evaluate_label(transition_succ->label, prop_values); - 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); + if(res == 1){ // enabled transition in automaton - 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; - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); + next_pair = MC_pair_new(); + next_pair->graph_state = MC_state_new(); + next_pair->automaton_state = transition_succ->dst; + next_pair->atomic_propositions = get_atomic_propositions_values(); + /* Get enabled process and insert it in the interleave set of the next graph_state */ + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ + MC_state_interleave_process(next_pair->graph_state, process); + } } - }else{ + next_pair->requests = MC_state_interleave_size(next_pair->graph_state); + + if(next_pair->automaton_state->type == 1 || next_pair->automaton_state->type == 2 || current_pair->search_cycle) + next_pair->search_cycle = 1; + + xbt_fifo_unshift(mc_stack_liveness, next_pair); - //if(!visited_hash(pair_succ->automaton_state, search_cycle)){ - //if(!visited(pair_succ->automaton_state, search_cycle)){ - - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); - - /*}else{ + if(mc_stats->expanded_pairs%1000000 == 0) + XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs); - XBT_INFO("Next pair already visited ! "); + MC_UNSET_RAW_MEM; + + MC_ddfs(); - }*/ - } - }else{ - - if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ + } - 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); + /* Then, evaluate true transitions (always true, whatever atomic propositions values) */ + cursor = 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - set_pair_reached(pair_succ->automaton_state); - //set_pair_reached_hash(pair_succ->automaton_state); - - search_cycle = 1; + res = MC_automaton_evaluate_label(transition_succ->label, prop_values); + + if(res == 2){ // true transition in automaton + + MC_SET_RAW_MEM; + + next_pair = MC_pair_new(); + next_pair->graph_state = MC_state_new(); + next_pair->automaton_state = transition_succ->dst; + next_pair->atomic_propositions = get_atomic_propositions_values(); + + /* Get enabled process and insert it in the interleave set of the next graph_state */ + xbt_swag_foreach(process, simix_global->process_list){ + if(MC_process_is_enabled(process)){ + MC_state_interleave_process(next_pair->graph_state, process); + } + } - XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs)); - //XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs_hash)); + next_pair->requests = MC_state_interleave_size(next_pair->graph_state); + + if(next_pair->automaton_state->type == 1 || next_pair->automaton_state->type == 2 || current_pair->search_cycle) + next_pair->search_cycle = 1; - } + xbt_fifo_unshift(mc_stack_liveness, next_pair); - //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); + if(mc_stats->expanded_pairs%1000000 == 0) + XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs); + MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); - - /*}else{ - XBT_INFO("Next pair already visited ! "); + MC_ddfs(); - }*/ + } } - - /* Restore system before checking others successors */ - if(cursor != (xbt_dynar_length(successors) - 1)) - MC_replay_liveness(mc_stack_liveness, 1); - - + if(MC_state_interleave_size(current_pair->graph_state) > 0){ + XBT_DEBUG("Backtracking to depth %d", xbt_fifo_size(mc_stack_liveness)); + MC_replay_liveness(mc_stack_liveness, 0); + } + } - 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{ /*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; - + }else{ - cursor= 0; - xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ + mc_stats->executed_transitions++; + + XBT_DEBUG("No request to execute in this state, search evolution in Büchi Automaton."); - res = MC_automaton_evaluate_label(transition_succ->label); + if(current_pair->search_cycle){ - if(res == 1){ // enabled transition in automaton - MC_SET_RAW_MEM; - next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state)); - xbt_dynar_push(successors, &next_pair); - MC_UNSET_RAW_MEM; - } + if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){ + + if((reached_num = is_reached_acceptance_pair(current_pair)) != -1){ + + XBT_INFO("Pair %d already reached (equal to pair %d) !", current_pair->num, reached_num); + + MC_SET_RAW_MEM; + xbt_fifo_shift(mc_stack_liveness); + MC_UNSET_RAW_MEM; - } + 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(mc_stats); + xbt_abort(); - cursor = 0; - - xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - - res = MC_automaton_evaluate_label(transition_succ->label); - - if(res == 2){ // true transition in automaton - MC_SET_RAW_MEM; - next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state)); - xbt_dynar_push(successors, &next_pair); - MC_UNSET_RAW_MEM; + } } - } - cursor = 0; - - xbt_dynar_foreach(successors, cursor, pair_succ){ + if((visited_num = is_visited_pair(current_pair)) != -1){ - if(search_cycle == 1){ + XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", current_pair->num, visited_num); + + }else{ + + MC_SET_RAW_MEM; + prop_values = get_atomic_propositions_values(); + MC_UNSET_RAW_MEM; - if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){ + /* Evaluate enabled transition according to atomic propositions values */ + cursor= 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - if(reached(pair_succ->automaton_state)){ - //if(reached_hash(pair_succ->automaton_state)){ + res = MC_automaton_evaluate_label(transition_succ->label, prop_values); - 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)); + if(res == 1){ // enabled transition in automaton - MC_SET_RAW_MEM; - xbt_fifo_unshift(mc_stack_liveness, pair_succ); - MC_UNSET_RAW_MEM; - - MC_ddfs(search_cycle); + MC_SET_RAW_MEM; - } + next_pair = MC_pair_new(); + next_pair->graph_state = MC_state_new(); + next_pair->automaton_state = transition_succ->dst; + next_pair->atomic_propositions = get_atomic_propositions_values(); + next_pair->requests = MC_state_interleave_size(next_pair->graph_state); + + if(next_pair->automaton_state->type == 1 || next_pair->automaton_state->type == 2 || current_pair->search_cycle) + next_pair->search_cycle = 1; + + xbt_fifo_unshift(mc_stack_liveness, next_pair); - }else{ + if(mc_stats->expanded_pairs%1000 == 0) + XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs); - //if(!visited_hash(pair_succ->automaton_state, search_cycle)){ - //if(!visited(pair_succ->automaton_state, search_cycle)){ + if(dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", current_pair->num, next_pair->num, ""); - 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 ! "); + MC_ddfs(); - }*/ } - - }else{ + } + + /* Then, evaluate true transitions (always true, whatever atomic propositions values) */ + cursor = 0; + xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){ - if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){ + res = MC_automaton_evaluate_label(transition_succ->label, prop_values); + + if(res == 2){ // true transition in automaton - set_pair_reached(pair_succ->automaton_state); - //set_pair_reached_hash(pair_succ->automaton_state); + MC_SET_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)); + next_pair = MC_pair_new(); + next_pair->graph_state = MC_state_new(); + next_pair->automaton_state = transition_succ->dst; + next_pair->atomic_propositions = get_atomic_propositions_values(); + next_pair->requests = MC_state_interleave_size(next_pair->graph_state); + + if(next_pair->automaton_state->type == 1 || next_pair->automaton_state->type == 2 || current_pair->search_cycle) + next_pair->search_cycle = 1; - } + xbt_fifo_unshift(mc_stack_liveness, next_pair); - //if(!visited_hash(pair_succ->automaton_state, search_cycle)){ - //if(!visited(pair_succ->automaton_state, search_cycle)){ + if(mc_stats->expanded_pairs%1000 == 0) + XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs); + + if(dot_output != NULL) + fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", current_pair->num, next_pair->num, ""); - 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 ! "); + MC_ddfs(); - }*/ + } } - - /* 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"); - + XBT_WARN("/!\\ Max depth reached ! /!\\ "); + if(MC_state_interleave_size(current_pair->graph_state) > 0){ + XBT_WARN("/!\\ But, there are still processes to interleave. Model-checker will not be able to ensure the soundness of the verification from now. /!\\ "); + if(_sg_mc_max_depth == 1000) + XBT_WARN("Notice : the default value of max depth is 1000 but you can change it with cfg=model-check/max_depth:value."); + } + } - 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) ); + if(xbt_fifo_size(mc_stack_liveness) == _sg_mc_max_depth ){ + XBT_DEBUG("Pair %d (depth = %d) shifted in stack, maximum depth reached", current_pair->num, 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) ); + XBT_DEBUG("Pair %d (depth = %d) shifted in stack", current_pair->num, 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); + xbt_dynar_free(&prop_values); + current_pair = xbt_fifo_shift(mc_stack_liveness); + current_pair->stack_removed = 1; + if(current_pair->search_cycle){ + remove_acceptance_pair(current_pair); + }else{ + if(_sg_mc_visited == 0) + MC_pair_delete(current_pair); + else if(current_pair->visited_removed) + MC_pair_delete(current_pair); } - MC_UNSET_RAW_MEM; - if(raw_mem_set) - MC_SET_RAW_MEM; - else - MC_UNSET_RAW_MEM; + MC_UNSET_RAW_MEM; }