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
e2a6ac4
..
6c1d348
100644
(file)
--- a/
src/mc/api/State.cpp
+++ b/
src/mc/api/State.cpp
@@
-17,16
+17,6
@@
namespace simgrid::mc {
long State::expended_states_ = 0;
long State::expended_states_ = 0;
-State::State(const State& other)
- : transition_(other.transition_)
- , num_(other.num_)
- , system_state_(other.system_state_)
- , parent_state_(nullptr)
- , guide_(other.guide_)
- , sleep_set_(other.sleep_set_)
-{
-}
-
State::State(RemoteApp& remote_app) : num_(++expended_states_)
{
XBT_VERB("Creating a guide for the state");
State::State(RemoteApp& remote_app) : num_(++expended_states_)
{
XBT_VERB("Creating a guide for the state");
@@
-35,6
+25,8
@@
State::State(RemoteApp& remote_app) : num_(++expended_states_)
if (_sg_mc_guided == "nb_wait")
guide_ = std::make_shared<WaitGuide>();
if (_sg_mc_guided == "nb_wait")
guide_ = std::make_shared<WaitGuide>();
+ recipe_ = std::list<Transition*>();
+
remote_app.get_actors_status(guide_->actors_to_run_);
/* Stateful model checking */
remote_app.get_actors_status(guide_->actors_to_run_);
/* Stateful model checking */
@@
-43,7
+35,8
@@
State::State(RemoteApp& remote_app) : num_(++expended_states_)
*remote_app.get_remote_process_memory());
}
*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")
{
if (_sg_mc_guided == "none")
@@
-52,6
+45,9
@@
State::State(RemoteApp& remote_app, const State* parent_state) : num_(++expended
guide_ = std::make_shared<WaitGuide>();
*guide_ = *(parent_state->guide_);
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 */
remote_app.get_actors_status(guide_->actors_to_run_);
/* Stateful model checking */