X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d97d6e19cb366fd112e63d56a9f411d968ee8670..2e501076bf39bf43b598954f040b453fedf49f4c:/src/mc/mc_liveness.cpp diff --git a/src/mc/mc_liveness.cpp b/src/mc/mc_liveness.cpp index 41be27f176..7eef307269 100644 --- a/src/mc/mc_liveness.cpp +++ b/src/mc/mc_liveness.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2014. The SimGrid Team. +/* Copyright (c) 2011-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -18,6 +18,7 @@ #include "mc_client.h" #include "mc_replay.h" #include "mc_safety.h" +#include "mc_exit.h" extern "C" { @@ -44,9 +45,8 @@ static xbt_dynar_t get_atomic_propositions_values() return values; } -static mc_visited_pair_t is_reached_acceptance_pair(mc_pair_t pair) { - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - +static mc_visited_pair_t is_reached_acceptance_pair(mc_pair_t pair) +{ mc_visited_pair_t new_pair = NULL; new_pair = MC_visited_pair_new(pair->num, pair->automaton_state, pair->atomic_propositions, pair->graph_state); new_pair->acceptance_pair = 1; @@ -69,8 +69,6 @@ static mc_visited_pair_t is_reached_acceptance_pair(mc_pair_t pair) { // 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_SET_STD_HEAP; return ((mc_pair_t)xbt_dynar_get_as(acceptance_pairs, (min+res)-1, mc_pair_t))->num; } */ @@ -85,7 +83,6 @@ static mc_visited_pair_t is_reached_acceptance_pair(mc_pair_t pair) { xbt_fifo_shift(mc_stack); if (dot_output != NULL) fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, pair_test->num, initial_global_state->prev_req); - mmalloc_set_current_heap(heap); return NULL; } } @@ -105,16 +102,12 @@ static mc_visited_pair_t is_reached_acceptance_pair(mc_pair_t pair) { xbt_dynar_insert_at(acceptance_pairs, index, &new_pair); } } - } - mmalloc_set_current_heap(heap); return new_pair; } static void remove_acceptance_pair(int pair_num) { - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - unsigned int cursor = 0; mc_visited_pair_t pair_test = NULL; int pair_found = 0; @@ -135,8 +128,6 @@ static void remove_acceptance_pair(int pair_num) MC_visited_pair_delete(pair_test); } - - mmalloc_set_current_heap(heap); } @@ -176,18 +167,14 @@ static int MC_automaton_evaluate_label(xbt_automaton_exp_label_t l, } } -static void MC_modelcheck_liveness_main(void); +static int MC_modelcheck_liveness_main(void); static void MC_pre_modelcheck_liveness(void) { - initial_global_state->raw_mem_set = (mmalloc_get_current_heap() == mc_heap); - mc_pair_t initial_pair = NULL; smx_process_t process; - MC_wait_for_requests(); - - MC_SET_MC_HEAP; + mc_model_checker->wait_for_requests(); acceptance_pairs = xbt_dynar_new(sizeof(mc_visited_pair_t), NULL); if(_sg_mc_visited > 0) @@ -221,16 +208,9 @@ static void MC_pre_modelcheck_liveness(void) xbt_fifo_unshift(mc_stack, initial_pair); } } - - MC_SET_STD_HEAP; - - MC_modelcheck_liveness_main(); - - if (initial_global_state->raw_mem_set) - MC_SET_MC_HEAP; } -static void MC_modelcheck_liveness_main(void) +static int MC_modelcheck_liveness_main(void) { smx_process_t process = NULL; mc_pair_t current_pair = NULL; @@ -265,11 +245,12 @@ static void MC_modelcheck_liveness_main(void) XBT_INFO("| ACCEPTANCE CYCLE |"); XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*"); XBT_INFO("Counter-example that violates formula :"); + MC_record_dump_path(mc_stack); MC_show_stack_liveness(mc_stack); MC_dump_stack_liveness(mc_stack); MC_print_statistics(mc_stats); XBT_INFO("Counter-example depth : %d", counter_example_depth); - xbt_abort(); + return SIMGRID_MC_EXIT_LIVENESS; } } @@ -277,16 +258,12 @@ static void MC_modelcheck_liveness_main(void) if ((current_pair->exploration_started == 0) && (visited_num = is_visited_pair(reached_pair, current_pair)) != -1) { if (dot_output != NULL){ - MC_SET_MC_HEAP; fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, visited_num, initial_global_state->prev_req); fflush(dot_output); - MC_SET_STD_HEAP; } XBT_DEBUG("Pair already visited (equal to pair %d), exploration on the current path stopped.", visited_num); - MC_SET_MC_HEAP; current_pair->requests = 0; - MC_SET_STD_HEAP; goto backtracking; }else{ @@ -294,7 +271,6 @@ static void MC_modelcheck_liveness_main(void) req = MC_state_get_request(current_pair->graph_state, &value); if (dot_output != NULL) { - MC_SET_MC_HEAP; if (initial_global_state->prev_pair != 0 && initial_global_state->prev_pair != current_pair->num) { fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, current_pair->num, initial_global_state->prev_req); xbt_free(initial_global_state->prev_req); @@ -304,7 +280,6 @@ static void MC_modelcheck_liveness_main(void) if (current_pair->search_cycle) fprintf(dot_output, "%d [shape=doublecircle];\n", current_pair->num); fflush(dot_output); - MC_SET_STD_HEAP; } char* req_str = MC_request_to_string(req, value, MC_REQUEST_SIMIX); @@ -323,9 +298,7 @@ static void MC_modelcheck_liveness_main(void) MC_simcall_handle(req, value); /* Wait for requests (schedules processes) */ - MC_wait_for_requests(); - - MC_SET_MC_HEAP; + mc_model_checker->wait_for_requests(); current_pair->requests--; current_pair->exploration_started = 1; @@ -363,9 +336,7 @@ static void MC_modelcheck_liveness_main(void) } cursor--; } - - MC_SET_STD_HEAP; - + } /* End of visited_pair test */ } else { @@ -374,8 +345,6 @@ static void MC_modelcheck_liveness_main(void) if(visited_num == -1) XBT_DEBUG("No more request to execute. Looking for backtracking point."); - MC_SET_MC_HEAP; - xbt_dynar_free(&prop_values); /* Traverse the stack backwards until a pair with a non empty interleave @@ -385,7 +354,6 @@ static void MC_modelcheck_liveness_main(void) /* We found a backtracking point */ XBT_DEBUG("Backtracking to depth %d", current_pair->depth); xbt_fifo_unshift(mc_stack, current_pair); - MC_SET_STD_HEAP; MC_replay_liveness(mc_stack); XBT_DEBUG("Backtracking done"); break; @@ -397,43 +365,40 @@ static void MC_modelcheck_liveness_main(void) MC_pair_delete(current_pair); } } - - MC_SET_STD_HEAP; + } /* End of if (current_pair->requests > 0) else ... */ } /* End of while(xbt_fifo_size(mc_stack) > 0) */ - + + XBT_INFO("No property violation found."); + MC_print_statistics(mc_stats); + return SIMGRID_MC_EXIT_SUCCESS; } -void MC_modelcheck_liveness(void) +int MC_modelcheck_liveness(void) { if (mc_reduce_kind == e_mc_reduce_unset) mc_reduce_kind = e_mc_reduce_none; XBT_INFO("Check the liveness property %s", _sg_mc_property_file); MC_automaton_load(_sg_mc_property_file); - MC_wait_for_requests(); + mc_model_checker->wait_for_requests(); XBT_DEBUG("Starting the liveness algorithm"); _sg_mc_liveness = 1; - xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap); - /* Create exploration stack */ mc_stack = xbt_fifo_new(); /* Create the initial state */ initial_global_state = xbt_new0(s_mc_global_t, 1); - MC_SET_STD_HEAP; - MC_pre_modelcheck_liveness(); + int res = MC_modelcheck_liveness_main(); /* We're done */ - MC_print_statistics(mc_stats); xbt_free(mc_time); - mmalloc_set_current_heap(heap); - + return res; } }