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)
+ {
+ return lhs->next_transition_guided().second < rhs->next_transition_guided().second;
+ }
+};
+
class XBT_PRIVATE DFSExplorer : public Exploration {
+
XBT_DECLARE_ENUM_CLASS(ReductionMode, none, dpor);
ReductionMode reduction_mode_;
- long backtrack_count_ = 0;
+ unsigned long backtrack_count_ = 0; // for statistics
+ unsigned long visited_states_count_ = 0; // for statistics
static xbt::signal<void(RemoteApp&)> on_exploration_start_signal;
static xbt::signal<void(RemoteApp&)> on_backtracking_signal;
static xbt::signal<void(RemoteApp&)> on_log_state_signal;
public:
- explicit DFSExplorer(const std::vector<char*>& args, bool with_dpor);
+ 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;
private:
void check_non_termination(const State* current_state);
void backtrack();
- bool sleep_set_reduction_ = true;
/** Stack representing the position in the exploration graph */
- std::list<std::unique_ptr<State>> stack_;
+ stack_t stack_;
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::priority_queue<std::shared_ptr<State>, std::vector<std::shared_ptr<State>>, OpenedStatesCompare> opened_states_;
+
+ /** 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.*/
+ void restore_stack(std::shared_ptr<State> state);
+
+ RecordTrace get_record_trace_of_stack(stack_t stack);
};
} // namespace simgrid::mc
