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
Replace state copy with recipe: list of transition to replay a state
[simgrid.git]
/
src
/
mc
/
api
/
State.cpp
diff --git
a/src/mc/api/State.cpp
b/src/mc/api/State.cpp
index
b35f37e
..
6c1d348
100644
(file)
--- a/
src/mc/api/State.cpp
+++ b/
src/mc/api/State.cpp
@@
-21,9
+21,11
@@
State::State(RemoteApp& remote_app) : num_(++expended_states_)
{
XBT_VERB("Creating a guide for the state");
if (_sg_mc_guided == "none")
- guide_ = std::make_
unique
<BasicGuide>();
+ guide_ = std::make_
shared
<BasicGuide>();
if (_sg_mc_guided == "nb_wait")
- guide_ = std::make_unique<WaitGuide>();
+ guide_ = std::make_shared<WaitGuide>();
+
+ recipe_ = std::list<Transition*>();
remote_app.get_actors_status(guide_->actors_to_run_);
@@
-33,15
+35,19
@@
State::State(RemoteApp& remote_app) : num_(++expended_states_)
*remote_app.get_remote_process_memory());
}
-State::State(RemoteApp& remote_app, const State* parent_state) : num_(++expended_states_), parent_state_(parent_state)
+State::State(RemoteApp& remote_app, std::shared_ptr<State> parent_state)
+ : num_(++expended_states_), parent_state_(parent_state)
{
if (_sg_mc_guided == "none")
- guide_ = std::make_
unique
<BasicGuide>();
+ guide_ = std::make_
shared
<BasicGuide>();
if (_sg_mc_guided == "nb_wait")
- guide_ = std::make_
unique
<WaitGuide>();
+ guide_ = std::make_
shared
<WaitGuide>();
*guide_ = *(parent_state->guide_);
+ recipe_ = std::list(parent_state_->get_recipe());
+ recipe_.push_back(parent_state_->get_transition());
+
remote_app.get_actors_status(guide_->actors_to_run_);
/* Stateful model checking */
@@
-55,9
+61,7
@@
State::State(RemoteApp& remote_app, const State* parent_state) : num_(++expended
* And if we kept it and the actor is enabled in this state, mark the actor as already done, so that
* it is not explored*/
for (auto& [aid, transition] : parent_state_->get_sleep_set()) {
-
if (not parent_state_->get_transition()->depends(&transition)) {
-
sleep_set_.try_emplace(aid, transition);
if (guide_->actors_to_run_.count(aid) != 0) {
XBT_DEBUG("Actor %ld will not be explored, for it is in the sleep set", aid);
@@
-76,6
+80,16
@@
std::size_t State::count_todo() const
return boost::range::count_if(this->guide_->actors_to_run_, [](auto& pair) { return pair.second.is_todo(); });
}
+std::size_t State::count_todo_multiples() const
+{
+ size_t count = 0;
+ for (auto& [_, actor] : guide_->actors_to_run_)
+ if (actor.is_todo())
+ count += actor.get_times_not_considered();
+
+ return count;
+}
+
Transition* State::get_transition() const
{
return transition_;
@@
-87,7
+101,6
@@
aid_t State::next_transition() const
for (auto const& [aid, actor] : guide_->actors_to_run_) {
/* Only consider actors (1) marked as interleaving by the checker and (2) currently enabled in the application */
if (not actor.is_todo() || not actor.is_enabled() || actor.is_done()) {
-
if (not actor.is_todo())
XBT_DEBUG("Can't run actor %ld because it is not todo", aid);