#include <xbt/log.h>
#include <xbt/sysdep.h>
-#include "src/mc/mc_request.h"
+#include "src/mc/Session.hpp"
+#include "src/mc/Transition.hpp"
#include "src/mc/checker/LivenessChecker.hpp"
+#include "src/mc/mc_exit.h"
#include "src/mc/mc_private.h"
-#include "src/mc/mc_record.h"
-#include "src/mc/mc_smx.h"
-#include "src/mc/Client.hpp"
#include "src/mc/mc_private.h"
+#include "src/mc/mc_record.h"
#include "src/mc/mc_replay.h"
-#include "src/mc/mc_safety.h"
-#include "src/mc/mc_exit.h"
-#include "src/mc/Transition.hpp"
-#include "src/mc/Session.hpp"
+#include "src/mc/mc_request.h"
+#include "src/mc/mc_smx.h"
+#include "src/mc/remote/Client.hpp"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc,
- "Logging specific to algorithms for liveness properties verification");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, "Logging specific to algorithms for liveness properties verification");
/********* Static functions *********/
this->atomic_propositions = std::move(atomic_propositions);
}
-VisitedPair::~VisitedPair() = default;
-
-static bool evaluate_label(
- xbt_automaton_exp_label_t l, std::vector<int> const& values)
+static bool evaluate_label(xbt_automaton_exp_label_t l, std::vector<int> const& values)
{
switch (l->type) {
case xbt_automaton_exp_label::AUT_OR:
return evaluate_label(l->u.or_and.left_exp, values)
&& evaluate_label(l->u.or_and.right_exp, values);
case xbt_automaton_exp_label::AUT_NOT:
- return !evaluate_label(l->u.exp_not, values);
+ return not evaluate_label(l->u.exp_not, values);
case xbt_automaton_exp_label::AUT_PREDICAT:{
unsigned int cursor = 0;
xbt_automaton_propositional_symbol_t p = nullptr;
Pair::Pair(unsigned long expanded_pairs) : num(expanded_pairs)
{}
-Pair::~Pair() {}
-
std::shared_ptr<const std::vector<int>> LivenessChecker::getPropositionValues()
{
std::vector<int> values;
|| *(pair_test->atomic_propositions) != *(new_pair->atomic_propositions)
|| 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);
+ XBT_INFO("Pair %d already reached (equal to pair %d) !", new_pair->num, pair_test->num);
explorationStack_.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->previousPair_, pair_test->num,
+ this->previousRequest_.c_str());
return nullptr;
}
*/
int LivenessChecker::insertVisitedPair(std::shared_ptr<VisitedPair> visited_pair, simgrid::mc::Pair* pair)
{
- if (_sg_mc_visited == 0)
+ if (_sg_mc_max_visited_states == 0)
return -1;
if (visited_pair == nullptr)
- visited_pair = std::make_shared<VisitedPair>(
- pair->num, pair->automaton_state, pair->atomic_propositions,
- pair->graph_state);
+ 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(),
simgrid::mc::DerefAndCompareByActorsCountAndUsedHeap());
void LivenessChecker::purgeVisitedPairs()
{
- if (_sg_mc_visited != 0 && visitedPairs_.size() > (std::size_t) _sg_mc_visited) {
+ if (_sg_mc_max_visited_states != 0 && visitedPairs_.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) {
{
}
-LivenessChecker::~LivenessChecker()
-{
-}
-
RecordTrace LivenessChecker::getRecordTrace() // override
{
RecordTrace res;
/* 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->interleave(actor.copy.getBuffer());
+ next_pair->graph_state->addInterleavingSet(actor.copy.getBuffer());
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 (!explorationStack_.empty()) {
+ while (not explorationStack_.empty()) {
std::shared_ptr<simgrid::mc::Pair> current_pair = explorationStack_.back();
explorationStack_.pop_back();
if (current_pair->requests > 0) {
explorationStack_.push_back(this->newPair(nullptr, automaton_state, propos));
/* Actually run the double DFS search for counter-examples */
- while (!explorationStack_.empty()){
+ while (not explorationStack_.empty()) {
std::shared_ptr<Pair> current_pair = explorationStack_.back();
/* Update current state in buchi automaton */
}
std::shared_ptr<VisitedPair> reached_pair;
- if (current_pair->automaton_state->type == 1 && !current_pair->exploration_started
- && (reached_pair = this->insertAcceptancePair(current_pair.get())) == nullptr) {
+ if (current_pair->automaton_state->type == 1 && not current_pair->exploration_started &&
+ (reached_pair = this->insertAcceptancePair(current_pair.get())) == nullptr) {
this->showAcceptanceCycle(current_pair->depth);
throw simgrid::mc::LivenessError();
}
/* Pair already visited ? stop the exploration on the current path */
int visited_num = -1;
- if ((!current_pair->exploration_started)
- && (visited_num = this->insertVisitedPair(
- reached_pair, current_pair.get())) != -1) {
+ if ((not current_pair->exploration_started) &&
+ (visited_num = this->insertVisitedPair(reached_pair, current_pair.get())) != -1) {
if (dot_output != nullptr){
fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
this->previousPair_, visited_num,
/* Update stats */
mc_model_checker->executed_transitions++;
- if (!current_pair->exploration_started)
+ if (not current_pair->exploration_started)
visitedPairsCount_++;
/* Answer the request */
// For each enabled transition in the property automaton, push a
// (application_state, automaton_state) pair to the exploration stack:
- int cursor = xbt_dynar_length(current_pair->automaton_state->out) - 1;
- while (cursor >= 0) {
+ for (int cursor = xbt_dynar_length(current_pair->automaton_state->out) - 1; cursor >= 0; cursor--) {
xbt_automaton_transition_t transition_succ = (xbt_automaton_transition_t)xbt_dynar_get_as(current_pair->automaton_state->out, cursor, 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));
- cursor--;
}
}
