X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/37e01add8813f8112c80d116f413ac28f2acc90f..52c48e9726e6ebaae526a3869e541a2305dd0923:/src/mc/explo/DFSExplorer.cpp diff --git a/src/mc/explo/DFSExplorer.cpp b/src/mc/explo/DFSExplorer.cpp index 93848b0144..0130455d79 100644 --- a/src/mc/explo/DFSExplorer.cpp +++ b/src/mc/explo/DFSExplorer.cpp @@ -60,7 +60,7 @@ void DFSExplorer::check_non_termination(const State* current_state) get_record_trace().to_string().c_str()); log_state(); - throw TerminationError(); + throw McError(ExitStatus::NON_TERMINATION); } } #endif @@ -71,7 +71,7 @@ RecordTrace DFSExplorer::get_record_trace() // override RecordTrace res; for (auto const& transition : stack_.back()->get_recipe()) res.push_back(transition); - res.push_back(stack_.back()->get_transition()); + res.push_back(stack_.back()->get_transition_out().get()); return res; } @@ -81,21 +81,20 @@ std::vector DFSExplorer::get_textual_trace() // override 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())); + if (const auto trans = stack_.back()->get_transition_out(); trans != nullptr) + trace.push_back(xbt::string_printf("%ld: %s", trans->aid_, trans->to_string().c_str())); return trace; } void DFSExplorer::restore_stack(std::shared_ptr state) { - - stack_ = std::list>(); - std::shared_ptr current_state(state); - stack_.push_front(std::shared_ptr(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(current_state)); + stack_.emplace_front(current_state); } XBT_DEBUG("Replaced stack by %s", get_record_trace().to_string().c_str()); } @@ -119,7 +118,7 @@ void DFSExplorer::run() while (not stack_.empty()) { /* Get current state */ - std::shared_ptr state(stack_.back()); + auto state = stack_.back(); XBT_DEBUG("**************************************************"); XBT_DEBUG("Exploration depth=%zu (state:#%ld; %zu interleaves todo)", stack_.size(), state->get_num(), @@ -152,7 +151,7 @@ void DFSExplorer::run() #endif // Search for the next transition - // next_transition returns a pair in case we want to consider multiple state (eg. during backtrack) + // next_transition returns a pair 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. @@ -177,15 +176,15 @@ void DFSExplorer::run() /* Actually answer the request: let's execute the selected request (MCed does one step) */ state->execute_next(next, get_remote_app()); - on_transition_execute_signal(state->get_transition(), get_remote_app()); + on_transition_execute_signal(state->get_transition_out().get(), get_remote_app()); // If there are processes to interleave and the maximum depth has not been // reached then perform one step of the exploration algorithm. - XBT_VERB("Execute %ld: %.60s (stack depth: %zu, state: %ld, %zu interleaves)", state->get_transition()->aid_, - state->get_transition()->to_string().c_str(), stack_.size(), state->get_num(), state->count_todo()); + XBT_VERB("Execute %ld: %.60s (stack depth: %zu, state: %ld, %zu interleaves)", state->get_transition_out()->aid_, + state->get_transition_out()->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 next_state = std::make_shared(get_remote_app(), state); + auto next_state = std::make_shared(get_remote_app(), state); on_state_creation_signal(next_state.get(), get_remote_app()); /* Sleep set procedure: @@ -193,32 +192,32 @@ void DFSExplorer::run() * Since the parent sleep set is used to compute the child sleep set, this need to be * done after next_state creation */ XBT_DEBUG("Marking Transition >>%s<< of process %ld done and adding it to the sleep set", - state->get_transition()->to_string().c_str(), state->get_transition()->aid_); - state->add_sleep_set(state->get_transition()); // Actors are marked done when they are considerd in ActorState + state->get_transition_out()->to_string().c_str(), state->get_transition_out()->aid_); + state->add_sleep_set(state->get_transition_out()); // Actors are marked done when they are considerd in ActorState /* DPOR persistent set procedure: * for each new transition considered, check if it depends on any other previous transition executed before it * on another process. If there exists one, find the more recent, and add its process to the interleave set. * 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_); + aid_t issuer_id = state->get_transition_out()->aid_; + 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_) { - 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); + if (const State* prev_state = tmp_stack.back().get(); + state->get_transition_out()->aid_ == prev_state->get_transition_out()->aid_) { + XBT_DEBUG("Simcall >>%s<< and >>%s<< with same issuer %ld", state->get_transition_out()->to_string().c_str(), + prev_state->get_transition_out()->to_string().c_str(), issuer_id); tmp_stack.pop_back(); continue; - } else if (prev_state->get_transition()->depends(state->get_transition())) { + } else if (prev_state->get_transition_out()->depends(state->get_transition_out().get())) { XBT_VERB("Dependent Transitions:"); - XBT_VERB(" %s (state=%ld)", prev_state->get_transition()->to_string().c_str(), prev_state->get_num()); - XBT_VERB(" %s (state=%ld)", state->get_transition()->to_string().c_str(), state->get_num()); + XBT_VERB(" %s (state=%ld)", prev_state->get_transition_out()->to_string().c_str(), prev_state->get_num()); + XBT_VERB(" %s (state=%ld)", state->get_transition_out()->to_string().c_str(), state->get_num()); 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_.emplace(tmp_stack.back()); + opened_states_.emplace_back(tmp_stack.back()); } else XBT_DEBUG("Actor %ld is already in done set: no need to explore it again", issuer_id); } else { @@ -227,13 +226,13 @@ void DFSExplorer::run() issuer_id); // 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()); + opened_states_.emplace_back(tmp_stack.back()); } break; } else { XBT_VERB("INDEPENDENT Transitions:"); - XBT_VERB(" %s (state=%ld)", prev_state->get_transition()->to_string().c_str(), prev_state->get_num()); - XBT_VERB(" %s (state=%ld)", state->get_transition()->to_string().c_str(), state->get_num()); + XBT_VERB(" %s (state=%ld)", prev_state->get_transition_out()->to_string().c_str(), prev_state->get_num()); + XBT_VERB(" %s (state=%ld)", state->get_transition_out()->to_string().c_str(), state->get_num()); } tmp_stack.pop_back(); } @@ -242,7 +241,7 @@ void DFSExplorer::run() // 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_.emplace(stack_.back()); + opened_states_.emplace_back(stack_.back()); if (_sg_mc_termination) this->check_non_termination(next_state.get()); @@ -253,7 +252,7 @@ void DFSExplorer::run() 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) { @@ -265,18 +264,53 @@ void DFSExplorer::run() } dot_output("\"%ld\" -> \"%ld\" [%s];\n", state->get_num(), stack_.back()->get_num(), - state->get_transition()->dot_string().c_str()); + state->get_transition_out()->dot_string().c_str()); #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()); + state->get_transition_out()->dot_string().c_str()); #endif } } log_state(); } +std::shared_ptr DFSExplorer::best_opened_state() +{ + int best_prio = 0; // cache the value for the best priority found so far (initialized to silence gcc) + auto best = end(opened_states_); // iterator to the state to explore having the best priority + auto valid = begin(opened_states_); // iterator marking the limit between states still to explore, and already + // explored ones + + // Keep only still non-explored states (aid != -1), and record the one with the best (greater) priority. + for (auto current = begin(opened_states_); current != end(opened_states_); ++current) { + auto [aid, prio] = (*current)->next_transition_guided(); + if (aid == -1) + continue; + if (valid != current) + *valid = std::move(*current); + if (best == end(opened_states_) || prio > best_prio) { + best_prio = prio; + best = valid; + } + ++valid; + } + + std::shared_ptr best_state; + if (best < valid) { + // There are non-explored states, and one of them has the best priority. Remove it from opened_states_ before + // returning. + best_state = std::move(*best); + --valid; + if (best != valid) + *best = std::move(*valid); + } + opened_states_.erase(valid, end(opened_states_)); + + return best_state; +} + void DFSExplorer::backtrack() { XBT_VERB("Backtracking from %s", get_record_trace().to_string().c_str()); @@ -285,25 +319,17 @@ void DFSExplorer::backtrack() on_backtracking_signal(get_remote_app()); get_remote_app().check_deadlock(); - // 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>(); - return; - } - // Take the point with smallest distance - auto backtracking_point = opened_states_.extract(begin(opened_states_)).value(); + auto backtracking_point = best_opened_state(); - // 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. Let's backtrack again"); - this->backtrack(); + // if no backtracking point, then set the stack_ to empty so we can end the exploration + if (not backtracking_point) { + XBT_DEBUG("No more opened point of exploration, the search will end"); + stack_.clear(); return; } - // We found a real backtracking point, let's go to it + // We found a backtracking point, let's go to it backtrack_count_++; XBT_DEBUG("Backtracking to state#%ld", backtracking_point->get_num()); @@ -351,7 +377,7 @@ DFSExplorer::DFSExplorer(const std::vector& args, bool with_dpor, bool ne 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()); @@ -361,7 +387,7 @@ DFSExplorer::DFSExplorer(const std::vector& args, bool with_dpor, bool ne stack_.back()->consider_all(); } if (stack_.back()->count_todo_multiples() > 1) - opened_states_.emplace(stack_.back()); + opened_states_.emplace_back(stack_.back()); } Exploration* create_dfs_exploration(const std::vector& args, bool with_dpor)