return 0;
}
+void MC_print_comparison_times_statistics(mc_comparison_times_t ct){
+
+ XBT_DEBUG("Comparisons done : %d", ct->nb_comparisons);
+
+ double total, min, max;
+ unsigned int cursor;
+
+ if(xbt_dynar_length(ct->chunks_used_comparison_times) > 0){
+ cursor = 0;
+ total = 0.0;
+ max = 0.0;
+ min = xbt_dynar_get_as(ct->chunks_used_comparison_times, cursor, double);
+ while(cursor < xbt_dynar_length(ct->chunks_used_comparison_times) - 1){
+ total += xbt_dynar_get_as(ct->chunks_used_comparison_times, cursor, double);
+ if(xbt_dynar_get_as(ct->chunks_used_comparison_times, cursor, double) > max)
+ max = xbt_dynar_get_as(ct->chunks_used_comparison_times, cursor, double);
+ if(xbt_dynar_get_as(ct->chunks_used_comparison_times, cursor, double) < min)
+ min = xbt_dynar_get_as(ct->chunks_used_comparison_times, cursor, double);
+ cursor++;
+ }
+ XBT_DEBUG("Chunks used comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->chunks_used_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->chunks_used_comparison_times), max, min);
+ }
+
+ if(xbt_dynar_length(ct->stacks_sizes_comparison_times) > 0){
+ cursor = 0;
+ total = 0.0;
+ max = 0.0;
+ min = xbt_dynar_get_as(ct->stacks_sizes_comparison_times, cursor, double);
+ while(cursor < xbt_dynar_length(ct->stacks_sizes_comparison_times) - 1){
+ total += xbt_dynar_get_as(ct->stacks_sizes_comparison_times, cursor, double);
+ if(xbt_dynar_get_as(ct->stacks_sizes_comparison_times, cursor, double) > max)
+ max = xbt_dynar_get_as(ct->stacks_sizes_comparison_times, cursor, double);
+ if(xbt_dynar_get_as(ct->stacks_sizes_comparison_times, cursor, double) < min)
+ min = xbt_dynar_get_as(ct->stacks_sizes_comparison_times, cursor, double);
+ cursor++;
+ }
+ XBT_DEBUG("Stacks sizes comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->stacks_sizes_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->stacks_sizes_comparison_times), max, min);
+ }
+
+ if(xbt_dynar_length(ct->program_data_segment_comparison_times) > 0){
+ cursor = 0;
+ total = 0.0;
+ max = 0.0;
+ min = xbt_dynar_get_as(ct->program_data_segment_comparison_times, cursor, double);
+ while(cursor < xbt_dynar_length(ct->program_data_segment_comparison_times) - 1){
+ total += xbt_dynar_get_as(ct->program_data_segment_comparison_times, cursor, double);
+ if(xbt_dynar_get_as(ct->program_data_segment_comparison_times, cursor, double) > max)
+ max = xbt_dynar_get_as(ct->program_data_segment_comparison_times, cursor, double);
+ if(xbt_dynar_get_as(ct->program_data_segment_comparison_times, cursor, double) < min)
+ min = xbt_dynar_get_as(ct->program_data_segment_comparison_times, cursor, double);
+ cursor++;
+ }
+ XBT_DEBUG("Program data/bss segments comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->program_data_segment_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->program_data_segment_comparison_times), max, min);
+ }
+
+ if(xbt_dynar_length(ct->libsimgrid_data_segment_comparison_times) > 0){
+ cursor = 0;
+ total = 0.0;
+ max = 0.0;
+ min = xbt_dynar_get_as(ct->libsimgrid_data_segment_comparison_times, cursor, double);
+ while(cursor < xbt_dynar_length(ct->libsimgrid_data_segment_comparison_times) - 1){
+ total += xbt_dynar_get_as(ct->libsimgrid_data_segment_comparison_times, cursor, double);
+ if(xbt_dynar_get_as(ct->libsimgrid_data_segment_comparison_times, cursor, double) > max)
+ max = xbt_dynar_get_as(ct->libsimgrid_data_segment_comparison_times, cursor, double);
+ if(xbt_dynar_get_as(ct->libsimgrid_data_segment_comparison_times, cursor, double) < min)
+ min = xbt_dynar_get_as(ct->libsimgrid_data_segment_comparison_times, cursor, double);
+ cursor++;
+ }
+ XBT_DEBUG("Libsimgrid data/bss segments comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->libsimgrid_data_segment_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->libsimgrid_data_segment_comparison_times), max, min);
+ }
+
+ if(xbt_dynar_length(ct->heap_comparison_times) > 0){
+ cursor = 0;
+ total = 0.0;
+ max = 0.0;
+ min = xbt_dynar_get_as(ct->heap_comparison_times, cursor, double);
+ while(cursor < xbt_dynar_length(ct->heap_comparison_times) - 1){
+ total += xbt_dynar_get_as(ct->heap_comparison_times, cursor, double);
+ if(xbt_dynar_get_as(ct->heap_comparison_times, cursor, double) > max)
+ max = xbt_dynar_get_as(ct->heap_comparison_times, cursor, double);
+ if(xbt_dynar_get_as(ct->heap_comparison_times, cursor, double) < min)
+ min = xbt_dynar_get_as(ct->heap_comparison_times, cursor, double);
+ cursor++;
+ }
+ XBT_DEBUG("Heap comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->heap_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->heap_comparison_times), max, min);
+ }
+
+ if(xbt_dynar_length(ct->stacks_comparison_times) > 0){
+ cursor = 0;
+ total = 0.0;
+ max = 0.0;
+ min = xbt_dynar_get_as(ct->stacks_comparison_times, cursor, double);
+ while(cursor < xbt_dynar_length(ct->stacks_comparison_times) - 1){
+ total += xbt_dynar_get_as(ct->stacks_comparison_times, cursor, double);
+ if(xbt_dynar_get_as(ct->stacks_comparison_times, cursor, double) > max)
+ max = xbt_dynar_get_as(ct->stacks_comparison_times, cursor, double);
+ if(xbt_dynar_get_as(ct->stacks_comparison_times, cursor, double) < min)
+ min = xbt_dynar_get_as(ct->stacks_comparison_times, cursor, double);
+ cursor++;
+ }
+ XBT_DEBUG("Stacks comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->stacks_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->stacks_comparison_times), max, min);
+ }
+
+ if(xbt_dynar_length(ct->snapshot_comparison_times) > 0){
+ cursor = 0;
+ total = 0.0;
+ max = 0.0;
+ min = xbt_dynar_get_as(ct->snapshot_comparison_times, cursor, double);
+ while(cursor < xbt_dynar_length(ct->snapshot_comparison_times) - 1){
+ total += xbt_dynar_get_as(ct->snapshot_comparison_times, cursor, double);
+ if(xbt_dynar_get_as(ct->snapshot_comparison_times, cursor, double) > max)
+ max = xbt_dynar_get_as(ct->snapshot_comparison_times, cursor, double);
+ if(xbt_dynar_get_as(ct->snapshot_comparison_times, cursor, double) < min)
+ min = xbt_dynar_get_as(ct->snapshot_comparison_times, cursor, double);
+ cursor++;
+ }
+ XBT_DEBUG("Snapshot comparison (Whole funnel) -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->snapshot_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->snapshot_comparison_times), max, min);
+ }
+
+}
+
+mc_comparison_times_t new_comparison_times(){
+ mc_comparison_times_t ct = NULL;
+ ct = xbt_new0(s_mc_comparison_times_t, 1);
+ ct->nb_comparisons = 0;
+ ct->snapshot_comparison_times = xbt_dynar_new(sizeof(double), NULL);
+ ct->chunks_used_comparison_times = xbt_dynar_new(sizeof(double), NULL);
+ ct->stacks_sizes_comparison_times = xbt_dynar_new(sizeof(double), NULL);
+ ct->program_data_segment_comparison_times = xbt_dynar_new(sizeof(double), NULL);
+ ct->libsimgrid_data_segment_comparison_times = xbt_dynar_new(sizeof(double), NULL);
+ ct->heap_comparison_times = xbt_dynar_new(sizeof(double), NULL);
+ ct->stacks_comparison_times = xbt_dynar_new(sizeof(double), NULL);
+ return ct;
+}
+
int reached(xbt_state_t st){
raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
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->comparison_times = new_comparison_times();
new_pair->system_state = MC_take_snapshot_liveness();
/* Get values of propositional symbols */
MC_UNSET_RAW_MEM;
- if(xbt_dynar_is_empty(reached_pairs) || !compare){
+ if(xbt_dynar_is_empty(reached_pairs)/* || !compare*/){
MC_SET_RAW_MEM;
/* New pair reached */
mc_pair_reached_t pair_test = NULL;
xbt_dynar_foreach(reached_pairs, cursor, pair_test){
- XBT_INFO("Pair reached #%d", pair_test->nb);
+ 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(snapshot_compare(new_pair->system_state, pair_test->system_state, new_pair->comparison_times, pair_test->comparison_times) == 0){
if(raw_mem_set)
MC_SET_RAW_MEM;
}else{
XBT_INFO("Different automaton state");
}
+ if(pair_test->comparison_times != NULL && XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
+ XBT_DEBUG("*** Comparison times statistics ***");
+ MC_print_comparison_times_statistics(pair_test->comparison_times);
+ }
}
/* New pair reached */
pair->nb = xbt_dynar_length(reached_pairs) + 1;
pair->automaton_state = st;
pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
+ pair->comparison_times = new_comparison_times();
pair->system_state = MC_take_snapshot_liveness();
/* Get values of propositional symbols */
/********************* Double-DFS stateless *******************/
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);
}
successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL);
/* Save the initial state */
- initial_state_liveness = xbt_new0(s_mc_global_t, 1);
initial_state_liveness->initial_snapshot = MC_take_snapshot_liveness();
MC_UNSET_RAW_MEM;
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;
- if(xbt_fifo_size(mc_stack_liveness) < MAX_DEPTH_LIVENESS){
+ if(xbt_fifo_size(mc_stack_liveness) < _surf_mc_max_depth){
if(current_pair->requests > 0){
next_graph_state = MC_state_pair_new();
/* Get enabled process and insert it in the interleave set of the next graph_state */
+
+ xbt_swag_foreach(process, simix_global->process_list){
+ if(MC_process_is_enabled(process)){
+ XBT_DEBUG("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);
}
+ }else{
+
+ XBT_DEBUG("No more request to execute in this state, search evolution in Büchi Automaton.");
+
+ MC_SET_RAW_MEM;
+
+ /* Create the new expanded graph_state */
+ next_graph_state = MC_state_pair_new();
+
+ xbt_dynar_reset(successors);
+
+ MC_UNSET_RAW_MEM;
+
+
+ cursor= 0;
+ xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
+
+ res = MC_automaton_evaluate_label(transition_succ->label);
+
+ if(res == 1){ // enabled transition in automaton
+ MC_SET_RAW_MEM;
+ next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state));
+ xbt_dynar_push(successors, &next_pair);
+ MC_UNSET_RAW_MEM;
+ }
+
+ }
+
+ cursor = 0;
+
+ xbt_dynar_foreach(current_pair->automaton_state->out, cursor, transition_succ){
+
+ res = MC_automaton_evaluate_label(transition_succ->label);
+
+ if(res == 2){ // true transition in automaton
+ MC_SET_RAW_MEM;
+ next_pair = new_pair_stateless(next_graph_state, transition_succ->dst, MC_state_interleave_size(next_graph_state));
+ xbt_dynar_push(successors, &next_pair);
+ MC_UNSET_RAW_MEM;
+ }
+
+ }
+
+ cursor = 0;
+
+ xbt_dynar_foreach(successors, cursor, pair_succ){
+
+ if(search_cycle == 1){
+
+ if((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2)){
+
+ if(reached(pair_succ->automaton_state)){
+
+ XBT_INFO("Next pair (depth = %d) already reached !", xbt_fifo_size(mc_stack_liveness) + 1);
+
+ XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
+ XBT_INFO("| ACCEPTANCE CYCLE |");
+ XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
+ XBT_INFO("Counter-example that violates formula :");
+ MC_show_stack_liveness(mc_stack_liveness);
+ MC_dump_stack_liveness(mc_stack_liveness);
+ MC_print_statistics_pairs(mc_stats_pair);
+ exit(0);
+
+ }else{
+
+ XBT_INFO("Next pair (depth = %d) -> Acceptance pair (%s)", xbt_fifo_size(mc_stack_liveness) + 1, pair_succ->automaton_state->id);
+
+ XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+
+ MC_SET_RAW_MEM;
+ xbt_fifo_unshift(mc_stack_liveness, pair_succ);
+ MC_UNSET_RAW_MEM;
+
+ MC_ddfs(search_cycle);
+
+ }
+
+ }else{
+
+ MC_SET_RAW_MEM;
+ xbt_fifo_unshift(mc_stack_liveness, pair_succ);
+ MC_UNSET_RAW_MEM;
+
+ MC_ddfs(search_cycle);
+
+ }
+
+
+ }else{
+
+ if(((pair_succ->automaton_state->type == 1) || (pair_succ->automaton_state->type == 2))){
+
+ set_pair_reached(pair_succ->automaton_state);
+
+ search_cycle = 1;
+
+ XBT_INFO("Reached pairs : %lu", xbt_dynar_length(reached_pairs));
+
+ }
+
+ 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{
}
- if(xbt_fifo_size(mc_stack_liveness) == MAX_DEPTH_LIVENESS ){
+ if(xbt_fifo_size(mc_stack_liveness) == _surf_mc_max_depth ){
XBT_DEBUG("Pair (depth = %d) shifted in stack, maximum depth reached", xbt_fifo_size(mc_stack_liveness) );
}else{
XBT_DEBUG("Pair (depth = %d) shifted in stack", xbt_fifo_size(mc_stack_liveness) );
MC_SET_RAW_MEM;
- xbt_fifo_shift(mc_stack_liveness);
+ 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)){
- xbt_dynar_pop(reached_pairs, NULL);
+ remove_pair_reached = xbt_dynar_pop_as(reached_pairs, mc_pair_reached_t);
+ pair_reached_free(remove_pair_reached);
+ remove_pair_reached = NULL;
}
MC_UNSET_RAW_MEM;
if(raw_mem_set)
MC_SET_RAW_MEM;
- else
- MC_UNSET_RAW_MEM;
}
