-/* Copyright (c) 2011-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2011-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <xbt/automaton.h>
#include <xbt/dynar.h>
-#include <xbt/dynar.hpp>
#include <xbt/log.h>
#include <xbt/sysdep.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_private.h"
-#include "src/mc/mc_record.h"
-#include "src/mc/mc_replay.h"
-#include "src/mc/mc_request.h"
-#include "src/mc/mc_smx.h"
+#include "src/mc/mc_exit.hpp"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_record.hpp"
+#include "src/mc/mc_replay.hpp"
+#include "src/mc/mc_request.hpp"
+#include "src/mc/mc_smx.hpp"
#include "src/mc/remote/Client.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc, "Logging specific to algorithms for liveness properties verification");
return values[cursor] != 0;
}
xbt_die("Missing predicate");
+ break;
}
case xbt_automaton_exp_label::AUT_ONE:
return true;
}
/**
- * \brief Checks whether a given pair has already been visited by the algorithm.
+ * @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)
{
void LivenessChecker::logState() // override
{
- Checker::logState();
XBT_INFO("Expanded pairs = %lu", expandedPairsCount_);
XBT_INFO("Visited pairs = %lu", visitedPairsCount_);
XBT_INFO("Executed transitions = %lu", mc_model_checker->executed_transitions);
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> next_pair = std::make_shared<Pair>(++expandedPairsCount_);
+ expandedPairsCount_++;
+ std::shared_ptr<Pair> next_pair = std::make_shared<Pair>(expandedPairsCount_);
next_pair->automaton_state = state;
next_pair->graph_state = std::shared_ptr<simgrid::mc::State>(new simgrid::mc::State(++expandedStatesCount_));
next_pair->atomic_propositions = std::move(propositions);
void LivenessChecker::run()
{
- XBT_INFO("Check the liveness property %s", _sg_mc_property_file);
- MC_automaton_load(_sg_mc_property_file);
+ XBT_INFO("Check the liveness property %s", _sg_mc_property_file.get().c_str());
+ MC_automaton_load(_sg_mc_property_file.get().c_str());
XBT_DEBUG("Starting the liveness algorithm");
simgrid::mc::session->initialize();
}
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())) == nullptr) {
- this->showAcceptanceCycle(current_pair->depth);
- throw simgrid::mc::LivenessError();
+ if (current_pair->automaton_state->type == 1 && not current_pair->exploration_started) {
+ reached_pair = this->insertAcceptancePair(current_pair.get());
+ if (reached_pair == 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 ((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,
- this->previousRequest_.c_str());
- fflush(dot_output);
+ if (not current_pair->exploration_started) {
+ int visited_num = this->insertVisitedPair(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());
+ fflush(dot_output);
+ }
+ XBT_DEBUG("Pair already visited (equal to pair %d), exploration on the current path stopped.", visited_num);
+ current_pair->requests = 0;
+ this->backtrack();
+ continue;
}
- XBT_DEBUG("Pair already visited (equal to pair %d), exploration on the current path stopped.", visited_num);
- current_pair->requests = 0;
- this->backtrack();
- continue;
}
smx_simcall_t req = MC_state_get_request(current_pair->graph_state.get());