X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a53f7d4cc60063804afca1625eae861fb890b3c5..2b32f4ae7739666694f8f27ff5122c829daa94dc:/src/mc/LivenessChecker.cpp diff --git a/src/mc/LivenessChecker.cpp b/src/mc/LivenessChecker.cpp index b2d9553adb..cc3ae5dc8d 100644 --- a/src/mc/LivenessChecker.cpp +++ b/src/mc/LivenessChecker.cpp @@ -33,18 +33,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, "Logging specific to algorithms for liveness properties verification"); -/********* Global variables *********/ - /********* Static functions *********/ namespace simgrid { namespace mc { -std::list LivenessChecker::acceptance_pairs; -std::list LivenessChecker::liveness_stack; -xbt_dynar_t LivenessChecker::visited_pairs; - -VisitedPair::VisitedPair(int pair_num, xbt_automaton_state_t automaton_state, xbt_dynar_t atomic_propositions, std::shared_ptr graph_state) +VisitedPair::VisitedPair( + int pair_num, xbt_automaton_state_t automaton_state, + std::vector const& atomic_propositions, std::shared_ptr graph_state) { simgrid::mc::Process* process = &(mc_model_checker->process()); @@ -61,51 +57,48 @@ VisitedPair::VisitedPair(int pair_num, xbt_automaton_state_t automaton_state, xb this->automaton_state = automaton_state; this->num = pair_num; this->other_num = -1; - this->acceptance_removed = 0; - this->visited_removed = 0; - this->acceptance_pair = 0; - this->atomic_propositions = simgrid::xbt::unique_ptr( - xbt_dynar_new(sizeof(int), nullptr)); - - unsigned int cursor = 0; - int value; - xbt_dynar_foreach(atomic_propositions, cursor, value) - xbt_dynar_push_as(this->atomic_propositions.get(), int, value); + this->atomic_propositions = atomic_propositions; } VisitedPair::~VisitedPair() { } -static int MC_automaton_evaluate_label(xbt_automaton_exp_label_t l, - xbt_dynar_t atomic_propositions_values) +static int MC_automaton_evaluate_label( + xbt_automaton_exp_label_t l, + std::vector const& atomic_propositions_values) { switch (l->type) { - case 0:{ - 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); + case xbt_automaton_exp_label::AUT_OR:{ + 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, atomic_propositions_values); - int right_res = MC_automaton_evaluate_label(l->u.or_and.right_exp, atomic_propositions_values); + case xbt_automaton_exp_label::AUT_AND:{ + 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, atomic_propositions_values); + case xbt_automaton_exp_label::AUT_NOT:{ + int res = MC_automaton_evaluate_label( + l->u.exp_not, atomic_propositions_values); return (!res); } - case 3:{ + case xbt_automaton_exp_label::AUT_PREDICAT:{ unsigned int cursor = 0; xbt_automaton_propositional_symbol_t p = nullptr; xbt_dynar_foreach(simgrid::mc::property_automaton->propositional_symbols, cursor, p) { if (std::strcmp(xbt_automaton_propositional_symbol_get_name(p), l->u.predicat) == 0) - return (int) xbt_dynar_get_as(atomic_propositions_values, cursor, int); + return atomic_propositions_values[cursor]; } return -1; } - case 4: + case xbt_automaton_exp_label::AUT_ONE: return 2; default: return -1; @@ -117,15 +110,13 @@ Pair::Pair() : num(++mc_stats->expanded_pairs) Pair::~Pair() {} -simgrid::xbt::unique_ptr LivenessChecker::getPropositionValues() +std::vector LivenessChecker::getPropositionValues() { + std::vector values; unsigned int cursor = 0; xbt_automaton_propositional_symbol_t ps = nullptr; - simgrid::xbt::unique_ptr values = simgrid::xbt::unique_ptr(xbt_dynar_new(sizeof(int), nullptr)); - xbt_dynar_foreach(simgrid::mc::property_automaton->propositional_symbols, cursor, ps) { - int res = xbt_automaton_propositional_symbol_evaluate(ps); - xbt_dynar_push_as(values.get(), int, res); - } + xbt_dynar_foreach(simgrid::mc::property_automaton->propositional_symbols, cursor, ps) + values.push_back(xbt_automaton_propositional_symbol_evaluate(ps)); return values; } @@ -138,27 +129,23 @@ int LivenessChecker::compare(simgrid::mc::VisitedPair* state1, simgrid::mc::Visi return simgrid::mc::snapshot_compare(num1, s1, num2, s2); } -simgrid::mc::VisitedPair* LivenessChecker::insertAcceptancePair(simgrid::mc::Pair* pair) +std::shared_ptr LivenessChecker::insertAcceptancePair(simgrid::mc::Pair* pair) { - auto new_pair = - std::unique_ptr(new VisitedPair( - pair->num, pair->automaton_state, pair->atomic_propositions.get(), - pair->graph_state)); - new_pair->acceptance_pair = 1; + std::shared_ptr new_pair = std::make_shared( + pair->num, pair->automaton_state, pair->atomic_propositions, + pair->graph_state); - auto res = std::equal_range(acceptance_pairs.begin(), acceptance_pairs.end(), - new_pair, simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap()); + auto res = std::equal_range(acceptancePairs_.begin(), acceptancePairs_.end(), + new_pair.get(), simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap()); - if (pair->search_cycle == 1) + if (pair->search_cycle) for (auto i = res.first; i != res.second; ++i) { - simgrid::mc::VisitedPair* pair_test = *i; + std::shared_ptr const& pair_test = *i; 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.get(), - new_pair->atomic_propositions.get()) == 0) { - if (this->compare(pair_test, new_pair.get()) == 0) { + if (pair_test->atomic_propositions == new_pair->atomic_propositions) { + if (this->compare(pair_test.get(), new_pair.get()) == 0) { XBT_INFO("Pair %d already reached (equal to pair %d) !", new_pair->num, pair_test->num); - liveness_stack.pop_back(); + livenessStack_.pop_back(); if (dot_output != nullptr) fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", initial_global_state->prev_pair, pair_test->num, initial_global_state->prev_req); return nullptr; @@ -167,19 +154,15 @@ simgrid::mc::VisitedPair* LivenessChecker::insertAcceptancePair(simgrid::mc::Pai } } - auto new_raw_pair = new_pair.release(); - acceptance_pairs.insert(res.first, new_raw_pair); - return new_raw_pair; + acceptancePairs_.insert(res.first, new_pair); + return new_pair; } void LivenessChecker::removeAcceptancePair(int pair_num) { - for (auto i = acceptance_pairs.begin(); i != acceptance_pairs.end(); ++i) + for (auto i = acceptancePairs_.begin(); i != acceptancePairs_.end(); ++i) if ((*i)->num == pair_num) { - acceptance_pairs.erase(i); - (*i)->acceptance_removed = 1; - if (_sg_mc_visited == 0 || (*i)->visited_removed == 1) - delete *i; + acceptancePairs_.erase(i); break; } } @@ -188,9 +171,6 @@ void LivenessChecker::prepare(void) { simgrid::mc::Pair* initial_pair = nullptr; mc_model_checker->wait_for_requests(); - acceptance_pairs.clear(); - if(_sg_mc_visited > 0) - LivenessChecker::visited_pairs = xbt_dynar_new(sizeof(simgrid::mc::VisitedPair*), nullptr); initial_global_state->snapshot = simgrid::mc::take_snapshot(0); initial_global_state->prev_pair = 0; @@ -213,9 +193,9 @@ void LivenessChecker::prepare(void) MC_state_interleave_process(initial_pair->graph_state.get(), &p.copy); initial_pair->requests = MC_state_interleave_size(initial_pair->graph_state.get()); - initial_pair->search_cycle = 0; + initial_pair->search_cycle = false; - liveness_stack.push_back(initial_pair); + livenessStack_.push_back(initial_pair); } } } @@ -231,7 +211,7 @@ void LivenessChecker::replay() /* Intermediate backtracking */ if(_sg_mc_checkpoint > 0) { - simgrid::mc::Pair* pair = liveness_stack.back(); + simgrid::mc::Pair* pair = livenessStack_.back(); if(pair->graph_state->system_state){ simgrid::mc::restore_snapshot(pair->graph_state->system_state); return; @@ -242,8 +222,8 @@ void LivenessChecker::replay() simgrid::mc::restore_snapshot(initial_global_state->snapshot); /* Traverse the stack from the initial state and re-execute the transitions */ - for (simgrid::mc::Pair* pair : liveness_stack) { - if (pair == liveness_stack.back()) + for (simgrid::mc::Pair* pair : livenessStack_) { + if (pair == livenessStack_.back()) break; std::shared_ptr state = pair->graph_state; @@ -285,69 +265,55 @@ void LivenessChecker::replay() /** * \brief Checks whether a given pair has already been visited by the algorithm. */ -int LivenessChecker::insertVisitedPair(simgrid::mc::VisitedPair* visited_pair, simgrid::mc::Pair* pair) +int LivenessChecker::insertVisitedPair(std::shared_ptr visited_pair, simgrid::mc::Pair* pair) { if (_sg_mc_visited == 0) return -1; - simgrid::mc::VisitedPair* new_visited_pair = nullptr; if (visited_pair == nullptr) - new_visited_pair = new simgrid::mc::VisitedPair( - pair->num, pair->automaton_state, pair->atomic_propositions.get(), + visited_pair = std::make_shared( + pair->num, pair->automaton_state, pair->atomic_propositions, pair->graph_state); - else - new_visited_pair = visited_pair; - - auto visited_pairs = simgrid::xbt::range(LivenessChecker::visited_pairs); - auto range = std::equal_range(visited_pairs.begin(), visited_pairs.end(), - new_visited_pair, simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap()); + auto range = std::equal_range(visitedPairs_.begin(), visitedPairs_.end(), + visited_pair.get(), simgrid::mc::DerefAndCompareByNbProcessesAndUsedHeap()); for (auto i = range.first; i != range.second; ++i) { - simgrid::mc::VisitedPair* pair_test = *i; - std::size_t cursor = i - visited_pairs.begin(); - if (xbt_automaton_state_compare(pair_test->automaton_state, new_visited_pair->automaton_state) == 0) { - if (xbt_automaton_propositional_symbols_compare_value( - pair_test->atomic_propositions.get(), - new_visited_pair->atomic_propositions.get()) == 0) { - if (this->compare(pair_test, new_visited_pair) == 0) { + VisitedPair* pair_test = i->get(); + if (xbt_automaton_state_compare(pair_test->automaton_state, visited_pair->automaton_state) == 0) { + if (pair_test->atomic_propositions == visited_pair->atomic_propositions) { + if (this->compare(pair_test, visited_pair.get()) == 0) { if (pair_test->other_num == -1) - new_visited_pair->other_num = pair_test->num; + visited_pair->other_num = pair_test->num; else - new_visited_pair->other_num = pair_test->other_num; + visited_pair->other_num = pair_test->other_num; if (dot_output == nullptr) - XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", new_visited_pair->num, pair_test->num); + XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", + visited_pair->num, pair_test->num); else - XBT_DEBUG("Pair %d already visited ! (equal to pair %d (pair %d in dot_output))", new_visited_pair->num, pair_test->num, new_visited_pair->other_num); - xbt_dynar_remove_at(LivenessChecker::visited_pairs, cursor, &pair_test); - xbt_dynar_insert_at(LivenessChecker::visited_pairs, cursor, &new_visited_pair); - pair_test->visited_removed = 1; - if (!pair_test->acceptance_pair - || pair_test->acceptance_removed == 1) - delete pair_test; - return new_visited_pair->other_num; + XBT_DEBUG("Pair %d already visited ! (equal to pair %d (pair %d in dot_output))", + visited_pair->num, pair_test->num, visited_pair->other_num); + (*i) = std::move(visited_pair); + return (*i)->other_num; } } } } - xbt_dynar_insert_at(LivenessChecker::visited_pairs, range.first - visited_pairs.begin(), &new_visited_pair); + visitedPairs_.insert(range.first, std::move(visited_pair)); - if ((ssize_t) visited_pairs.size() > _sg_mc_visited) { + if (visitedPairs_.size() > (std::size_t) _sg_mc_visited) { int min2 = mc_stats->expanded_pairs; - unsigned int index2 = 0; - for (std::size_t i = 0; i != (std::size_t) visited_pairs.size(); ++i) { - simgrid::mc::VisitedPair* pair_test = visited_pairs[i]; - if (pair_test->num < min2) { + + std::list>::iterator index2; + for (auto i = visitedPairs_.begin(); i != visitedPairs_.end(); ++i) { + if ((*i)->num < min2) { index2 = i; - min2 = pair_test->num; + min2 = (*i)->num; } } - simgrid::mc::VisitedPair* pair_test = nullptr; - xbt_dynar_remove_at(LivenessChecker::visited_pairs, index2, &pair_test); - pair_test->visited_removed = 1; - if (!pair_test->acceptance_pair || pair_test->acceptance_removed) - delete pair_test; + + visitedPairs_.erase(index2); } return -1; @@ -364,7 +330,7 @@ LivenessChecker::~LivenessChecker() RecordTrace LivenessChecker::getRecordTrace() // override { RecordTrace res; - for (simgrid::mc::Pair* pair : liveness_stack) { + for (simgrid::mc::Pair* pair : livenessStack_) { int value; smx_simcall_t req = MC_state_get_executed_request(pair->graph_state.get(), &value); if (req && req->call != SIMCALL_NONE) { @@ -394,7 +360,7 @@ void LivenessChecker::showAcceptanceCycle(std::size_t depth) std::vector LivenessChecker::getTextualTrace() // override { std::vector trace; - for (simgrid::mc::Pair* pair : liveness_stack) { + for (simgrid::mc::Pair* pair : livenessStack_) { int value; smx_simcall_t req = MC_state_get_executed_request(pair->graph_state.get(), &value); if (req && req->call != SIMCALL_NONE) { @@ -413,13 +379,12 @@ int LivenessChecker::main(void) smx_simcall_t req = nullptr; xbt_automaton_transition_t transition_succ = nullptr; int cursor = 0; - simgrid::xbt::unique_ptr prop_values; - simgrid::mc::VisitedPair* reached_pair = nullptr; + std::shared_ptr reached_pair = nullptr; - while (!liveness_stack.empty()){ + while (!livenessStack_.empty()){ /* Get current pair */ - current_pair = liveness_stack.back(); + current_pair = livenessStack_.back(); /* Update current state in buchi automaton */ simgrid::mc::property_automaton->current_state = current_pair->automaton_state; @@ -431,7 +396,7 @@ int LivenessChecker::main(void) if (current_pair->requests > 0) { - if (current_pair->automaton_state->type == 1 && current_pair->exploration_started == 0) { + if (current_pair->automaton_state->type == 1 && !current_pair->exploration_started) { /* If new acceptance pair, return new pair */ if ((reached_pair = this->insertAcceptancePair(current_pair)) == nullptr) { this->showAcceptanceCycle(current_pair->depth); @@ -440,7 +405,7 @@ int LivenessChecker::main(void) } /* Pair already visited ? stop the exploration on the current path */ - if ((current_pair->exploration_started == 0) + if ((!current_pair->exploration_started) && (visited_num = this->insertVisitedPair( reached_pair, current_pair)) != -1) { @@ -478,7 +443,7 @@ int LivenessChecker::main(void) /* Update mc_stats */ mc_stats->executed_transitions++; - if(current_pair->exploration_started == 0) + if (!current_pair->exploration_started) mc_stats->visited_pairs++; /* Answer the request */ @@ -488,16 +453,16 @@ int LivenessChecker::main(void) mc_model_checker->wait_for_requests(); current_pair->requests--; - current_pair->exploration_started = 1; + current_pair->exploration_started = true; /* Get values of atomic propositions (variables used in the property formula) */ - prop_values = this->getPropositionValues(); + std::vector prop_values = this->getPropositionValues(); /* Evaluate enabled/true transitions in automaton according to atomic propositions values and create new pairs */ cursor = xbt_dynar_length(current_pair->automaton_state->out) - 1; while (cursor >= 0) { transition_succ = (xbt_automaton_transition_t)xbt_dynar_get_as(current_pair->automaton_state->out, cursor, xbt_automaton_transition_t); - res = MC_automaton_evaluate_label(transition_succ->label, prop_values.get()); + res = MC_automaton_evaluate_label(transition_succ->label, prop_values); if (res == 1 || res == 2) { /* 1 = True transition (always enabled), 2 = enabled transition according to atomic prop values */ Pair* next_pair = new Pair(); next_pair->graph_state = std::shared_ptr(MC_state_new()); @@ -513,10 +478,10 @@ int LivenessChecker::main(void) /* FIXME : get search_cycle value for each acceptant state */ if (next_pair->automaton_state->type == 1 || current_pair->search_cycle) - next_pair->search_cycle = 1; + next_pair->search_cycle = true; /* Add new pair to the exploration stack */ - liveness_stack.push_back(next_pair); + livenessStack_.push_back(next_pair); } cursor--; @@ -530,17 +495,15 @@ int LivenessChecker::main(void) if(visited_num == -1) XBT_DEBUG("No more request to execute. Looking for backtracking point."); - prop_values.reset(); - /* Traverse the stack backwards until a pair with a non empty interleave set is found, deleting all the pairs that have it empty in the way. */ - while (!liveness_stack.empty()) { - current_pair = liveness_stack.back(); - liveness_stack.pop_back(); + while (!livenessStack_.empty()) { + current_pair = livenessStack_.back(); + livenessStack_.pop_back(); if (current_pair->requests > 0) { /* We found a backtracking point */ XBT_DEBUG("Backtracking to depth %d", current_pair->depth); - liveness_stack.push_back(current_pair); + livenessStack_.push_back(current_pair); this->replay(); XBT_DEBUG("Backtracking done"); break; @@ -569,10 +532,6 @@ int LivenessChecker::run() mc_model_checker->wait_for_requests(); XBT_DEBUG("Starting the liveness algorithm"); - _sg_mc_liveness = 1; - - /* Create exploration stack */ - liveness_stack.clear(); /* Create the initial state */ simgrid::mc::initial_global_state = std::unique_ptr(new s_mc_global_t()); @@ -580,8 +539,14 @@ int LivenessChecker::run() this->prepare(); int res = this->main(); simgrid::mc::initial_global_state = nullptr; + return res; } +Checker* createLivenessChecker(Session& session) +{ + return new LivenessChecker(session); +} + } }