#include <simgrid_config.h>
#include <xbt/base.h>
-#include <xbt/dynar.h>
#include <xbt/automaton.h>
#include <xbt/memory.hpp>
#include "src/mc/mc_state.h"
bool search_cycle = false;
std::shared_ptr<simgrid::mc::State> graph_state = nullptr; /* System state included */
xbt_automaton_state_t automaton_state = nullptr;
- std::vector<int> atomic_propositions;
+ std::shared_ptr<const std::vector<int>> atomic_propositions;
int requests = 0;
int depth = 0;
bool exploration_started = false;
- Pair();
+ Pair(unsigned long expanded_pairs);
~Pair();
Pair(Pair const&) = delete;
int other_num = 0; /* Dot output for */
std::shared_ptr<simgrid::mc::State> graph_state = nullptr; /* System state included */
xbt_automaton_state_t automaton_state = nullptr;
- std::vector<int> atomic_propositions;
+ std::shared_ptr<const std::vector<int>> atomic_propositions;
std::size_t heap_bytes_used = 0;
int nb_processes = 0;
VisitedPair(
int pair_num, xbt_automaton_state_t automaton_state,
- std::vector<int> const& atomic_propositions,
+ std::shared_ptr<const std::vector<int>> atomic_propositions,
std::shared_ptr<simgrid::mc::State> graph_state);
~VisitedPair();
};
int run() override;
RecordTrace getRecordTrace() override;
std::vector<std::string> getTextualTrace() override;
+ void logState() override;
private:
int main();
void prepare();
int compare(simgrid::mc::VisitedPair* state1, simgrid::mc::VisitedPair* state2);
- std::vector<int> getPropositionValues();
+ std::shared_ptr<const std::vector<int>> getPropositionValues();
std::shared_ptr<VisitedPair> insertAcceptancePair(simgrid::mc::Pair* pair);
int insertVisitedPair(std::shared_ptr<VisitedPair> visited_pair, simgrid::mc::Pair* pair);
void showAcceptanceCycle(std::size_t depth);
void removeAcceptancePair(int pair_num);
void purgeVisitedPairs();
void backtrack();
- std::shared_ptr<Pair> newPair(Pair* pair, xbt_automaton_state_t state);
-public:
+ std::shared_ptr<Pair> newPair(Pair* pair, xbt_automaton_state_t state, std::shared_ptr<const std::vector<int>> propositions);
+private:
+ // A stack of (application_state, automaton_state) pairs for DFS exploration:
+ std::list<std::shared_ptr<Pair>> explorationStack_;
std::list<std::shared_ptr<VisitedPair>> acceptancePairs_;
- std::list<std::shared_ptr<Pair>> livenessStack_;
std::list<std::shared_ptr<VisitedPair>> visitedPairs_;
+ unsigned long visitedPairsCount_ = 0;
+ unsigned long expandedPairsCount_ = 0;
+ unsigned long expandedStatesCount_ = 0;
+ int previousPair_ = 0;
+ std::string previousRequest_;
};
}