-/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved. */
+/* Copyright (c) 2011-2013. The 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. */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc,
"Logging specific to algorithms for liveness properties verification");
-xbt_dynar_t reached_pairs;
+/********* Global variables *********/
+
+xbt_dynar_t acceptance_pairs;
xbt_dynar_t visited_pairs;
xbt_dynar_t successors;
+xbt_parmap_t parmap;
-int create_dump(int pair)
-{
- // Try to enable core dumps
- struct rlimit core_limit;
- core_limit.rlim_cur = RLIM_INFINITY;
- core_limit.rlim_max = RLIM_INFINITY;
-
- if(setrlimit(RLIMIT_CORE, &core_limit) < 0)
- fprintf(stderr, "setrlimit: %s\nWarning: core dumps may be truncated or non-existant\n", strerror(errno));
-
- int status;
- switch(fork()){
- case 0:
- // We are the child process -- run the actual program
- xbt_abort();
- break;
-
- case -1:
- // An error occurred, shouldn't happen
- perror("fork");
- return -1;
-
- default:
- // We are the parent process -- wait for the child process to exit
- if(wait(&status) < 0)
- perror("wait");
- if(WIFSIGNALED(status) && WCOREDUMP(status)){
- char *core_name = xbt_malloc(20);
- sprintf(core_name,"core_%d", pair);
- rename("core", core_name);
- free(core_name);
- }
+/********* Static functions *********/
+
+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(values, int, res);
}
- return 0;
+ return values;
}
-int reached(xbt_state_t st){
+static int get_search_interval(xbt_dynar_t all_pairs, mc_pair_t pair, int *min, int *max){
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
MC_SET_RAW_MEM;
- mc_pair_reached_t new_pair = NULL;
- new_pair = xbt_new0(s_mc_pair_reached_t, 1);
- new_pair->nb = xbt_dynar_length(reached_pairs) + 1;
- new_pair->automaton_state = st;
- new_pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
- new_pair->system_state = MC_take_snapshot();
+ int cursor = 0, previous_cursor, next_cursor;
+ mc_pair_t pair_test;
+ int start = 0;
+ int end = xbt_dynar_length(all_pairs) - 1;
- /* Get values of propositional symbols */
- int res;
- int_f_void_t f;
- unsigned int cursor = 0;
- xbt_propositional_symbol_t ps = NULL;
- xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
- f = (int_f_void_t)ps->function;
- res = f();
- xbt_dynar_push_as(new_pair->prop_ato, int, res);
+ while(start <= end){
+ cursor = (start + end) / 2;
+ pair_test = (mc_pair_t)xbt_dynar_get_as(all_pairs, cursor, mc_pair_t);
+ if(pair_test->nb_processes < pair->nb_processes){
+ start = cursor + 1;
+ }else if(pair_test->nb_processes > pair->nb_processes){
+ end = cursor - 1;
+ }else{
+ if(pair_test->heap_bytes_used < pair->heap_bytes_used){
+ start = cursor +1;
+ }else if(pair_test->heap_bytes_used > pair->heap_bytes_used){
+ end = cursor - 1;
+ }else{
+ *min = *max = cursor;
+ previous_cursor = cursor - 1;
+ while(previous_cursor >= 0){
+ pair_test = (mc_pair_t)xbt_dynar_get_as(all_pairs, previous_cursor, mc_pair_t);
+ if(pair_test->nb_processes != pair->nb_processes || pair_test->heap_bytes_used != pair->heap_bytes_used)
+ break;
+ *min = previous_cursor;
+ previous_cursor--;
+ }
+ next_cursor = cursor + 1;
+ while(next_cursor < xbt_dynar_length(all_pairs)){
+ pair_test = (mc_pair_t)xbt_dynar_get_as(all_pairs, next_cursor, mc_pair_t);
+ if(pair_test->nb_processes != pair->nb_processes || pair_test->heap_bytes_used != pair->heap_bytes_used)
+ break;
+ *max = next_cursor;
+ next_cursor++;
+ }
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
+ return -1;
+ }
+ }
}
-
- MC_UNSET_RAW_MEM;
-
- if(xbt_dynar_is_empty(reached_pairs)/* || !compare*/){
- MC_SET_RAW_MEM;
- /* New pair reached */
- xbt_dynar_push(reached_pairs, &new_pair);
+ if(!raw_mem_set)
MC_UNSET_RAW_MEM;
- if(raw_mem_set)
- MC_SET_RAW_MEM;
+ return cursor;
+}
+
+static int is_reached_acceptance_pair(mc_pair_t pair){
+
+ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+ MC_SET_RAW_MEM;
- return 0;
+ if(xbt_dynar_is_empty(acceptance_pairs)){
+
+ 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);
+
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
+
+ return -1;
}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);
+ }
+
+ int min = -1, max = -1, index;
+ int res;
+ mc_pair_t pair_test;
- cursor = 0;
- mc_pair_reached_t pair_test = NULL;
-
- xbt_dynar_foreach(reached_pairs, cursor, pair_test){
- if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug))
- XBT_DEBUG("****** Pair reached #%d ******", pair_test->nb);
- if(automaton_state_compare(pair_test->automaton_state, st) == 0){
- if(propositional_symbols_compare_value(pair_test->prop_ato, new_pair->prop_ato) == 0){
- if(snapshot_compare(new_pair->system_state, pair_test->system_state) == 0){
-
- if(raw_mem_set)
- MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
-
- return 1;
- }
- }else{
- XBT_DEBUG("Different values of propositional symbols");
- }
+ index = get_search_interval(acceptance_pairs, pair, &min, &max);
+
+ if(min != -1 && max != -1){ /* Acceptance pair with same number of processes and same heap bytes used exists */
+ res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(acceptance_pairs, min), (max-min)+1, pair);
+ if(res != -1){
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
+ return ((mc_pair_t)xbt_dynar_get_as(acceptance_pairs, (min+res)-1, mc_pair_t))->num;
+ }
+ xbt_dynar_insert_at(acceptance_pairs, min, &pair);
+ }else{
+ pair_test = (mc_pair_t)xbt_dynar_get_as(acceptance_pairs, index, mc_pair_t);
+ if(pair_test->nb_processes < pair->nb_processes){
+ xbt_dynar_insert_at(acceptance_pairs, index+1, &pair);
}else{
- XBT_DEBUG("Different automaton state");
+ if(pair_test->heap_bytes_used < pair->heap_bytes_used)
+ xbt_dynar_insert_at(acceptance_pairs, index + 1, &pair);
+ else
+ xbt_dynar_insert_at(acceptance_pairs, index, &pair);
}
}
- /* New pair reached */
- xbt_dynar_push(reached_pairs, &new_pair);
-
- MC_UNSET_RAW_MEM;
-
- if(raw_mem_set)
- MC_SET_RAW_MEM;
-
- compare = 0;
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
- return 0;
+ return -1;
}
+
}
-void set_pair_reached(xbt_state_t st){
+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_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 = MC_take_snapshot();
+ if(xbt_dynar_is_empty(acceptance_pairs)){
+
+ 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);
+
+ }else{
+
+ 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;
+
+ int cursor = 0;
+ 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;
+ }
+ }
+
+ if(pair_test->nb_processes < pair->nb_processes){
+ xbt_dynar_insert_at(acceptance_pairs, cursor+1, &pair);
+ }else{
+ if(pair_test->heap_bytes_used < pair->heap_bytes_used)
+ xbt_dynar_insert_at(acceptance_pairs, cursor + 1, &pair);
+ else
+ xbt_dynar_insert_at(acceptance_pairs, cursor, &pair);
+ }
+
+ }
+
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
+
+}
+
+static void remove_acceptance_pair(mc_pair_t pair){
+
+ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+ MC_SET_RAW_MEM;
- /* 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, &pair);
+ if(pair_found)
+ xbt_dynar_remove_at(acceptance_pairs, cursor, NULL);
- MC_UNSET_RAW_MEM;
+ pair->acceptance_removed = 1;
- if(raw_mem_set)
- MC_SET_RAW_MEM;
-
+ 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_UNSET_RAW_MEM;
}
-int visited(xbt_state_t st){
+static int is_visited_pair(mc_pair_t pair){
if(_sg_mc_visited == 0)
- return 0;
+ return -1;
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
MC_SET_RAW_MEM;
- mc_pair_visited_t new_pair = NULL;
- new_pair = xbt_new0(s_mc_pair_visited_t, 1);
- new_pair->automaton_state = st;
- new_pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
- new_pair->system_state = MC_take_snapshot();
-
- /* Get values of propositional symbols */
- int res;
- int_f_void_t f;
- unsigned int cursor = 0;
- xbt_propositional_symbol_t ps = NULL;
- xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
- f = (int_f_void_t)ps->function;
- res = f();
- xbt_dynar_push_as(new_pair->prop_ato, int, res);
- }
-
- MC_UNSET_RAW_MEM;
-
if(xbt_dynar_is_empty(visited_pairs)){
- MC_SET_RAW_MEM;
- /* New pair visited */
- xbt_dynar_push(visited_pairs, &new_pair);
- MC_UNSET_RAW_MEM;
+ if(pair->graph_state->system_state == NULL)
+ pair->graph_state->system_state = MC_take_snapshot();
+ xbt_dynar_push(visited_pairs, &pair);
- if(raw_mem_set)
- MC_SET_RAW_MEM;
-
- return 0;
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
+
+ return -1;
}else{
- MC_SET_RAW_MEM;
-
- cursor = 0;
- mc_pair_visited_t pair_test = NULL;
-
- xbt_dynar_foreach(visited_pairs, cursor, pair_test){
- if(XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug))
- XBT_DEBUG("****** Pair visited #%d ******", cursor + 1);
- if(automaton_state_compare(pair_test->automaton_state, st) == 0){
- if(propositional_symbols_compare_value(pair_test->prop_ato, new_pair->prop_ato) == 0){
- if(snapshot_compare(new_pair->system_state, pair_test->system_state) == 0){
- if(raw_mem_set)
- MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
-
- return 1;
- }
- }else{
- XBT_DEBUG("Different values of propositional symbols");
+ if(pair->graph_state->system_state == NULL)
+ pair->graph_state->system_state = MC_take_snapshot();
+
+ int min = -1, max = -1, index;
+ int res;
+ mc_pair_t pair_test;
+
+ index = get_search_interval(visited_pairs, pair, &min, &max);
+
+ if(min != -1 && max != -1){ /* Visited pair with same number of processes and same heap bytes used exists */
+ res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(visited_pairs, min), (max-min)+1, pair);
+ if(res != -1){
+ pair_test = (mc_pair_t)xbt_dynar_get_as(visited_pairs, (min+res)-1, mc_pair_t);
+ 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, (min + res) - 1, NULL);
+ xbt_dynar_insert_at(visited_pairs, (min+res) - 1, &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_UNSET_RAW_MEM;
+ return pair->other_num;
+ }
+ xbt_dynar_insert_at(visited_pairs, min, &pair);
+ }else{
+ pair_test = (mc_pair_t)xbt_dynar_get_as(visited_pairs, index, mc_pair_t);
+ if(pair_test->nb_processes < pair->nb_processes){
+ xbt_dynar_insert_at(visited_pairs, index+1, &pair);
}else{
- XBT_DEBUG("Different automaton state");
+ if(pair_test->heap_bytes_used < pair->heap_bytes_used)
+ xbt_dynar_insert_at(visited_pairs, index + 1, &pair);
+ else
+ xbt_dynar_insert_at(visited_pairs, index, &pair);
}
}
- if(xbt_dynar_length(visited_pairs) == _sg_mc_visited){
- xbt_dynar_remove_at(visited_pairs, 0, NULL);
+ if(xbt_dynar_length(visited_pairs) > _sg_mc_visited){
+ int min2 = mc_stats->expanded_pairs;
+ unsigned int cursor2 = 0;
+ unsigned int index2 = 0;
+ xbt_dynar_foreach(visited_pairs, cursor2, pair_test){
+ if(pair_test->num < min2){
+ index2 = cursor2;
+ min2 = pair_test->num;
+ }
+ }
+ xbt_dynar_remove_at(visited_pairs, index2, &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);
+
}
- /* New pair visited */
- xbt_dynar_push(visited_pairs, &new_pair);
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
- MC_UNSET_RAW_MEM;
+ return -1;
- if(raw_mem_set)
- MC_SET_RAW_MEM;
-
- return 0;
-
}
}
-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;
}
}
-/********************* Double-DFS stateless *******************/
-
-void pair_visited_free(mc_pair_visited_t pair){
- if(pair){
- xbt_dynar_free(&(pair->prop_ato));
- MC_free_snapshot(pair->system_state);
- xbt_free(pair);
- }
-}
-
-void pair_visited_free_voidp(void *p){
- pair_visited_free((mc_pair_visited_t) * (void **) p);
-}
-
-void pair_stateless_free(mc_pair_stateless_t pair){
- xbt_free(pair->graph_state->system_state);
- xbt_free(pair->graph_state->proc_status);
- xbt_free(pair->graph_state);
- xbt_free(pair);
-}
-
-void pair_stateless_free_voidp(void *p){
- pair_stateless_free((mc_pair_stateless_t) * (void **) p);
-}
+/********* DDFS Algorithm *********/
-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 pair_reached_free(mc_pair_reached_t pair){
- if(pair){
- xbt_dynar_free(&(pair->prop_ato));
- MC_free_snapshot(pair->system_state);
- xbt_free(pair);
- }
-}
-
-void pair_reached_free_voidp(void *p){
- pair_reached_free((mc_pair_reached_t) * (void **) p);
-}
void MC_ddfs_init(void){
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), pair_reached_free_voidp);
- visited_pairs = xbt_dynar_new(sizeof(mc_pair_visited_t), pair_visited_free_voidp);
- 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_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_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);
+ }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){
-
- //initial_state_liveness->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, interleave size %d)", xbt_fifo_size(mc_stack_liveness), current_pair->search_cycle, MC_state_interleave_size(current_pair->graph_state));
- XBT_DEBUG("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), search_cycle);
-
- 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_stateless_t remove_pair;
- mc_pair_reached_t remove_pair_reached;
+ mc_pair_t next_pair = NULL;
+ 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);
+ if(current_pair->search_cycle){
- /* Answer the request */
- SIMIX_simcall_pre(req, value);
-
- /* Wait for requests (schedules processes) */
- MC_wait_for_requests();
-
- MC_SET_RAW_MEM;
-
- /* Create the new expanded graph_state */
- next_graph_state = MC_state_pair_new();
+ 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;
- /* 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_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();
- 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){
-
- if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
+ 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;
- if(reached(pair_succ->automaton_state)){
-
- XBT_INFO("Next pair (depth = %d, %u interleave) already reached !", xbt_fifo_size(mc_stack_liveness) + 1, MC_state_interleave_size(pair_succ->graph_state));
+ MC_state_set_executed_request(current_pair->graph_state, req, value);
+ mc_stats->executed_transitions++;
- 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);
- xbt_abort();
+ /* Answer the request */
+ SIMIX_simcall_pre(req, value);
+
+ /* Wait for requests (schedules processes) */
+ MC_wait_for_requests();
- }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){
- if(visited(pair_succ->automaton_state)){
+ res = MC_automaton_evaluate_label(transition_succ->label, prop_values);
- XBT_DEBUG("Next pair already visited !");
- break;
-
- }else{
+ if(res == 1){ // enabled transition in automaton
- 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("Reached pairs : %lu", xbt_dynar_length(reached_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{
-
- if(visited(pair_succ->automaton_state)){
+ 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);
- XBT_DEBUG("Next pair already visited !");
- break;
-
- }else{
+ if(mc_stats->expanded_pairs%1000000 == 0)
+ XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs);
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness, pair_succ);
- MC_UNSET_RAW_MEM;
-
- MC_ddfs(search_cycle);
- }
-
- }
+ MC_UNSET_RAW_MEM;
- }else{
+ MC_ddfs();
- if(visited(pair_succ->automaton_state)){
+ }
- 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_pair_reached(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_DEBUG("Reached pairs : %lu", xbt_dynar_length(reached_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;
+
+ 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.");
+ XBT_DEBUG("No request to execute in this state, search evolution in Büchi Automaton.");
- MC_SET_RAW_MEM;
+ if(current_pair->search_cycle){
- /* Create the new expanded graph_state */
- next_graph_state = MC_state_pair_new();
+ 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_dynar_reset(successors);
+ 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_UNSET_RAW_MEM;
+ }
+ }
+ }
+ if((visited_num = is_visited_pair(current_pair)) != -1){
- cursor= 0;
- xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
+ 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;
- res = MC_automaton_evaluate_label(transition_succ->label);
+ /* Evaluate enabled transition according to atomic propositions values */
+ cursor= 0;
+ xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
- 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;
- }
+ res = MC_automaton_evaluate_label(transition_succ->label, prop_values);
- }
+ if(res == 1){ // enabled transition in automaton
- cursor = 0;
-
- xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
-
- res = MC_automaton_evaluate_label(transition_succ->label);
-
- if(res == 2){ // true transition in automaton
- MC_SET_RAW_MEM;
- next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state));
- xbt_dynar_push(successors, &next_pair);
- MC_UNSET_RAW_MEM;
- }
+ MC_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);
- cursor = 0;
-
- xbt_dynar_foreach(successors, cursor, pair_succ){
+ if(mc_stats->expanded_pairs%1000 == 0)
+ XBT_INFO("Expanded pairs : %lu", mc_stats->expanded_pairs);
- if(search_cycle == 1){
+ if(dot_output != NULL)
+ fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", current_pair->num, next_pair->num, "");
- if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
+ MC_UNSET_RAW_MEM;
- if(reached(pair_succ->automaton_state)){
-
- XBT_INFO("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness) + 1);
-
- XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
- XBT_INFO("| ACCEPTANCE CYCLE |");
- XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
- XBT_INFO("Counter-example that violates formula :");
- MC_show_stack_liveness(mc_stack_liveness);
- MC_dump_stack_liveness(mc_stack_liveness);
- MC_print_statistics_pairs(mc_stats_pair);
- xbt_abort();
-
- }else{
-
- XBT_INFO("Next pair (depth = %d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id);
-
- XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+ MC_ddfs();
- MC_SET_RAW_MEM;
- xbt_fifo_unshift(mc_stack_liveness, pair_succ);
- MC_UNSET_RAW_MEM;
-
- MC_ddfs(search_cycle);
+ }
- }
+ }
- }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
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;
- }else{
-
- if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
+ xbt_fifo_unshift(mc_stack_liveness, next_pair);
- set_pair_reached(pair_succ->automaton_state);
-
- search_cycle = 1;
+ 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_UNSET_RAW_MEM;
- XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+ MC_ddfs();
}
- 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);
-
- }
-
+ }
}
}else{
XBT_WARN("/!\\ Max depth reached ! /!\\ ");
- if(current_pair->requests > 0){
+ 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;
- remove_pair = xbt_fifo_shift(mc_stack_liveness);
- xbt_fifo_remove(mc_stack_liveness, remove_pair);
- remove_pair = NULL;
- if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){
- remove_pair_reached = xbt_dynar_pop_as(reached_pairs, mc_pair_reached_t);
- pair_reached_free(remove_pair_reached);
- remove_pair_reached = 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(initial_state_liveness->raw_mem_set)
- MC_SET_RAW_MEM;*/
+ MC_UNSET_RAW_MEM;
}
