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
Abide by both compiler warnings
[simgrid.git]
/
src
/
mc
/
explo
/
DFSExplorer.cpp
diff --git
a/src/mc/explo/DFSExplorer.cpp
b/src/mc/explo/DFSExplorer.cpp
index
792383e
..
8f911cc
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 ***");
@@
-62,9
+62,14
@@
void DFSExplorer::check_non_termination(const State* current_state)
}
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;
}
@@
-89,6
+94,14
@@
void DFSExplorer::log_state() // override
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());
@@
-145,13
+158,15
@@
void DFSExplorer::run()
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());
@@
-196,7
+211,7
@@
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);
+
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 {
@@
-204,7
+219,7
@@
void DFSExplorer::run()
"transition as todo",
issuer_id);
prev_state->consider_all();
-
opened_states.emplace_back
(tmp_stack);
+
add_to_opened_states
(tmp_stack);
}
break;
} else {
@@
-232,8
+247,9
@@
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_);
}
+ 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
@@
-249,11
+265,14
@@
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());
+ 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) {
+ if (opened_states
_
.size() == 0) {
stack_ = std::list<std::shared_ptr<State>>();
return;
}
@@
-266,15
+285,18
@@
void DFSExplorer::backtrack()
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)
+ 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 =
stack
;
+ backtrack =
(*iter)
;
}
+ iter++;
}
if (min_aid == -1) {
@@
-282,24
+304,21
@@
void DFSExplorer::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());
+ if (backtrack.back()->count_todo_multiples() <= 1)
+ opened_states_.remove(backtrack);
/* 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());
+ system_state->restore(
*
get_remote_app().get_remote_process_memory());
on_restore_system_state_signal(last_state, get_remote_app());
+ stack_ = backtrack;
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 */
@@
-309,10
+328,11
@@
void DFSExplorer::backtrack()
visited_states_count_++;
}
stack_ = backtrack;
- XBT_
VERB
(">> Backtracked to %s", get_record_trace().to_string().c_str());
+ 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;
@@
-341,8
+361,9
@@
DFSExplorer::DFSExplorer(const std::vector<char*>& args, bool with_dpor) : Explo
stack_.back()->consider_best();
else {
stack_.back()->consider_all();
- opened_states.emplace_back(stack_);
}
+ if (stack_.back()->count_todo_multiples() > 1)
+ add_to_opened_states(stack_);
}
Exploration* create_dfs_exploration(const std::vector<char*>& args, bool with_dpor)