Pair::Pair(unsigned long expanded_pairs) : num(expanded_pairs)
{}
-std::shared_ptr<const std::vector<int>> LivenessChecker::getPropositionValues()
+std::shared_ptr<const std::vector<int>> LivenessChecker::get_proposition_values()
{
std::vector<int> values;
unsigned int cursor = 0;
return simgrid::mc::snapshot_compare(s1, s2);
}
-std::shared_ptr<VisitedPair> LivenessChecker::insertAcceptancePair(simgrid::mc::Pair* pair)
+std::shared_ptr<VisitedPair> LivenessChecker::insert_acceptance_pair(simgrid::mc::Pair* pair)
{
std::shared_ptr<VisitedPair> new_pair = std::make_shared<VisitedPair>(
pair->num, pair->automaton_state, pair->atomic_propositions,
pair->graph_state);
- auto res = boost::range::equal_range(acceptancePairs_, new_pair.get(),
+ auto res = boost::range::equal_range(acceptance_pairs_, new_pair.get(),
simgrid::mc::DerefAndCompareByActorsCountAndUsedHeap());
if (pair->search_cycle) for (auto i = res.first; i != res.second; ++i) {
|| this->compare(pair_test.get(), new_pair.get()) != 0)
continue;
XBT_INFO("Pair %d already reached (equal to pair %d) !", new_pair->num, pair_test->num);
- explorationStack_.pop_back();
+ exploration_stack_.pop_back();
if (dot_output != nullptr)
- fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", this->previousPair_, pair_test->num,
- this->previousRequest_.c_str());
+ fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", this->previous_pair_, pair_test->num,
+ this->previous_request_.c_str());
return nullptr;
}
- acceptancePairs_.insert(res.first, new_pair);
+ acceptance_pairs_.insert(res.first, new_pair);
return new_pair;
}
-void LivenessChecker::removeAcceptancePair(int pair_num)
+void LivenessChecker::remove_acceptance_pair(int pair_num)
{
- for (auto i = acceptancePairs_.begin(); i != acceptancePairs_.end(); ++i)
+ for (auto i = acceptance_pairs_.begin(); i != acceptance_pairs_.end(); ++i)
if ((*i)->num == pair_num) {
- acceptancePairs_.erase(i);
+ acceptance_pairs_.erase(i);
break;
}
}
/* Intermediate backtracking */
if(_sg_mc_checkpoint > 0) {
- simgrid::mc::Pair* pair = explorationStack_.back().get();
+ simgrid::mc::Pair* pair = exploration_stack_.back().get();
if(pair->graph_state->system_state){
pair->graph_state->system_state->restore(&mc_model_checker->process());
return;
/* Traverse the stack from the initial state and re-execute the transitions */
int depth = 1;
- for (std::shared_ptr<Pair> const& pair : explorationStack_) {
- if (pair == explorationStack_.back())
+ for (std::shared_ptr<Pair> const& pair : exploration_stack_) {
+ if (pair == exploration_stack_.back())
break;
std::shared_ptr<State> state = pair->graph_state;
state.get());
}
- this->getSession().execute(state->transition);
+ this->get_session().execute(state->transition);
}
/* Update statistics */
- visitedPairsCount_++;
+ visited_pairs_count_++;
mc_model_checker->executed_transitions++;
depth++;
/**
* @brief Checks whether a given pair has already been visited by the algorithm.
*/
-int LivenessChecker::insertVisitedPair(std::shared_ptr<VisitedPair> visited_pair, simgrid::mc::Pair* pair)
+int LivenessChecker::insert_visited_pair(std::shared_ptr<VisitedPair> visited_pair, simgrid::mc::Pair* pair)
{
if (_sg_mc_max_visited_states == 0)
return -1;
visited_pair =
std::make_shared<VisitedPair>(pair->num, pair->automaton_state, pair->atomic_propositions, pair->graph_state);
- auto range = boost::range::equal_range(visitedPairs_, visited_pair.get(),
+ auto range = boost::range::equal_range(visited_pairs_, visited_pair.get(),
simgrid::mc::DerefAndCompareByActorsCountAndUsedHeap());
for (auto i = range.first; i != range.second; ++i) {
return (*i)->other_num;
}
- visitedPairs_.insert(range.first, std::move(visited_pair));
- this->purgeVisitedPairs();
+ visited_pairs_.insert(range.first, std::move(visited_pair));
+ this->purge_visited_pairs();
return -1;
}
-void LivenessChecker::purgeVisitedPairs()
+void LivenessChecker::purge_visited_pairs()
{
- if (_sg_mc_max_visited_states != 0 && visitedPairs_.size() > (std::size_t)_sg_mc_max_visited_states) {
+ if (_sg_mc_max_visited_states != 0 && visited_pairs_.size() > (std::size_t)_sg_mc_max_visited_states) {
// Remove the oldest entry with a linear search:
- visitedPairs_.erase(boost::min_element(visitedPairs_,
- [](std::shared_ptr<VisitedPair> const a, std::shared_ptr<VisitedPair> const& b) {
- return a->num < b->num; } ));
+ visited_pairs_.erase(
+ boost::min_element(visited_pairs_, [](std::shared_ptr<VisitedPair> const a,
+ std::shared_ptr<VisitedPair> const& b) { return a->num < b->num; }));
}
}
{
}
-RecordTrace LivenessChecker::getRecordTrace() // override
+RecordTrace LivenessChecker::get_record_trace() // override
{
RecordTrace res;
- for (std::shared_ptr<Pair> const& pair : explorationStack_)
+ for (std::shared_ptr<Pair> const& pair : exploration_stack_)
res.push_back(pair->graph_state->getTransition());
return res;
}
-void LivenessChecker::logState() // override
+void LivenessChecker::log_state() // override
{
- XBT_INFO("Expanded pairs = %lu", expandedPairsCount_);
- XBT_INFO("Visited pairs = %lu", visitedPairsCount_);
+ XBT_INFO("Expanded pairs = %lu", expanded_pairs_count_);
+ XBT_INFO("Visited pairs = %lu", visited_pairs_count_);
XBT_INFO("Executed transitions = %lu", mc_model_checker->executed_transitions);
}
-void LivenessChecker::showAcceptanceCycle(std::size_t depth)
+void LivenessChecker::show_acceptance_cycle(std::size_t depth)
{
XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
XBT_INFO("| ACCEPTANCE CYCLE |");
XBT_INFO("*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*");
XBT_INFO("Counter-example that violates formula:");
- for (auto const& s : this->getTextualTrace())
+ for (auto const& s : this->get_textual_trace())
XBT_INFO(" %s", s.c_str());
simgrid::mc::dumpRecordPath();
simgrid::mc::session->log_state();
XBT_INFO("Counter-example depth: %zu", depth);
}
-std::vector<std::string> LivenessChecker::getTextualTrace() // override
+std::vector<std::string> LivenessChecker::get_textual_trace() // override
{
std::vector<std::string> trace;
- for (std::shared_ptr<Pair> const& pair : explorationStack_) {
+ for (std::shared_ptr<Pair> const& pair : exploration_stack_) {
int req_num = pair->graph_state->transition.argument;
smx_simcall_t req = &pair->graph_state->executed_req;
if (req && req->call != SIMCALL_NONE)
return trace;
}
-std::shared_ptr<Pair> LivenessChecker::newPair(Pair* current_pair, xbt_automaton_state_t state,
- std::shared_ptr<const std::vector<int>> propositions)
+std::shared_ptr<Pair> LivenessChecker::create_pair(Pair* current_pair, xbt_automaton_state_t state,
+ std::shared_ptr<const std::vector<int>> propositions)
{
- expandedPairsCount_++;
- std::shared_ptr<Pair> next_pair = std::make_shared<Pair>(expandedPairsCount_);
+ expanded_pairs_count_++;
+ std::shared_ptr<Pair> next_pair = std::make_shared<Pair>(expanded_pairs_count_);
next_pair->automaton_state = state;
- next_pair->graph_state = std::shared_ptr<simgrid::mc::State>(new simgrid::mc::State(++expandedStatesCount_));
+ next_pair->graph_state = std::shared_ptr<simgrid::mc::State>(new simgrid::mc::State(++expanded_states_count_));
next_pair->atomic_propositions = std::move(propositions);
if (current_pair)
next_pair->depth = current_pair->depth + 1;
next_pair->depth = 1;
/* Get enabled actors and insert them in the interleave set of the next graph_state */
for (auto& actor : mc_model_checker->process().actors())
- if (simgrid::mc::actor_is_enabled(actor.copy.getBuffer()))
- next_pair->graph_state->addInterleavingSet(actor.copy.getBuffer());
+ if (simgrid::mc::actor_is_enabled(actor.copy.get_buffer()))
+ next_pair->graph_state->addInterleavingSet(actor.copy.get_buffer());
next_pair->requests = next_pair->graph_state->interleaveSize();
/* FIXME : get search_cycle value for each accepting state */
if (next_pair->automaton_state->type == 1 || (current_pair && current_pair->search_cycle))
{
/* 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 (not explorationStack_.empty()) {
- std::shared_ptr<simgrid::mc::Pair> current_pair = explorationStack_.back();
- explorationStack_.pop_back();
+ while (not exploration_stack_.empty()) {
+ std::shared_ptr<simgrid::mc::Pair> current_pair = exploration_stack_.back();
+ exploration_stack_.pop_back();
if (current_pair->requests > 0) {
/* We found a backtracking point */
XBT_DEBUG("Backtracking to depth %d", current_pair->depth);
- explorationStack_.push_back(std::move(current_pair));
+ exploration_stack_.push_back(std::move(current_pair));
this->replay();
XBT_DEBUG("Backtracking done");
break;
} else {
XBT_DEBUG("Delete pair %d at depth %d", current_pair->num, current_pair->depth);
if (current_pair->automaton_state->type == 1)
- this->removeAcceptancePair(current_pair->num);
+ this->remove_acceptance_pair(current_pair->num);
}
}
}
simgrid::mc::session->initialize();
/* Initialize */
- this->previousPair_ = 0;
+ this->previous_pair_ = 0;
- std::shared_ptr<const std::vector<int>> propos = this->getPropositionValues();
+ std::shared_ptr<const std::vector<int>> propos = this->get_proposition_values();
// For each initial state of the property automaton, push a
// (application_state, automaton_state) pair to the exploration stack:
xbt_automaton_state_t automaton_state;
xbt_dynar_foreach (simgrid::mc::property_automaton->states, cursor, automaton_state)
if (automaton_state->type == -1)
- explorationStack_.push_back(this->newPair(nullptr, automaton_state, propos));
+ exploration_stack_.push_back(this->create_pair(nullptr, automaton_state, propos));
/* Actually run the double DFS search for counter-examples */
- while (not explorationStack_.empty()) {
- std::shared_ptr<Pair> current_pair = explorationStack_.back();
+ while (not exploration_stack_.empty()) {
+ std::shared_ptr<Pair> current_pair = exploration_stack_.back();
/* Update current state in buchi automaton */
simgrid::mc::property_automaton->current_state = current_pair->automaton_state;
std::shared_ptr<VisitedPair> reached_pair;
if (current_pair->automaton_state->type == 1 && not current_pair->exploration_started) {
- reached_pair = this->insertAcceptancePair(current_pair.get());
+ reached_pair = this->insert_acceptance_pair(current_pair.get());
if (reached_pair == nullptr) {
- this->showAcceptanceCycle(current_pair->depth);
+ this->show_acceptance_cycle(current_pair->depth);
throw simgrid::mc::LivenessError();
}
}
/* Pair already visited ? stop the exploration on the current path */
if (not current_pair->exploration_started) {
- int visited_num = this->insertVisitedPair(reached_pair, current_pair.get());
+ int visited_num = this->insert_visited_pair(reached_pair, current_pair.get());
if (visited_num != -1) {
if (dot_output != nullptr) {
- fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", this->previousPair_, visited_num,
- this->previousRequest_.c_str());
+ fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", this->previous_pair_, visited_num,
+ this->previous_request_.c_str());
fflush(dot_output);
}
XBT_DEBUG("Pair already visited (equal to pair %d), exploration on the current path stopped.", visited_num);
int req_num = current_pair->graph_state->transition.argument;
if (dot_output != nullptr) {
- if (this->previousPair_ != 0 && this->previousPair_ != current_pair->num) {
- fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
- this->previousPair_, current_pair->num,
- this->previousRequest_.c_str());
- this->previousRequest_.clear();
+ if (this->previous_pair_ != 0 && this->previous_pair_ != current_pair->num) {
+ fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n", this->previous_pair_, current_pair->num,
+ this->previous_request_.c_str());
+ this->previous_request_.clear();
}
- this->previousPair_ = current_pair->num;
- this->previousRequest_ = simgrid::mc::request_get_dot_output(req, req_num);
+ this->previous_pair_ = current_pair->num;
+ this->previous_request_ = simgrid::mc::request_get_dot_output(req, req_num);
if (current_pair->search_cycle)
fprintf(dot_output, "%d [shape=doublecircle];\n", current_pair->num);
fflush(dot_output);
/* Update stats */
mc_model_checker->executed_transitions++;
if (not current_pair->exploration_started)
- visitedPairsCount_++;
+ visited_pairs_count_++;
/* Answer the request */
mc_model_checker->handle_simcall(current_pair->graph_state->transition);
current_pair->exploration_started = true;
/* Get values of atomic propositions (variables used in the property formula) */
- std::shared_ptr<const std::vector<int>> prop_values = this->getPropositionValues();
+ std::shared_ptr<const std::vector<int>> prop_values = this->get_proposition_values();
// For each enabled transition in the property automaton, push a
// (application_state, automaton_state) pair to the exploration stack:
xbt_automaton_transition_t transition_succ = (xbt_automaton_transition_t)xbt_dynar_get_as(
current_pair->automaton_state->out, i, xbt_automaton_transition_t);
if (evaluate_label(transition_succ->label, *prop_values))
- explorationStack_.push_back(this->newPair(
- current_pair.get(), transition_succ->dst, prop_values));
+ exploration_stack_.push_back(this->create_pair(current_pair.get(), transition_succ->dst, prop_values));
}
}
