void DFSExplorer::check_non_termination(const State* current_state)
{
for (auto state = stack_.rbegin(); state != stack_.rend(); ++state)
- if (Api::get().snapshot_equal((*state)->get_system_state(), current_state->get_system_state())) {
+ if (*(*state)->get_system_state() == *current_state->get_system_state()) {
XBT_INFO("Non-progressive cycle: state %ld -> state %ld", (*state)->get_num(), current_state->get_num());
XBT_INFO("******************************************");
XBT_INFO("*** NON-PROGRESSIVE CYCLE DETECTED ***");
// Backtrack if we reached the maximum depth
if (stack_.size() > (std::size_t)_sg_mc_max_depth) {
- if (reductionMode_ == ReductionMode::dpor) {
+ if (reduction_mode_ == ReductionMode::dpor) {
XBT_ERROR("/!\\ Max depth of %d reached! THIS WILL PROBABLY BREAK the dpor reduction /!\\",
_sg_mc_max_depth.get());
XBT_ERROR("/!\\ If bad things happen, disable dpor with --cfg=model-check/reduction:none /!\\");
}
// Search for the next transition
- int next = state->next_transition();
+ aid_t next = state->next_transition();
if (next < 0) { // If there is no more transition in the current state, backtrack.
- XBT_DEBUG("There remains %d actors, but none to interleave (depth %zu).", state->get_actor_count(),
+ XBT_DEBUG("There remains %lu actors, but none to interleave (depth %zu).", state->get_actor_count(),
stack_.size() + 1);
if (state->get_actor_count() == 0) {
/* 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(), true);
+ visited_state_ = visited_states_.addVisitedState(next_state->get_num(), next_state.get());
/* If this is a new state (or if we don't care about state-equality reduction) */
if (visited_state_ == nullptr) {
for (auto const& [aid, _] : next_state->get_actors_list()) {
if (next_state->is_actor_enabled(aid)) {
next_state->mark_todo(aid);
- if (reductionMode_ == ReductionMode::dpor)
+ if (reduction_mode_ == ReductionMode::dpor)
break; // With DPOR, we take the first enabled transition
}
}
mc_model_checker->dot_output("\"%ld\" -> \"%ld\" [%s];\n", state->get_num(), next_state->get_num(),
state->get_transition()->dot_string().c_str());
-
} else
mc_model_checker->dot_output("\"%ld\" -> \"%ld\" [%s];\n", state->get_num(),
visited_state_->original_num == -1 ? visited_state_->num
* have it empty in the way. For each deleted state, check if the request that has generated it (from its
* predecessor state), depends on any other previous request executed before it. If it does then add it to the
* interleave set of the state that executed that previous request. */
-
- while (not stack_.empty()) {
+ bool found_backtracking_point = false;
+ while (not stack_.empty() && not found_backtracking_point) {
std::unique_ptr<State> state = std::move(stack_.back());
stack_.pop_back();
- if (reductionMode_ == ReductionMode::dpor) {
+ if (reduction_mode_ == ReductionMode::dpor) {
aid_t issuer_id = state->get_transition()->aid_;
for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) {
State* prev_state = i->get();
}
}
- if (state->count_todo() && stack_.size() < (std::size_t)_sg_mc_max_depth) {
- /* We found a back-tracking point, let's loop */
- XBT_DEBUG("Back-tracking to state %ld at depth %zu", state->get_num(), stack_.size() + 1);
- stack_.push_back(
- std::move(state)); // Put it back on the stack from which it was removed earlier in this while loop
- this->restore_state();
- XBT_DEBUG("Back-tracking to state %ld at depth %zu done", stack_.back()->get_num(), stack_.size());
- break;
- } else {
+ if (state->count_todo() == 0) { // Empty interleaving set
XBT_DEBUG("Delete state %ld at depth %zu", state->get_num(), stack_.size() + 1);
+
+ } else {
+ XBT_DEBUG("Back-tracking to state %ld at depth %zu", state->get_num(), stack_.size() + 1);
+ stack_.push_back(std::move(state)); // Put it back on the stack
+ found_backtracking_point = true;
}
}
-}
-void DFSExplorer::restore_state()
-{
- /* If asked to rollback on a state that has a snapshot, restore it */
- State* last_state = stack_.back().get();
- if (const auto* system_state = last_state->get_system_state()) {
- system_state->restore(&get_remote_app().get_remote_process());
- on_restore_system_state_signal(last_state, get_remote_app());
- return;
- }
+ if (found_backtracking_point) {
+ /* If asked to rollback on a state that has a snapshot, restore it */
+ State* last_state = stack_.back().get();
+ if (const auto* system_state = last_state->get_system_state()) {
+ system_state->restore(&get_remote_app().get_remote_process());
+ on_restore_system_state_signal(last_state, get_remote_app());
+ return;
+ }
- /* if no snapshot, we need to restore the initial state and replay the transitions */
- get_remote_app().restore_initial_state();
- on_restore_initial_state_signal(get_remote_app());
-
- /* Traverse the stack from the state at position start and re-execute the transitions */
- for (std::unique_ptr<State> const& state : stack_) {
- if (state == stack_.back()) /* If we are arrived on the target state, don't replay the outgoing transition */
- break;
- state->get_transition()->replay();
- on_transition_replay_signal(state->get_transition(), get_remote_app());
- /* Update statistics */
- mc_model_checker->inc_visited_states();
- }
+ /* if no snapshot, we need to restore the initial state and replay the transitions */
+ get_remote_app().restore_initial_state();
+ on_restore_initial_state_signal(get_remote_app());
+
+ /* Traverse the stack from the state at position start and re-execute the transitions */
+ for (std::unique_ptr<State> const& state : stack_) {
+ if (state == stack_.back()) /* If we are arrived on the target state, don't replay the outgoing transition */
+ break;
+ state->get_transition()->replay();
+ on_transition_replay_signal(state->get_transition(), get_remote_app());
+ /* Update statistics */
+ mc_model_checker->inc_visited_states();
+ }
+ } // If no backtracing point, then the stack is empty and the exploration is over
}
-DFSExplorer::DFSExplorer(const std::vector<char*>& args) : Exploration(args)
+DFSExplorer::DFSExplorer(const std::vector<char*>& args, bool with_dpor) : Exploration(args)
{
- reductionMode_ = reduction_mode;
- if (_sg_mc_termination)
- reductionMode_ = ReductionMode::none;
- else if (reductionMode_ == ReductionMode::unset)
- reductionMode_ = ReductionMode::dpor;
-
- if (_sg_mc_termination)
- XBT_INFO("Check non progressive cycles");
+ if (with_dpor)
+ reduction_mode_ = ReductionMode::dpor;
else
- XBT_INFO("Start a DFS exploration. Reduction is: %s.",
- (reductionMode_ == ReductionMode::none ? "none"
- : (reductionMode_ == ReductionMode::dpor ? "dpor" : "unknown")));
+ reduction_mode_ = ReductionMode::none;
- XBT_DEBUG("Starting the DFS exploration");
+ if (_sg_mc_termination) {
+ if (with_dpor) {
+ XBT_INFO("Check non progressive cycles (turning DPOR off)");
+ reduction_mode_ = ReductionMode::none;
+ } else {
+ XBT_INFO("Check non progressive cycles");
+ }
+ } else
+ XBT_INFO("Start a DFS exploration. Reduction is: %s.", to_c_str(reduction_mode_));
auto initial_state = std::make_unique<State>(get_remote_app());
XBT_DEBUG("**************************************************");
/* Get an enabled actor and insert it in the interleave set of the initial state */
- XBT_DEBUG("Initial state. %d actors to consider", initial_state->get_actor_count());
+ XBT_DEBUG("Initial state. %lu actors to consider", initial_state->get_actor_count());
for (auto const& [aid, _] : initial_state->get_actors_list()) {
if (initial_state->is_actor_enabled(aid)) {
initial_state->mark_todo(aid);
- if (reductionMode_ == ReductionMode::dpor) {
+ if (reduction_mode_ == ReductionMode::dpor) {
XBT_DEBUG("Actor %ld is TODO, DPOR is ON so let's go for this one.", aid);
break;
}
stack_.push_back(std::move(initial_state));
}
-Exploration* create_dfs_exploration(const std::vector<char*>& args)
+Exploration* create_dfs_exploration(const std::vector<char*>& args, bool with_dpor)
{
- return new DFSExplorer(args);
+ return new DFSExplorer(args, with_dpor);
}
} // namespace simgrid::mc
