* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/mc/explo/DFSExplorer.hpp"
-#include "src/mc/VisitedState.hpp"
#include "src/mc/mc_config.hpp"
#include "src/mc/mc_exit.hpp"
#include "src/mc/mc_private.hpp"
#include "src/mc/mc_record.hpp"
#include "src/mc/transition/Transition.hpp"
+#if SIMGRID_HAVE_STATEFUL_MC
+#include "src/mc/VisitedState.hpp"
+#endif
+
#include "src/xbt/mmalloc/mmprivate.h"
#include "xbt/log.h"
#include "xbt/string.hpp"
void DFSExplorer::check_non_termination(const State* current_state)
{
+#if SIMGRID_HAVE_STATEFUL_MC
for (auto const& state : stack_) {
if (state->get_system_state()->equals_to(*current_state->get_system_state(),
*get_remote_app().get_remote_process_memory())) {
throw TerminationError();
}
}
+#endif
}
RecordTrace DFSExplorer::get_record_trace() // override
-{
- return get_record_trace_of_stack(stack_);
-}
-
-/* Usefull to show debug information */
-RecordTrace DFSExplorer::get_record_trace_of_stack(stack_t stack)
{
RecordTrace res;
- for (auto const& state : stack)
- res.push_back(state->get_transition());
+ for (auto const& transition : stack_.back()->get_recipe())
+ res.push_back(transition);
+ res.push_back(stack_.back()->get_transition());
return res;
}
std::vector<std::string> DFSExplorer::get_textual_trace() // override
{
std::vector<std::string> trace;
- for (auto const& state : stack_) {
- const auto* t = state->get_transition();
- trace.push_back(xbt::string_printf("%ld: %s", t->aid_, t->to_string().c_str()));
+ for (auto const& transition : stack_.back()->get_recipe()) {
+ trace.push_back(xbt::string_printf("%ld: %s", transition->aid_, transition->to_string().c_str()));
}
+ trace.push_back(xbt::string_printf("%ld: %s", stack_.back()->get_transition()->aid_,
+ stack_.back()->get_transition()->to_string().c_str()));
return trace;
}
void DFSExplorer::restore_stack(std::shared_ptr<State> state)
{
-
- stack_ = std::list<std::shared_ptr<State>>();
- std::shared_ptr<State> current_state(state);
- stack_.push_front(std::shared_ptr<State>(current_state));
+ stack_.clear();
+ auto current_state = state;
+ stack_.emplace_front(current_state);
// condition corresponds to reaching initial state
while (current_state->get_parent_state() != nullptr) {
current_state = current_state->get_parent_state();
- stack_.push_front(std::shared_ptr<State>(current_state));
+ stack_.emplace_front(current_state);
}
XBT_DEBUG("Replaced stack by %s", get_record_trace().to_string().c_str());
}
while (not stack_.empty()) {
/* Get current state */
- std::shared_ptr<State> state(stack_.back());
+ auto state = stack_.back();
XBT_DEBUG("**************************************************");
XBT_DEBUG("Exploration depth=%zu (state:#%ld; %zu interleaves todo)", stack_.size(), state->get_num(),
continue;
}
+#if SIMGRID_HAVE_STATEFUL_MC
// Backtrack if we are revisiting a state we saw previously while applying state-equality reduction
if (visited_state_ != nullptr) {
XBT_DEBUG("State already visited (equal to state %ld), exploration stopped on this path.",
this->backtrack();
continue;
}
+#endif
// Search for the next transition
// next_transition returns a pair<aid_t, double> in case we want to consider multiple state (eg. during backtrack)
auto [next, _] = state->next_transition_guided();
if (next < 0) { // If there is no more transition in the current state, backtrack.
- XBT_VERB("There remains %lu actors, but none to interleave (depth %zu).", state->get_actor_count(),
+ XBT_VERB("%lu actors remain, but none of them need to be interleaved (depth %zu).", state->get_actor_count(),
stack_.size() + 1);
if (state->get_actor_count() == 0) {
state->get_transition()->to_string().c_str(), stack_.size(), state->get_num(), state->count_todo());
/* Create the new expanded state (copy the state of MCed into our MCer data) */
- std::shared_ptr<State> next_state = std::make_shared<State>(get_remote_app(), state);
+ auto next_state = std::make_shared<State>(get_remote_app(), state);
on_state_creation_signal(next_state.get(), get_remote_app());
/* Sleep set procedure:
* If the process is not enabled at this point, then add every enabled process to the interleave */
if (reduction_mode_ == ReductionMode::dpor) {
aid_t issuer_id = state->get_transition()->aid_;
- stack_t tmp_stack = std::list(stack_);
+ stack_t tmp_stack = stack_;
while (not tmp_stack.empty()) {
- State* prev_state = tmp_stack.back().get();
- if (state->get_transition()->aid_ == prev_state->get_transition()->aid_) {
+ if (State* prev_state = tmp_stack.back().get();
+ state->get_transition()->aid_ == prev_state->get_transition()->aid_) {
XBT_DEBUG("Simcall >>%s<< and >>%s<< with same issuer %ld", state->get_transition()->to_string().c_str(),
prev_state->get_transition()->to_string().c_str(), issuer_id);
tmp_stack.pop_back();
if (prev_state->is_actor_enabled(issuer_id)) {
if (not prev_state->is_actor_done(issuer_id)) {
prev_state->consider_one(issuer_id);
- opened_states_.push(std::shared_ptr<State>(tmp_stack.back()));
+ opened_states_.emplace(tmp_stack.back());
} else
XBT_DEBUG("Actor %ld is already in done set: no need to explore it again", issuer_id);
} else {
XBT_DEBUG("Actor %ld is not enabled: DPOR may be failing. To stay sound, we are marking every enabled "
"transition as todo",
issuer_id);
- if (prev_state->consider_all() >
- 0) // If we ended up marking at least a transition, explore it at some point
- opened_states_.push(std::shared_ptr<State>(tmp_stack.back()));
+ // If we ended up marking at least a transition, explore it at some point
+ if (prev_state->consider_all() > 0)
+ opened_states_.emplace(tmp_stack.back());
}
break;
} else {
// Before leaving that state, if the transition we just took can be taken multiple times, we
// need to give it to the opened states
if (stack_.back()->count_todo_multiples() > 0)
- opened_states_.push(std::shared_ptr<State>(stack_.back()));
+ opened_states_.emplace(stack_.back());
if (_sg_mc_termination)
this->check_non_termination(next_state.get());
+#if SIMGRID_HAVE_STATEFUL_MC
/* Check whether we already explored next_state in the past (but only if interested in state-equality reduction) */
if (_sg_mc_max_visited_states > 0)
visited_state_ = visited_states_.addVisitedState(next_state->get_num(), next_state.get(), get_remote_app());
+#endif
- stack_.push_back(std::move(next_state));
+ stack_.emplace_back(std::move(next_state));
/* If this is a new state (or if we don't care about state-equality reduction) */
if (visited_state_ == nullptr) {
dot_output("\"%ld\" -> \"%ld\" [%s];\n", state->get_num(), stack_.back()->get_num(),
state->get_transition()->dot_string().c_str());
- } else
+#if SIMGRID_HAVE_STATEFUL_MC
+ } else {
dot_output("\"%ld\" -> \"%ld\" [%s];\n", state->get_num(),
visited_state_->original_num_ == -1 ? visited_state_->num_ : visited_state_->original_num_,
state->get_transition()->dot_string().c_str());
+#endif
+ }
}
log_state();
}
// if no backtracking point, then set the stack_ to empty so we can end the exploration
if (opened_states_.empty()) {
XBT_DEBUG("No more opened point of exploration, the search will end");
- stack_ = std::list<std::shared_ptr<State>>();
+ stack_.clear();
return;
}
- std::shared_ptr<State> backtracking_point = opened_states_.top(); // Take the point with smallest distance
- opened_states_.pop();
+ // Take the point with smallest distance
+ auto backtracking_point = opened_states_.extract(begin(opened_states_)).value();
// if the smallest distance corresponded to no enable actor, remove this and let the
// exploration ask again for a backtrack
if (backtracking_point->next_transition_guided().first == -1) {
- XBT_DEBUG("Best backtracking candidates has already been explored. We may backtrack again");
+ XBT_DEBUG("Best backtracking candidates has already been explored. Let's backtrack again");
+ this->backtrack();
return;
}
// We found a real backtracking point, let's go to it
backtrack_count_++;
XBT_DEBUG("Backtracking to state#%ld", backtracking_point->get_num());
+
+#if SIMGRID_HAVE_STATEFUL_MC
/* If asked to rollback on a state that has a snapshot, restore it */
if (const auto* system_state = backtracking_point->get_system_state()) {
system_state->restore(*get_remote_app().get_remote_process_memory());
this->restore_stack(backtracking_point);
return;
}
+#endif
/* if no snapshot, we need to restore the initial state and replay the transitions */
get_remote_app().restore_initial_state();
XBT_DEBUG("**************************************************");
- stack_.push_back(std::move(initial_state));
+ stack_.emplace_back(std::move(initial_state));
/* Get an enabled actor and insert it in the interleave set of the initial state */
XBT_DEBUG("Initial state. %lu actors to consider", stack_.back()->get_actor_count());
stack_.back()->consider_all();
}
if (stack_.back()->count_todo_multiples() > 1)
- opened_states_.push(std::shared_ptr<State>(stack_.back()));
+ opened_states_.emplace(stack_.back());
}
Exploration* create_dfs_exploration(const std::vector<char*>& args, bool with_dpor)
