-/* Copyright (c) 2011-2013 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_dynar_t acceptance_pairs;
xbt_dynar_t visited_pairs;
xbt_dynar_t successors;
-
+xbt_parmap_t parmap;
/********* Static functions *********/
return values;
}
-static int is_reached_acceptance_pair(mc_pair_t pair){
+/** \brief Find a suitable subrange of candidate duplicates for a given state
+ *
+ * See mc_dpor.c with a similar (same?) function.
+ */
+static int get_search_interval(xbt_dynar_t all_pairs, mc_visited_pair_t pair, int *min, int *max){
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
-
- if(xbt_dynar_is_empty(acceptance_pairs)){
-
- 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;
-
- if(raw_mem_set)
- MC_SET_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);
- }
- size_t current_bytes_used = pair->heap_bytes_used;
- int current_nb_processes = pair->nb_processes;
+ MC_SET_RAW_MEM;
- 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;
- 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){
- 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(raw_mem_set)
- MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
- return pair_test->num;
- }
- }
- }
- /* 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;
- 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
- 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;
- 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
- MC_UNSET_RAW_MEM;
- return pair_test->num;
- }
- }
- }
- next_cursor++;
- }
+ int cursor = 0, previous_cursor, next_cursor;
+ mc_visited_pair_t pair_test;
+ int start = 0;
+ int end = xbt_dynar_length(all_pairs) - 1;
+
+ while(start <= end){
+ cursor = (start + end) / 2;
+ pair_test = (mc_visited_pair_t)xbt_dynar_get_as(all_pairs, cursor, mc_visited_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_visited_pair_t)xbt_dynar_get_as(all_pairs, previous_cursor, mc_visited_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_visited_pair_t)xbt_dynar_get_as(all_pairs, next_cursor, mc_visited_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;
}
- }
-
- 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, &pair);
- else
- xbt_dynar_insert_at(acceptance_pairs, cursor, &pair);
-
-
+ if(!raw_mem_set)
MC_UNSET_RAW_MEM;
- if(raw_mem_set)
- MC_SET_RAW_MEM;
-
- return -1;
-
- }
-
+ return cursor;
}
-
-static void set_acceptance_pair_reached(mc_pair_t pair){
+static mc_visited_pair_t is_reached_acceptance_pair(int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions){
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+ MC_SET_RAW_MEM;
+
+ mc_visited_pair_t pair = NULL;
+ pair = MC_visited_pair_new(pair_num, automaton_state, atomic_propositions);
+ pair->acceptance_pair = 1;
+
if(xbt_dynar_is_empty(acceptance_pairs)){
- 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;
+ xbt_dynar_push(acceptance_pairs, &pair);
}else{
- MC_SET_RAW_MEM;
+ int min = -1, max = -1, index;
+ //int res;
+ mc_visited_pair_t pair_test;
+ int cursor;
+
+ 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
+
+ // Parallell implementation
+ /*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;
+ }*/
+
+ cursor = min;
+ while(cursor <= max){
+ pair_test = (mc_visited_pair_t)xbt_dynar_get_as(acceptance_pairs, cursor, mc_visited_pair_t);
+ 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_test, pair) == 0){
+ XBT_INFO("Pair %d already reached (equal to pair %d) !", pair->num, pair_test->num);
+
+ xbt_fifo_shift(mc_stack_liveness);
+ if(dot_output != NULL)
+ fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_state_liveness->prev_pair, pair_test->num, initial_state_liveness->prev_req);
- 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;
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
- unsigned 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;
+ return NULL;
+ }
+ }
+ }
+ cursor++;
+ }
+ xbt_dynar_insert_at(acceptance_pairs, min, &pair);
+ }else{
+ pair_test = (mc_visited_pair_t)xbt_dynar_get_as(acceptance_pairs, index, mc_visited_pair_t);
+ if(pair_test->nb_processes < pair->nb_processes){
+ xbt_dynar_insert_at(acceptance_pairs, index+1, &pair);
+ }else{
+ 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);
}
}
-
- 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;
}
- if(raw_mem_set)
- MC_SET_RAW_MEM;
-
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
+
+ return pair;
+
}
-static void remove_acceptance_pair(mc_pair_t pair){
+static void remove_acceptance_pair(int pair_num){
+
+ int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+ MC_SET_RAW_MEM;
unsigned int cursor = 0;
- mc_pair_t pair_test;
- int pair_found = 0;
+ mc_visited_pair_t pair_test = NULL;
xbt_dynar_foreach(acceptance_pairs, cursor, pair_test){
- if(pair_test->num == pair->num){
- pair_found = 1;
+ if(pair_test->num == pair_num){
break;
}
}
- if(pair_found)
- xbt_dynar_remove_at(acceptance_pairs, cursor, NULL);
+ xbt_dynar_remove_at(acceptance_pairs, cursor, &pair_test);
- pair->acceptance_removed = 1;
+ pair_test->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(_sg_mc_visited == 0){
+ MC_visited_pair_delete(pair_test);
+ }else if(pair_test->visited_removed == 1){
+ MC_visited_pair_delete(pair_test);
}
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
}
-static int is_visited_pair(mc_pair_t pair){
+/** \brief Checks whether a given state has already been visited by the algorithm.
+ *
+ */
+static int is_visited_pair(mc_visited_pair_t pair, int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions){
if(_sg_mc_visited == 0)
return -1;
int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
- if(xbt_dynar_is_empty(visited_pairs)){
-
- MC_SET_RAW_MEM;
- 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;
+ MC_SET_RAW_MEM;
- return -1;
+ mc_visited_pair_t new_pair = NULL;
+ if(pair == NULL){
+ new_pair = MC_visited_pair_new(pair_num, automaton_state, atomic_propositions);
}else{
+ new_pair = pair;
+ }
- MC_SET_RAW_MEM;
+ if(xbt_dynar_is_empty(visited_pairs)){
- if(pair->graph_state->system_state == NULL)
- pair->graph_state->system_state = MC_take_snapshot();
-
- size_t current_bytes_used = pair->heap_bytes_used;
- int current_nb_processes = pair->nb_processes;
+ xbt_dynar_push(visited_pairs, &new_pair);
- 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;
- int result;
-
- 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;
- 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){
- 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){
+ }else{
+
+ int min = -1, max = -1, index;
+ //int res;
+ mc_visited_pair_t pair_test;
+ int cursor;
+
+ index = get_search_interval(visited_pairs, new_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;
+ }*/
+ cursor = min;
+ while(cursor <= max){
+ pair_test = (mc_visited_pair_t)xbt_dynar_get_as(visited_pairs, cursor, mc_visited_pair_t);
+ //if(pair_test->acceptance_pair == 0){ /* Acceptance pair have been already checked before */
+ if(xbt_automaton_state_compare(pair_test->automaton_state, new_pair->automaton_state) == 0){
+ if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, new_pair->atomic_propositions) == 0){
+ if(snapshot_compare(pair_test, new_pair) == 0){
+ if(pair_test->other_num == -1)
+ new_pair->other_num = pair_test->num;
+ else
+ new_pair->other_num = pair_test->other_num;
+ if(dot_output == NULL)
+ XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", new_pair->num, pair_test->num);
+ else
+ XBT_DEBUG("Pair %d already visited ! (equal to pair %d (pair %d in dot_output))", new_pair->num, pair_test->num, pair->other_num);
xbt_dynar_remove_at(visited_pairs, cursor, NULL);
- xbt_dynar_insert_at(visited_pairs, cursor, &pair);
+ xbt_dynar_insert_at(visited_pairs, cursor, &new_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(pair_test->acceptance_pair){
+ if(pair_test->acceptance_removed == 1)
+ MC_visited_pair_delete(pair_test);
+ }else{
+ MC_visited_pair_delete(pair_test);
}
- if(raw_mem_set)
- MC_SET_RAW_MEM;
- else
+ if(!raw_mem_set)
MC_UNSET_RAW_MEM;
- 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_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){
- xbt_dynar_remove_at(visited_pairs, previous_cursor, NULL);
- 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 result;
- }
- }
- }
- 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){
- xbt_dynar_remove_at(visited_pairs, next_cursor, NULL);
- 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 result;
- }
+ return new_pair->other_num;
}
}
- next_cursor++;
- }
+ //}
}
+ cursor++;
+ }
+ xbt_dynar_insert_at(visited_pairs, min, &new_pair);
+ }else{
+ pair_test = (mc_visited_pair_t)xbt_dynar_get_as(visited_pairs, index, mc_visited_pair_t);
+ if(pair_test->nb_processes < new_pair->nb_processes){
+ xbt_dynar_insert_at(visited_pairs, index+1, &new_pair);
+ }else{
+ if(pair_test->heap_bytes_used < new_pair->heap_bytes_used)
+ xbt_dynar_insert_at(visited_pairs, index + 1, &new_pair);
+ else
+ xbt_dynar_insert_at(visited_pairs, index, &new_pair);
}
}
- 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;
+ int min2 = mc_stats->expanded_pairs;
unsigned int cursor2 = 0;
- unsigned int index = 0;
+ unsigned int index2 = 0;
xbt_dynar_foreach(visited_pairs, cursor2, pair_test){
- if(pair_test->num < min){
- index = cursor2;
- min = pair_test->num;
+ if(pair_test->num < min2){
+ index2 = cursor2;
+ min2 = pair_test->num;
}
}
- xbt_dynar_remove_at(visited_pairs, index, &pair_test);
+ 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);
-
+ if(pair_test->acceptance_pair){
+ if(pair_test->acceptance_removed)
+ MC_visited_pair_delete(pair_test);
+ }else{
+ MC_visited_pair_delete(pair_test);
+ }
}
- MC_UNSET_RAW_MEM;
-
- if(raw_mem_set)
- MC_SET_RAW_MEM;
-
- return -1;
-
}
-
+
+ if(!raw_mem_set)
+ MC_UNSET_RAW_MEM;
+
+ return -1;
}
-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;
}
MC_wait_for_requests();
+ MC_ignore_heap(simix_global->process_to_run->data, 0);
+ MC_ignore_heap(simix_global->process_that_ran->data, 0);
+
MC_SET_RAW_MEM;
- acceptance_pairs = xbt_dynar_new(sizeof(mc_pair_t), NULL);
- visited_pairs = xbt_dynar_new(sizeof(mc_pair_t), NULL);
+ acceptance_pairs = xbt_dynar_new(sizeof(mc_visited_pair_t), NULL);
+ visited_pairs = xbt_dynar_new(sizeof(mc_visited_pair_t), NULL);
successors = xbt_dynar_new(sizeof(mc_pair_t), NULL);
- initial_state_liveness->snapshot = MC_take_snapshot();
+ initial_state_liveness->snapshot = MC_take_snapshot(0);
+ initial_state_liveness->prev_pair = 0;
MC_UNSET_RAW_MEM;
MC_UNSET_RAW_MEM;
- if(cursor != 0){
- MC_restore_snapshot(initial_state_liveness->snapshot);
- MC_UNSET_RAW_MEM;
- }
-
MC_ddfs();
-
- }else if(automaton_state->type == 2){ /* Acceptance automaton state */
- MC_SET_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);
-
if(cursor != 0){
MC_restore_snapshot(initial_state_liveness->snapshot);
MC_UNSET_RAW_MEM;
- }
-
- MC_ddfs();
+ }
}
}
/* 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_DEBUG("********************* ( Depth = %d, search_cycle = %d, interleave size %d, pair_num %d)", xbt_fifo_size(mc_stack_liveness), current_pair->search_cycle, MC_state_interleave_size(current_pair->graph_state), current_pair->num);
mc_stats->visited_pairs++;
xbt_automaton_transition_t transition_succ;
unsigned int cursor = 0;
int res;
- int reached_num, visited_num;
+ int visited_num;
mc_pair_t next_pair = NULL;
+ xbt_dynar_t prop_values = NULL;
+ mc_visited_pair_t reached_pair = NULL;
+ int counter_example_depth = 0;
if(xbt_fifo_size(mc_stack_liveness) < _sg_mc_max_depth){
if(current_pair->search_cycle){
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;
+ if((reached_pair = is_reached_acceptance_pair(current_pair->num, current_pair->automaton_state, current_pair->atomic_propositions)) == NULL){
+ counter_example_depth = xbt_fifo_size(mc_stack_liveness);
XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
XBT_INFO("| ACCEPTANCE CYCLE |");
XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
MC_show_stack_liveness(mc_stack_liveness);
MC_dump_stack_liveness(mc_stack_liveness);
MC_print_statistics(mc_stats);
+ XBT_INFO("Counter-example depth : %d", counter_example_depth);
xbt_abort();
}
}
}
- if((visited_num = is_visited_pair(current_pair)) != -1){
+ if((visited_num = is_visited_pair(reached_pair, current_pair->num, current_pair->automaton_state, current_pair->atomic_propositions)) != -1){
- XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", current_pair->num, visited_num);
-
- }else{
+ 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){
-
+
+ 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;
+
/* 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_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++;
/* Wait for requests (schedules processes) */
MC_wait_for_requests();
-
+
+ MC_SET_RAW_MEM;
+ prop_values = get_atomic_propositions_values();
+ MC_UNSET_RAW_MEM;
+
+ int new_pair = 0;
+
/* Evaluate enabled transition according to atomic propositions values */
cursor= 0;
xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
- res = MC_automaton_evaluate_label(transition_succ->label);
+ res = MC_automaton_evaluate_label(transition_succ->label, prop_values);
if(res == 1){ // enabled transition in automaton
+ if(new_pair)
+ MC_replay_liveness(mc_stack_liveness, 1);
+
MC_SET_RAW_MEM;
next_pair = MC_pair_new();
MC_UNSET_RAW_MEM;
- MC_ddfs();
+ new_pair = 1;
- MC_replay_liveness(mc_stack_liveness, 1);
+ MC_ddfs();
}
-
-
}
/* 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);
+ res = MC_automaton_evaluate_label(transition_succ->label, prop_values);
if(res == 2){ // true transition in automaton
+
+ if(new_pair)
+ MC_replay_liveness(mc_stack_liveness, 1);
MC_SET_RAW_MEM;
MC_UNSET_RAW_MEM;
+ new_pair = 1;
+
MC_ddfs();
- MC_replay_liveness(mc_stack_liveness, 1);
}
}
}
- }else{
-
- mc_stats->executed_transitions++;
-
- XBT_DEBUG("No request to execute in this state, search evolution in Büchi Automaton.");
-
- if(current_pair->search_cycle){
-
- 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();
-
- }
- }
- }
-
- if((visited_num = is_visited_pair(current_pair)) != -1){
-
- XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", current_pair->num, visited_num);
-
- }else{
-
- /* Evaluate enabled transition according to atomic propositions values */
- 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_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);
-
- MC_UNSET_RAW_MEM;
-
- MC_ddfs();
-
- MC_replay_liveness(mc_stack_liveness, 1);
-
- }
-
-
-
- }
-
- /* 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);
-
- 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();
- 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);
-
- MC_UNSET_RAW_MEM;
-
- MC_ddfs();
-
- 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);
- }
-
- }
}
}else{
MC_SET_RAW_MEM;
+ xbt_dynar_free(&prop_values);
current_pair = xbt_fifo_shift(mc_stack_liveness);
- current_pair->stack_removed = 1;
- if((current_pair->automaton_state->type == 1) || (current_pair->automaton_state->type == 2)){
- 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);
+ if(xbt_fifo_size(mc_stack_liveness) != _sg_mc_max_depth -1 && current_pair->requests > 0 && current_pair->search_cycle){
+ remove_acceptance_pair(current_pair->num);
}
+ MC_pair_delete(current_pair);
+
MC_UNSET_RAW_MEM;
}
