#ifndef SIMGRID_MC_SAFETY_CHECKER_HPP
#define SIMGRID_MC_SAFETY_CHECKER_HPP
+#include "src/mc/api/ClockVector.hpp"
#include "src/mc/api/State.hpp"
#include "src/mc/explo/Exploration.hpp"
+#include "src/mc/explo/odpor/Execution.hpp"
#if SIMGRID_HAVE_STATEFUL_MC
#include "src/mc/VisitedState.hpp"
#endif
+#include <deque>
#include <list>
#include <memory>
#include <set>
#include <string>
+#include <unordered_map>
#include <vector>
namespace simgrid::mc {
-typedef std::list<std::shared_ptr<State>> stack_t;
-
-/* Used to compare two stacks and decide which one is better to backtrack,
- * regarding the chosen guide in the last state. */
-class OpenedStatesCompare {
-public:
- bool operator()(std::shared_ptr<State> const& lhs, std::shared_ptr<State> const& rhs) const
- {
- return lhs->next_transition_guided().second > rhs->next_transition_guided().second;
- }
-};
+using stack_t = std::deque<std::shared_ptr<State>>;
class XBT_PRIVATE DFSExplorer : public Exploration {
-
- XBT_DECLARE_ENUM_CLASS(ReductionMode, none, dpor);
+ XBT_DECLARE_ENUM_CLASS(ReductionMode, none, dpor, sdpor);
ReductionMode reduction_mode_;
unsigned long backtrack_count_ = 0; // for statistics
explicit DFSExplorer(const std::vector<char*>& args, bool with_dpor, bool need_memory_info = false);
void run() override;
RecordTrace get_record_trace() override;
- std::vector<std::string> get_textual_trace() override;
void log_state() override;
/** Called once when the exploration starts */
/** Stack representing the position in the exploration graph */
stack_t stack_;
+
+ /**
+ * Provides additional metadata about the position in the exploration graph
+ * which is used by SDPOR and ODPOR
+ */
+ odpor::Execution execution_seq_;
+
+ /** Per-actor clock vectors used to compute the "happens-before" relation */
+ std::unordered_map<aid_t, ClockVector> per_actor_clocks_;
+
#if SIMGRID_HAVE_STATEFUL_MC
VisitedStates visited_states_;
std::unique_ptr<VisitedState> visited_state_;
/** Opened states are states that still contains todo actors.
* When backtracking, we pick a state from it*/
- std::multiset<std::shared_ptr<State>, OpenedStatesCompare> opened_states_;
+ std::vector<std::shared_ptr<State>> opened_states_;
+ std::shared_ptr<State> best_opened_state();
/** Change current stack_ value to correspond to the one we would have
* had if we executed transition to get to state. This is required when