A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
explo
/
DFSExplorer.cpp
diff --git
a/src/mc/explo/DFSExplorer.cpp
b/src/mc/explo/DFSExplorer.cpp
index
792383e
..
8f1fe11
100644
(file)
--- a/
src/mc/explo/DFSExplorer.cpp
+++ b/
src/mc/explo/DFSExplorer.cpp
@@
-43,7
+43,7
@@
void DFSExplorer::check_non_termination(const State* current_state)
{
for (auto const& state : stack_) {
if (state->get_system_state()->equals_to(*current_state->get_system_state(),
- get_remote_app().get_remote_process_memory())) {
+
*
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 ***");
@@
-64,21
+64,37
@@
void DFSExplorer::check_non_termination(const State* current_state)
RecordTrace DFSExplorer::get_record_trace() // override
{
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));
+ // 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));
+ }
+ XBT_DEBUG("Replaced stack by %s", get_record_trace().to_string().c_str());
+}
+
void DFSExplorer::log_state() // override
{
on_log_state_signal(get_remote_app());
@@
-98,7
+114,7
@@
void DFSExplorer::run()
while (not stack_.empty()) {
/* Get current state */
-
State* state = stack_.back().get(
);
+
std::shared_ptr<State> state(stack_.back()
);
XBT_DEBUG("**************************************************");
XBT_DEBUG("Exploration depth=%zu (state:#%ld; %zu interleaves todo)", stack_.size(), state->get_num(),
@@
-129,11
+145,11
@@
void DFSExplorer::run()
}
// Search for the next transition
- // next_transition returns a pair<aid_t, double> in case we want to consider multiple state
+ // 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) {
@@
-162,8
+178,7
@@
void DFSExplorer::run()
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;
- next_state = std::make_shared<State>(get_remote_app(), state);
+ std::shared_ptr<State> next_state = std::make_shared<State>(get_remote_app(), state);
on_state_creation_signal(next_state.get(), get_remote_app());
/* Sleep set procedure:
@@
-196,15
+211,16
@@
void DFSExplorer::run()
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_back(tmp_stack
);
+ opened_states
_.push(std::shared_ptr<State>(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);
- prev_state->consider_all();
- opened_states.emplace_back(tmp_stack);
+ // If we ended up marking at least a transition, explore it at some point
+ if (prev_state->consider_all() > 0)
+ opened_states_.push(std::shared_ptr<State>(tmp_stack.back()));
}
break;
} else {
@@
-216,6
+232,11
@@
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_.push(std::shared_ptr<State>(stack_.back()));
+
if (_sg_mc_termination)
this->check_non_termination(next_state.get());
@@
-232,8
+253,8
@@
void DFSExplorer::run()
stack_.back()->consider_best(); // Take only one transition if DPOR: others may be considered later if required
else {
stack_.back()->consider_all();
- opened_states.emplace_back(stack_);
}
+
dot_output("\"%ld\" -> \"%ld\" [%s];\n", state->get_num(), stack_.back()->get_num(),
state->get_transition()->dot_string().c_str());
} else
@@
-241,78
+262,60
@@
void DFSExplorer::run()
visited_state_->original_num_ == -1 ? visited_state_->num_ : visited_state_->original_num_,
state->get_transition()->dot_string().c_str());
}
-
log_state();
}
void DFSExplorer::backtrack()
{
- 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());
+
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) {
+ if (opened_states_.empty()) {
+ XBT_DEBUG("No more opened point of exploration, the search will end");
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();
-
- stack_t backtrack;
- double min_dist = std::numeric_limits<double>::infinity();
- aid_t min_aid = -1;
- for (auto& stack : opened_states) {
- auto [aid, dist] = stack.back()->next_transition_guided();
- if (aid == -1)
- continue;
- if (dist < min_dist) {
- min_dist = dist;
- min_aid = aid;
- backtrack = stack;
- }
- }
+ std::shared_ptr<State> backtracking_point = opened_states_.top(); // Take the point with smallest distance
+ opened_states_.pop();
- if (min_aid == -1) {
- stack_ = std::list<std::shared_ptr<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();
return;
}
- if (backtrack.back()->count_todo() <= 1)
- opened_states.pop_back();
- XBT_VERB("%lu todo actors in last states of the next backtracking point %s (remaining %lu opened stacks)",
- backtrack.back()->count_todo(), backtrack.back()->get_transition()->to_string().c_str(),
- opened_states.size());
-
+ // We found a real backtracking point, let's go to it
+ backtrack_count_++;
+ XBT_DEBUG("Backtracking to state#%ld", backtracking_point->get_num());
/* 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()
);
+ if (const auto* system_state = backtracking_point->get_system_state()) {
+ system_state->restore(*get_remote_app().get_remote_process_memory());
+
on_restore_system_state_signal(backtracking_point.get(), get_remote_app
());
+
this->restore_stack(backtracking_point
);
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::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());
+ for (auto& state : backtracking_point->get_recipe()) {
+ state->replay(get_remote_app());
+ on_transition_replay_signal(state, get_remote_app());
visited_states_count_++;
}
- stack_ = backtrack;
- XBT_VERB(">> Backtracked to %s", get_record_trace().to_string().c_str());
+ this->restore_stack(backtracking_point);
}
-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;
@@
-329,20
+332,21
@@
DFSExplorer::DFSExplorer(const std::vector<char*>& args, bool with_dpor) : Explo
} 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());
+ auto initial_state = std::make_
shared
<State>(get_remote_app());
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());
+ XBT_DEBUG("Initial state. %lu actors to consider",
stack_.back()
->get_actor_count());
if (reduction_mode_ == ReductionMode::dpor)
stack_.back()->consider_best();
else {
stack_.back()->consider_all();
- opened_states.emplace_back(stack_);
}
+ if (stack_.back()->count_todo_multiples() > 1)
+ opened_states_.push(std::shared_ptr<State>(stack_.back()));
}
Exploration* create_dfs_exploration(const std::vector<char*>& args, bool with_dpor)