void DFSExplorer::check_non_termination(const State* current_state)
{
for (auto const& state : stack_) {
- if (*state->get_system_state() == *current_state->get_system_state()) {
+ if (state->get_system_state()->equals_to(*current_state->get_system_state(),
+ *get_remote_app().get_remote_process_memory())) {
XBT_INFO("Non-progressive cycle: state %ld -> state %ld", state->get_num(), current_state->get_num());
XBT_INFO("******************************************");
XBT_INFO("*** NON-PROGRESSIVE CYCLE DETECTED ***");
}
RecordTrace DFSExplorer::get_record_trace() // override
+{
+ return get_record_trace_of_stack(stack_);
+}
+
+RecordTrace DFSExplorer::get_record_trace_of_stack(stack_t stack)
{
RecordTrace res;
- for (auto const& state : stack_)
+ for (auto const& state : stack)
res.push_back(state->get_transition());
return res;
}
Exploration::log_state();
}
+void DFSExplorer::add_to_opened_states(stack_t stack)
+{
+ stack_t tmp_stack;
+ for (auto& state : stack)
+ tmp_stack.push_back(std::make_shared<State>(State(*state)));
+ opened_states_.emplace_back(tmp_stack);
+}
+
void DFSExplorer::run()
{
on_exploration_start_signal(get_remote_app());
auto [next, _] = state->next_transition_guided();
if (next < 0) { // If there is no more transition in the current state, backtrack.
- XBT_DEBUG("There remains %lu actors, but none to interleave (depth %zu).", state->get_actor_count(),
- stack_.size() + 1);
+ XBT_VERB("There remains %lu actors, but none to interleave (depth %zu).", state->get_actor_count(),
+ stack_.size() + 1);
if (state->get_actor_count() == 0) {
get_remote_app().finalize_app();
this->backtrack();
continue;
}
-
if (_sg_mc_sleep_set && XBT_LOG_ISENABLED(mc_dfs, xbt_log_priority_verbose)) {
XBT_VERB("Sleep set actually containing:");
for (auto& [aid, transition] : state->get_sleep_set())
XBT_VERB(" <%ld,%s>", aid, transition.to_string().c_str());
}
+ // if (stack_.back()->count_todo_multiples() <= 1)
+ // add_to_opened_states(stack_);
+
/* 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());
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::unique_ptr<State> next_state;
-
- next_state = std::make_unique<State>(get_remote_app(), state);
+ std::shared_ptr<State> next_state;
+ next_state = std::make_shared<State>(get_remote_app(), state);
on_state_creation_signal(next_state.get(), get_remote_app());
/* Sleep set procedure:
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
-
+
/* 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_;
- for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) {
- State* prev_state = i->get();
+ aid_t issuer_id = state->get_transition()->aid_;
+ stack_t tmp_stack = std::list(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);
+ tmp_stack.pop_back();
continue;
} else if (prev_state->get_transition()->depends(state->get_transition())) {
XBT_VERB("Dependent Transitions:");
XBT_VERB(" %s (state=%ld)", state->get_transition()->to_string().c_str(), state->get_num());
if (prev_state->is_actor_enabled(issuer_id)) {
- if (not prev_state->is_actor_done(issuer_id))
+ if (not prev_state->is_actor_done(issuer_id)) {
prev_state->consider_one(issuer_id);
- else
+ add_to_opened_states(tmp_stack);
+ } 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);
prev_state->consider_all();
+ add_to_opened_states(tmp_stack);
}
break;
} else {
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());
}
+ tmp_stack.pop_back();
}
}
if (_sg_mc_max_visited_states > 0)
visited_state_ = visited_states_.addVisitedState(next_state->get_num(), next_state.get(), get_remote_app());
+ stack_.push_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) {
/* Get an enabled process and insert it in the interleave set of the next state */
if (reduction_mode_ == ReductionMode::dpor)
- next_state->consider_best(); // Take only one transition if DPOR: others may be considered later if required
- else
- next_state->consider_all();
-
- dot_output("\"%ld\" -> \"%ld\" [%s];\n", state->get_num(), next_state->get_num(),
+ stack_.back()->consider_best(); // Take only one transition if DPOR: others may be considered later if required
+ else {
+ stack_.back()->consider_all();
+ }
+ if (stack_.back()->count_todo_multiples() > 1)
+ add_to_opened_states(stack_);
+ dot_output("\"%ld\" -> \"%ld\" [%s];\n", state->get_num(), stack_.back()->get_num(),
state->get_transition()->dot_string().c_str());
} 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());
-
- stack_.push_back(std::move(next_state));
}
log_state();
{
backtrack_count_++;
XBT_VERB("Backtracking from %s", get_record_trace().to_string().c_str());
+ XBT_DEBUG("%lu alternatives are yet to be explored:", opened_states_.size());
+ for (auto& stack : opened_states_)
+ XBT_DEBUG("--> %s", get_record_trace_of_stack(stack).to_string().c_str());
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_.size() == 0) {
+ stack_ = std::list<std::shared_ptr<State>>();
+ return;
+ }
+
/* We may backtrack from somewhere either because it's leaf, or because every enabled process are in done/sleep set.
* In the first case, we need to remove the last transition corresponding to the Finalize */
if (stack_.back()->get_transition()->aid_ == 0)
stack_.pop_back();
- /* Traverse the stack backwards until a state with a non empty interleave set is found, deleting all the states that
- * have it empty in the way. */
- 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();
+ stack_t backtrack;
+ double min_dist = std::numeric_limits<double>::infinity();
+ aid_t min_aid = -1;
+ for (auto iter = opened_states_.begin(); iter != opened_states_.end();) {
+ auto [aid, dist] = (*iter).back()->next_transition_guided();
+ if (aid == -1) { // happens if no actors are todo anymore in this transition
+ iter = opened_states_.erase(iter);
+ continue;
+ }
+ if (dist < min_dist) {
+ min_dist = dist;
+ min_aid = aid;
+ backtrack = (*iter);
+ }
+ iter++;
+ }
+ if (min_aid == -1) {
+ stack_ = std::list<std::shared_ptr<State>>();
+ return;
+ }
- if (state->count_todo() == 0) { // Empty interleaving set: exploration at this level is over
- XBT_DEBUG("Delete state %ld at depth %zu", state->get_num(), stack_.size() + 1);
+ if (backtrack.back()->count_todo_multiples() <= 1)
+ opened_states_.remove(backtrack);
- } else {
- XBT_DEBUG("Back-tracking to state %ld at depth %zu: %lu transitions left to be explored", state->get_num(),
- stack_.size() + 1, state->count_todo());
- stack_.push_back(
- std::move(state)); // Put it back on the stack so we can explore the next transition of the interleave
- found_backtracking_point = true;
- }
+ /* If asked to rollback on a state that has a snapshot, restore it */
+ State* last_state = backtrack.back().get();
+ if (const auto* system_state = last_state->get_system_state()) {
+ system_state->restore(*get_remote_app().get_remote_process_memory());
+ on_restore_system_state_signal(last_state, get_remote_app());
+ stack_ = backtrack;
+ 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_memory());
- 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(get_remote_app());
- on_transition_replay_signal(state->get_transition(), get_remote_app());
- visited_states_count_++;
- }
- } // If no backtracing point, then the stack is empty and the exploration is over
+ /* 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::shared_ptr<State> const& state : backtrack) {
+ if (state == backtrack.back()) /* If we are arrived on the target state, don't replay the outgoing transition */
+ break;
+ state->get_transition()->replay(get_remote_app());
+ on_transition_replay_signal(state->get_transition(), get_remote_app());
+ visited_states_count_++;
+ }
+ stack_ = backtrack;
+ XBT_DEBUG(">> Backtracked to %s", get_record_trace().to_string().c_str());
}
-DFSExplorer::DFSExplorer(const std::vector<char*>& args, bool with_dpor) : Exploration(args)
+DFSExplorer::DFSExplorer(const std::vector<char*>& args, bool with_dpor, bool need_memory_info)
+ : Exploration(args, need_memory_info || _sg_mc_termination)
{
if (with_dpor)
reduction_mode_ = ReductionMode::dpor;
XBT_DEBUG("**************************************************");
+ stack_.push_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", initial_state->get_actor_count());
if (reduction_mode_ == ReductionMode::dpor)
- initial_state->consider_best();
- else
- initial_state->consider_all();
-
- stack_.push_back(std::move(initial_state));
+ stack_.back()->consider_best();
+ else {
+ stack_.back()->consider_all();
+ }
+ if (stack_.back()->count_todo_multiples() > 1)
+ add_to_opened_states(stack_);
}
Exploration* create_dfs_exploration(const std::vector<char*>& args, bool with_dpor)
