#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 "src/mc/mc_config.hpp"
#include <deque>
#include <list>
using stack_t = std::deque<std::shared_ptr<State>>;
class XBT_PRIVATE DFSExplorer : public Exploration {
- XBT_DECLARE_ENUM_CLASS(ReductionMode, none, dpor, sdpor);
-
+private:
ReductionMode reduction_mode_;
unsigned long backtrack_count_ = 0; // for statistics
unsigned long visited_states_count_ = 0; // for statistics
static xbt::signal<void(RemoteApp&)> on_log_state_signal;
public:
- explicit DFSExplorer(const std::vector<char*>& args, bool with_dpor, bool need_memory_info = false);
+ explicit DFSExplorer(const std::vector<char*>& args, ReductionMode mode);
void run() override;
RecordTrace get_record_trace() override;
void log_state() override;
static void on_log_state(std::function<void(RemoteApp&)> const& f) { on_log_state_signal.connect(f); }
private:
- void check_non_termination(const State* current_state);
void backtrack();
/** Stack representing the position in the exploration graph */
/** 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_;
-#else
- void* visited_state_ = nullptr; /* The code uses it to detect whether we are doing stateful MC */
-#endif
-
/** Opened states are states that still contains todo actors.
* When backtracking, we pick a state from it*/
std::vector<std::shared_ptr<State>> opened_states_;
std::shared_ptr<State> best_opened_state();
+ /** If we're running ODPOR, picks the corresponding state in the stack
+ * (opened_states_ are ignored)
+ */
+ std::shared_ptr<State> next_odpor_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
* backtracking, and achieved thanks to the fact states save their parent.*/