/********* Static functions *********/
-static mc_acceptance_pair_t acceptance_pair_new(int num, xbt_automaton_state_t as){
-
- mc_acceptance_pair_t new_pair = NULL;
- new_pair = xbt_new0(s_mc_acceptance_pair_t, 1);
- new_pair->num = num;
- new_pair->automaton_state = as;
- new_pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
- new_pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap);
- new_pair->nb_processes = xbt_swag_size(simix_global->process_list);
- new_pair->system_state = MC_take_snapshot();
-
- /* Get values of propositional symbols */
+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);
+
xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
f = (int_f_void_t)ps->function;
res = f();
- xbt_dynar_push_as(new_pair->prop_ato, int, res);
+ xbt_dynar_push_as(values, int, res);
}
- return new_pair;
-
+ return values;
}
-static int is_reached_acceptance_pair(int num, xbt_automaton_state_t as){
+static int is_reached_acceptance_pair(mc_pair_t pair){
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
-
- MC_SET_RAW_MEM;
- mc_acceptance_pair_t new_pair = acceptance_pair_new(num, as);
- MC_UNSET_RAW_MEM;
-
+
if(xbt_dynar_is_empty(acceptance_pairs)){
MC_SET_RAW_MEM;
- xbt_dynar_push(acceptance_pairs, &new_pair);
+ 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;
if(raw_mem_set)
}else{
MC_SET_RAW_MEM;
-
- size_t current_bytes_used = new_pair->heap_bytes_used;
- int current_nb_processes = new_pair->nb_processes;
+
+ 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;
unsigned int cursor = 0;
int previous_cursor = 0, next_cursor = 0;
int start = 0;
int end = xbt_dynar_length(acceptance_pairs) - 1;
- mc_acceptance_pair_t pair_test = NULL;
+ 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_acceptance_pair_t)xbt_dynar_get_as(acceptance_pairs, cursor, mc_acceptance_pair_t);
+ 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)
+ else if(nb_processes_test > current_nb_processes)
end = cursor - 1;
- if(nb_processes_test == current_nb_processes){
+ else if(nb_processes_test == current_nb_processes){
if(bytes_used_test < current_bytes_used)
start = cursor + 1;
- if(bytes_used_test > current_bytes_used)
+ else if(bytes_used_test > current_bytes_used)
end = cursor - 1;
- if(bytes_used_test == current_bytes_used){
+ else if(bytes_used_test == current_bytes_used){
same_processes_and_bytes_not_found = 0;
- if(xbt_automaton_state_compare(pair_test->automaton_state, as) == 0){
- if(xbt_automaton_propositional_symbols_compare_value(pair_test->prop_ato, new_pair->prop_ato) == 0){
- if(snapshot_compare(new_pair->system_state, pair_test->system_state) == 0){
+ if(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(raw_mem_set)
MC_SET_RAW_MEM;
else
/* Search another pair with same number of bytes used in std_heap */
previous_cursor = cursor - 1;
while(previous_cursor >= 0){
- pair_test = (mc_acceptance_pair_t)xbt_dynar_get_as(acceptance_pairs, previous_cursor, mc_acceptance_pair_t);
- bytes_used_test = pair_test->system_state->heap_bytes_used;
+ 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;
- if(xbt_automaton_state_compare(pair_test->automaton_state, as) == 0){
- if(xbt_automaton_propositional_symbols_compare_value(pair_test->prop_ato, new_pair->prop_ato) == 0){
- if(snapshot_compare(new_pair->system_state, pair_test->system_state) == 0){
+ if(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(raw_mem_set)
MC_SET_RAW_MEM;
else
}
next_cursor = cursor + 1;
while(next_cursor < xbt_dynar_length(acceptance_pairs)){
- pair_test = (mc_acceptance_pair_t)xbt_dynar_get_as(acceptance_pairs, next_cursor, mc_acceptance_pair_t);
- bytes_used_test = pair_test->system_state->heap_bytes_used;
+ 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;
- if(xbt_automaton_state_compare(pair_test->automaton_state, as) == 0){
- if(xbt_automaton_propositional_symbols_compare_value(pair_test->prop_ato, new_pair->prop_ato) == 0){
- if(snapshot_compare(new_pair->system_state, pair_test->system_state) == 0){
+ if(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(raw_mem_set)
MC_SET_RAW_MEM;
else
}
}
- pair_test = (mc_acceptance_pair_t)xbt_dynar_get_as(acceptance_pairs, cursor, mc_acceptance_pair_t);
+ pair_test = (mc_pair_t)xbt_dynar_get_as(acceptance_pairs, cursor, mc_pair_t);
bytes_used_test = pair_test->heap_bytes_used;
if(bytes_used_test < current_bytes_used)
- xbt_dynar_insert_at(acceptance_pairs, cursor + 1, &new_pair);
+ xbt_dynar_insert_at(acceptance_pairs, cursor + 1, &pair);
else
- xbt_dynar_insert_at(acceptance_pairs, cursor, &new_pair);
+ xbt_dynar_insert_at(acceptance_pairs, cursor, &pair);
+
MC_UNSET_RAW_MEM;
}
-static void set_acceptance_pair_reached(int num, xbt_automaton_state_t as){
+static void set_acceptance_pair_reached(mc_pair_t pair){
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
-
- MC_SET_RAW_MEM;
- mc_acceptance_pair_t new_pair = acceptance_pair_new(num, as);
- MC_UNSET_RAW_MEM;
if(xbt_dynar_is_empty(acceptance_pairs)){
MC_SET_RAW_MEM;
- xbt_dynar_push(acceptance_pairs, &new_pair);
+ 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;
+
+ 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 = new_pair->heap_bytes_used;
- int current_nb_processes = new_pair->nb_processes;
+ size_t current_bytes_used = pair->heap_bytes_used;
+ int current_nb_processes = pair->nb_processes;
unsigned int cursor = 0;
int start = 0;
int end = xbt_dynar_length(acceptance_pairs) - 1;
- mc_acceptance_pair_t pair_test = NULL;
- size_t bytes_used_test;
+ 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_acceptance_pair_t)xbt_dynar_get_as(acceptance_pairs, cursor, mc_acceptance_pair_t);
+ 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)
}
if(bytes_used_test < current_bytes_used)
- xbt_dynar_insert_at(acceptance_pairs, cursor + 1, &new_pair);
+ xbt_dynar_insert_at(acceptance_pairs, cursor + 1, &pair);
else
- xbt_dynar_insert_at(acceptance_pairs, cursor, &new_pair);
+ xbt_dynar_insert_at(acceptance_pairs, cursor, &pair);
MC_UNSET_RAW_MEM;
}
-static void remove_acceptance_pair(int num_pair){
+static void remove_acceptance_pair(mc_pair_t pair){
unsigned int cursor = 0;
- mc_acceptance_pair_t current_pair;
+ mc_pair_t pair_test;
+ int pair_found = 0;
- xbt_dynar_foreach(acceptance_pairs, cursor, current_pair){
- if(current_pair->num == num_pair)
+ xbt_dynar_foreach(acceptance_pairs, cursor, pair_test){
+ if(pair_test->num == pair->num){
+ pair_found = 1;
break;
+ }
}
-
- xbt_dynar_remove_at(acceptance_pairs, cursor, NULL);
-
-}
-
-static mc_visited_pair_t visited_pair_new(int num, xbt_automaton_state_t as){
- mc_visited_pair_t new_pair = NULL;
- new_pair = xbt_new0(s_mc_visited_pair_t, 1);
- new_pair->automaton_state = as;
- new_pair->num = num;
- new_pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
- new_pair->heap_bytes_used = mmalloc_get_bytes_used(std_heap);
- new_pair->nb_processes = xbt_swag_size(simix_global->process_list);
- new_pair->system_state = MC_take_snapshot();
+ if(pair_found)
+ xbt_dynar_remove_at(acceptance_pairs, cursor, NULL);
- /* Get values of propositional symbols */
- int res;
- int_f_void_t f;
- unsigned int cursor = 0;
- xbt_automaton_propositional_symbol_t ps = NULL;
- xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
- f = (int_f_void_t)ps->function;
- res = f();
- xbt_dynar_push_as(new_pair->prop_ato, int, res);
- }
+ pair->acceptance_removed = 1;
- return new_pair;
+ 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);
+ }
+ }
}
-static int is_visited_pair(int num, xbt_automaton_state_t as){
+static int is_visited_pair(mc_pair_t pair){
if(_sg_mc_visited == 0)
return -1;
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
- MC_SET_RAW_MEM;
- mc_visited_pair_t new_pair = visited_pair_new(num, as);
- MC_UNSET_RAW_MEM;
-
if(xbt_dynar_is_empty(visited_pairs)){
MC_SET_RAW_MEM;
- xbt_dynar_push(visited_pairs, &new_pair);
+ 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)
}else{
MC_SET_RAW_MEM;
+
+ if(pair->graph_state->system_state == NULL)
+ pair->graph_state->system_state = MC_take_snapshot();
- size_t current_bytes_used = new_pair->heap_bytes_used;
- int current_nb_processes = new_pair->nb_processes;
+ size_t current_bytes_used = pair->heap_bytes_used;
+ int current_nb_processes = pair->nb_processes;
unsigned int cursor = 0;
int previous_cursor = 0, next_cursor = 0;
int start = 0;
int end = xbt_dynar_length(visited_pairs) - 1;
- mc_visited_pair_t pair_test = NULL;
+ mc_pair_t pair_test = NULL;
size_t bytes_used_test;
int nb_processes_test;
int same_processes_and_bytes_not_found = 1;
+ int result;
while(start <= end && same_processes_and_bytes_not_found){
cursor = (start + end) / 2;
- pair_test = (mc_visited_pair_t)xbt_dynar_get_as(visited_pairs, cursor, mc_visited_pair_t);
+ 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;
- if(nb_processes_test > current_nb_processes)
+ else if(nb_processes_test > current_nb_processes)
end = cursor - 1;
- if(nb_processes_test == current_nb_processes){
+ else if(nb_processes_test == current_nb_processes){
if(bytes_used_test < current_bytes_used)
start = cursor + 1;
- if(bytes_used_test > current_bytes_used)
+ else if(bytes_used_test > current_bytes_used)
end = cursor - 1;
- if(bytes_used_test == current_bytes_used){
+ else if(bytes_used_test == current_bytes_used){
same_processes_and_bytes_not_found = 0;
- if(xbt_automaton_state_compare(pair_test->automaton_state, as) == 0){
- if(xbt_automaton_propositional_symbols_compare_value(pair_test->prop_ato, new_pair->prop_ato) == 0){
- if(snapshot_compare(new_pair->system_state, pair_test->system_state) == 0){
+ if(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){
xbt_dynar_remove_at(visited_pairs, cursor, NULL);
- xbt_dynar_insert_at(visited_pairs, cursor, &new_pair);
- XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", new_pair->num, pair_test->num);
+ xbt_dynar_insert_at(visited_pairs, cursor, &pair);
+ pair_test->visited_removed = 1;
+ result = pair_test->num;
+ 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_test->num;
+ return result;
}
}
}
/* Search another pair with same number of bytes used in std_heap */
previous_cursor = cursor - 1;
while(previous_cursor >= 0){
- pair_test = (mc_visited_pair_t)xbt_dynar_get_as(visited_pairs, previous_cursor, mc_visited_pair_t);
- bytes_used_test = pair_test->system_state->heap_bytes_used;
+ 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, as) == 0){
- if(xbt_automaton_propositional_symbols_compare_value(pair_test->prop_ato, new_pair->prop_ato) == 0){
- if(snapshot_compare(new_pair->system_state, pair_test->system_state) == 0){
+ if(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){
xbt_dynar_remove_at(visited_pairs, previous_cursor, NULL);
- xbt_dynar_insert_at(visited_pairs, previous_cursor, &new_pair);
- XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", new_pair->num, pair_test->num);
+ xbt_dynar_insert_at(visited_pairs, previous_cursor, &pair);
+ pair_test->visited_removed = 1;
+ result = pair_test->num;
+ 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_test->num;
+ return result;
}
}
}
}
next_cursor = cursor + 1;
while(next_cursor < xbt_dynar_length(visited_pairs)){
- pair_test = (mc_visited_pair_t)xbt_dynar_get_as(visited_pairs, next_cursor, mc_visited_pair_t);
- bytes_used_test = pair_test->system_state->heap_bytes_used;
+ 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, as) == 0){
- if(xbt_automaton_propositional_symbols_compare_value(pair_test->prop_ato, new_pair->prop_ato) == 0){
- if(snapshot_compare(new_pair->system_state, pair_test->system_state) == 0){
+ if(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){
xbt_dynar_remove_at(visited_pairs, next_cursor, NULL);
- xbt_dynar_insert_at(visited_pairs, next_cursor, &new_pair);
- XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", new_pair->num, pair_test->num);
+ xbt_dynar_insert_at(visited_pairs, next_cursor, &pair);
+ pair_test->visited_removed = 1;
+ result = pair_test->num;
+ 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_test->num;
+ return result;
}
}
}
}
}
- pair_test = (mc_visited_pair_t)xbt_dynar_get_as(visited_pairs, cursor, mc_visited_pair_t);
+ 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, &new_pair);
+ xbt_dynar_insert_at(visited_pairs, cursor + 1, &pair);
else
- xbt_dynar_insert_at(visited_pairs, cursor, &new_pair);
+ xbt_dynar_insert_at(visited_pairs, cursor, &pair);
if(xbt_dynar_length(visited_pairs) > _sg_mc_visited){
int min = mc_stats->expanded_states;
min = pair_test->num;
}
}
- xbt_dynar_remove_at(visited_pairs, index, NULL);
+ 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);
+
}
- /*cursor = 0;
- xbt_dynar_foreach(visited_pairs, cursor, pair_test){
- fprintf(stderr, "Visited pair %d, nb_processes %d and heap_bytes_used %zu\n", pair_test->num, pair_test->nb_processes, pair_test->heap_bytes_used);
- }*/
-
MC_UNSET_RAW_MEM;
if(raw_mem_set)
}
-static int MC_automaton_evaluate_label(xbt_automaton_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_automaton_propositional_symbol_t p = NULL;
- int_f_void_t f;
xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, p){
- if(strcmp(p->pred, l->u.predicat) == 0){
- f = (int_f_void_t)p->function;
- return f();
- }
+ if(strcmp(p->pred, l->u.predicat) == 0)
+ return (int)xbt_dynar_get_as(atomic_propositions_values, cursor, int);
}
return -1;
}
}
-/********* Free functions *********/
-
-static void visited_pair_free(mc_visited_pair_t pair){
- if(pair){
- xbt_dynar_free(&(pair->prop_ato));
- MC_free_snapshot(pair->system_state);
- xbt_free(pair);
- }
-}
-
-static void visited_pair_free_voidp(void *p){
- visited_pair_free((mc_visited_pair_t) * (void **) p);
-}
-
-static void acceptance_pair_free(mc_acceptance_pair_t pair){
- if(pair){
- xbt_dynar_free(&(pair->prop_ato));
- MC_free_snapshot(pair->system_state);
- xbt_free(pair);
- }
-}
-
-static void acceptance_pair_free_voidp(void *p){
- acceptance_pair_free((mc_acceptance_pair_t) * (void **) p);
-}
-
-
/********* DDFS Algorithm *********/
XBT_DEBUG("Double-DFS init");
XBT_DEBUG("**************************************************");
- mc_pair_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_new();
- xbt_swag_foreach(process, simix_global->process_list){
- if(MC_process_is_enabled(process)){
- MC_state_interleave_process(initial_graph_state, process);
- }
- }
-
- acceptance_pairs = xbt_dynar_new(sizeof(mc_acceptance_pair_t), acceptance_pair_free_voidp);
- visited_pairs = xbt_dynar_new(sizeof(mc_visited_pair_t), visited_pair_free_voidp);
+ 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_state_liveness->snapshot = MC_take_snapshot();
+ initial_state_liveness->prev_pair = 0;
MC_UNSET_RAW_MEM;
xbt_automaton_state_t automaton_state;
xbt_dynar_foreach(_mc_property_automaton->states, cursor, automaton_state){
- if(automaton_state->type == -1){
+ if(automaton_state->type == -1){ /* Initial automaton state */
MC_SET_RAW_MEM;
- mc_initial_pair = MC_pair_new(initial_graph_state, automaton_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_state_liveness->snapshot);
MC_UNSET_RAW_MEM;
}
-
- MC_ddfs(0);
-
- }else{
- if(automaton_state->type == 2){
- MC_SET_RAW_MEM;
- mc_initial_pair = MC_pair_new(initial_graph_state, automaton_state, MC_state_interleave_size(initial_graph_state));
- xbt_fifo_unshift(mc_stack_liveness, mc_initial_pair);
- MC_UNSET_RAW_MEM;
- set_acceptance_pair_reached(mc_initial_pair->num, automaton_state);
+ }else if(automaton_state->type == 2){ /* Acceptance automaton state */
+
+ MC_SET_RAW_MEM;
- if(cursor != 0){
- MC_restore_snapshot(initial_state_liveness->snapshot);
- 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;
}
}
}
}
-void MC_ddfs(int search_cycle){
+void MC_ddfs(){
smx_process_t process;
mc_pair_t current_pair = NULL;
if(xbt_fifo_size(mc_stack_liveness) == 0)
return;
-
/* Get current pair */
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), search_cycle);
+ XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), current_pair->search_cycle);
mc_stats->visited_pairs++;
int value;
- mc_state_t next_graph_state = NULL;
smx_simcall_t req = NULL;
char *req_str;
xbt_automaton_transition_t transition_succ;
unsigned int cursor = 0;
int res;
+ int reached_num, visited_num;
+ int new_pair = 0;
mc_pair_t next_pair = NULL;
- mc_pair_t pair_succ;
-
- mc_pair_t pair_to_remove;
+ xbt_dynar_t prop_values = NULL;
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(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
- req_str = MC_request_to_string(req, value);
- XBT_DEBUG("Execute: %s", req_str);
- xbt_free(req_str);
- }
-
- MC_state_set_executed_request(current_pair->graph_state, req, value);
- mc_stats->executed_transitions++;
-
- /* Answer the request */
- SIMIX_simcall_pre(req, value);
+ if(current_pair->search_cycle){
- /* 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_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)){
- XBT_DEBUG("Process %lu enabled with simcall : %d", process->pid, (&process->simcall)->call);
}
}
+ }
- xbt_swag_foreach(process, simix_global->process_list){
- if(MC_process_is_enabled(process)){
- MC_state_interleave_process(next_graph_state, process);
- }
- }
+ if((visited_num = is_visited_pair(current_pair)) != -1){
- xbt_dynar_reset(successors);
+ XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", current_pair->num, visited_num);
+ 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 = MC_pair_new(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 = MC_pair_new(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(is_reached_acceptance_pair(pair_succ->num, pair_succ->automaton_state) != -1){
-
- 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(mc_stats);
- xbt_abort();
+ 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);
- if(is_visited_pair(pair_succ->num, pair_succ->automaton_state) != -1){
+ if(res == 1){ // enabled transition in automaton
- XBT_DEBUG("Next pair already visited !");
- break;
-
- }else{
+ if(new_pair)
+ MC_replay_liveness(mc_stack_liveness, 1);
- XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id);
+ MC_SET_RAW_MEM;
- XBT_DEBUG("Acceptance pairs : %lu", xbt_dynar_length(acceptance_pairs));
+ 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();
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness, pair_succ);
- MC_UNSET_RAW_MEM;
-
- MC_ddfs(search_cycle);
-
+ /* 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(is_visited_pair(pair_succ->num, pair_succ->automaton_state) != -1){
+ if(mc_stats->expanded_pairs%1000000 == 0)
+ XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs);
- XBT_DEBUG("Next pair already visited !");
- break;
-
- }else{
+ MC_UNSET_RAW_MEM;
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness, pair_succ);
- MC_UNSET_RAW_MEM;
-
- MC_ddfs(search_cycle);
- }
-
- }
+ new_pair = 1;
- }else{
+ MC_ddfs();
- if(is_visited_pair(pair_succ->num, pair_succ->automaton_state) != -1){
+ }
- XBT_DEBUG("Next pair already visited !");
- break;
-
- }else{
-
- if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
+ }
- XBT_DEBUG("Next pair (depth =%d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, 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_acceptance_pair_reached(pair_succ->num, pair_succ->automaton_state);
+ res = MC_automaton_evaluate_label(transition_succ->label, prop_values);
+
+ if(res == 2){ // true transition in automaton
- search_cycle = 1;
+ if(new_pair)
+ MC_replay_liveness(mc_stack_liveness, 1);
+
+ 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_DEBUG("Acceptance pairs : %lu", xbt_dynar_length(acceptance_pairs));
+ 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);
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness, pair_succ);
- MC_UNSET_RAW_MEM;
+ if(mc_stats->expanded_pairs%1000000 == 0)
+ XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs);
- MC_ddfs(search_cycle);
+ MC_UNSET_RAW_MEM;
+
+ new_pair = 1;
+
+ 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_DEBUG("Backtracking to depth %d", xbt_fifo_size(mc_stack_liveness));
- MC_replay_liveness(mc_stack_liveness, 0);
- }
}
-
}else{
mc_stats->executed_transitions++;
- XBT_DEBUG("No more request to execute in this state, search evolution in Büchi Automaton.");
-
- MC_SET_RAW_MEM;
+ XBT_DEBUG("No request to execute in this state, search evolution in Büchi Automaton.");
- /* Create the new expanded graph_state */
- next_graph_state = MC_state_new();
+ if(current_pair->search_cycle){
- xbt_dynar_reset(successors);
-
- MC_UNSET_RAW_MEM;
-
-
- cursor= 0;
- xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
+ 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;
- res = MC_automaton_evaluate_label(transition_succ->label);
+ 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();
- if(res == 1){ // enabled transition in automaton
- MC_SET_RAW_MEM;
- next_pair = MC_pair_new(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){
+ if((visited_num = is_visited_pair(current_pair)) != -1){
+
+ XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", current_pair->num, visited_num);
- res = MC_automaton_evaluate_label(transition_succ->label);
-
- if(res == 2){ // true transition in automaton
- MC_SET_RAW_MEM;
- next_pair = MC_pair_new(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state));
- xbt_dynar_push(successors, &next_pair);
- MC_UNSET_RAW_MEM;
- }
+ }else{
+
+ 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){
- cursor = 0;
-
- xbt_dynar_foreach(successors, cursor, pair_succ){
+ res = MC_automaton_evaluate_label(transition_succ->label, prop_values);
- if(search_cycle == 1){
+ if(res == 1){ // enabled transition in automaton
- if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
+ if(new_pair)
+ MC_replay_liveness(mc_stack_liveness, 1);
- if(is_reached_acceptance_pair(pair_succ->num, pair_succ->automaton_state) != -1){
-
- 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(mc_stats);
- xbt_abort();
-
- }else{
-
- if(is_visited_pair(pair_succ->num, pair_succ->automaton_state) != -1){
-
- XBT_DEBUG("Next pair already visited !");
- break;
-
- }else{
-
- XBT_INFO("Next pair (depth = %d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id);
-
- XBT_INFO("Acceptance pairs : %lu", xbt_dynar_length(acceptance_pairs));
+ 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();
+ 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(mc_stats->expanded_pairs%1000 == 0)
+ XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs);
- }else{
-
- if(is_visited_pair(pair_succ->num, pair_succ->automaton_state) != -1){
-
- XBT_DEBUG("Next pair already visited !");
- break;
-
- }else{
+ 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);
+ MC_UNSET_RAW_MEM;
+
+ new_pair = 1;
+
+ MC_ddfs();
- }
-
}
-
- }else{
-
- if(is_visited_pair(pair_succ->num, pair_succ->automaton_state) != -1){
+ }
- XBT_DEBUG("Next pair already visited !");
- break;
-
- }else{
+ /* Then, evaluate true transitions (always true, whatever atomic propositions values) */
+ cursor = 0;
+ xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
+
+ res = MC_automaton_evaluate_label(transition_succ->label, prop_values);
+
+ if(res == 2){ // true transition in automaton
- if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
+ if(new_pair)
+ MC_replay_liveness(mc_stack_liveness, 1);
- set_acceptance_pair_reached(pair_succ->num, pair_succ->automaton_state);
-
- search_cycle = 1;
+ 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_INFO("Acceptance pairs : %lu", xbt_dynar_length(acceptance_pairs));
+ xbt_fifo_unshift(mc_stack_liveness, next_pair);
- }
+ 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);
-
- }
-
- }
- /* Restore system before checking others successors */
- if(cursor != xbt_dynar_length(successors) - 1)
- MC_replay_liveness(mc_stack_liveness, 1);
+ new_pair = 1;
- }
+ MC_ddfs();
+
+ }
+ }
+ }
}
}else{
XBT_WARN("/!\\ Max depth reached ! /!\\ ");
if(MC_state_interleave_size(current_pair->graph_state) > 0){
XBT_WARN("/!\\ But, there are still processes to interleave. Model-checker will not be able to ensure the soundness of the verification from now. /!\\ ");
- XBT_WARN("Notice : the default value of max depth is 1000 but you can change it with cfg=model-check/max_depth:value.");
+ 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) == _sg_mc_max_depth ){
- XBT_DEBUG("Pair (depth = %d) shifted in stack, maximum depth reached", xbt_fifo_size(mc_stack_liveness) );
+ XBT_DEBUG("Pair %d (depth = %d) shifted in stack, maximum depth reached", current_pair->num, xbt_fifo_size(mc_stack_liveness) );
}else{
- XBT_DEBUG("Pair (depth = %d) shifted in stack", 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;
- pair_to_remove = xbt_fifo_shift(mc_stack_liveness);
- xbt_fifo_remove(mc_stack_liveness, pair_to_remove);
- pair_to_remove = NULL;
- if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){
- remove_acceptance_pair(current_pair->num);
+ 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;
