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
Rename mc::Session into mc::api::RemoteApp
[simgrid.git]
/
src
/
mc
/
api
/
State.hpp
diff --git
a/src/mc/api/State.hpp
b/src/mc/api/State.hpp
index
dd243f8
..
01d0135
100644
(file)
--- a/
src/mc/api/State.hpp
+++ b/
src/mc/api/State.hpp
@@
-6,12
+6,12
@@
#ifndef SIMGRID_MC_STATE_HPP
#define SIMGRID_MC_STATE_HPP
#ifndef SIMGRID_MC_STATE_HPP
#define SIMGRID_MC_STATE_HPP
-#include "src/mc/mc_pattern.hpp"
+#include "src/mc/api/ActorState.hpp"
+#include "src/mc/api/RemoteApp.hpp"
#include "src/mc/sosp/Snapshot.hpp"
#include "src/mc/transition/Transition.hpp"
#include "src/mc/sosp/Snapshot.hpp"
#include "src/mc/transition/Transition.hpp"
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
/* A node in the exploration graph (kind-of) */
class XBT_PRIVATE State : public xbt::Extendable<State> {
/* A node in the exploration graph (kind-of) */
class XBT_PRIVATE State : public xbt::Extendable<State> {
@@
-20,30
+20,34
@@
class XBT_PRIVATE State : public xbt::Extendable<State> {
/* Outgoing transition: what was the last transition that we took to leave this state? */
std::unique_ptr<Transition> transition_;
/* Outgoing transition: what was the last transition that we took to leave this state? */
std::unique_ptr<Transition> transition_;
- /** Sequential state
number
(used for debugging) */
+ /** Sequential state
ID
(used for debugging) */
long num_ = 0;
long num_ = 0;
- /** State's exploration status by
process
*/
- std::
vector<ActorState> actor_states
_;
+ /** State's exploration status by
actor. Not all the actors are there, only the ones that are ready-to-run in this state
*/
+ std::
map<aid_t, ActorState> actors_to_run
_;
/** Snapshot of system state (if needed) */
std::shared_ptr<Snapshot> system_state_;
public:
/** Snapshot of system state (if needed) */
std::shared_ptr<Snapshot> system_state_;
public:
- explicit State();
+ explicit State(
RemoteApp& remote_app
);
/* Returns a positive number if there is another transition to pick, or -1 if not */
/* Returns a positive number if there is another transition to pick, or -1 if not */
-
in
t next_transition() const;
+
aid_
t next_transition() const;
/* Explore a new path; the parameter must be the result of a previous call to next_transition() */
/* Explore a new path; the parameter must be the result of a previous call to next_transition() */
- void execute_next(
in
t next);
+ void execute_next(
aid_
t next);
long get_num() const { return num_; }
std::size_t count_todo() const;
long get_num() const { return num_; }
std::size_t count_todo() const;
- void mark_todo(aid_t actor) {
this->actor_states_[actor]
.mark_todo(); }
- bool is_done(aid_t actor) const { return
this->actor_states_[actor]
.is_done(); }
+ void mark_todo(aid_t actor) {
actors_to_run_.at(actor)
.mark_todo(); }
+ bool is_done(aid_t actor) const { return
actors_to_run_.at(actor)
.is_done(); }
Transition* get_transition() const;
void set_transition(Transition* t) { transition_.reset(t); }
Transition* get_transition() const;
void set_transition(Transition* t) { transition_.reset(t); }
+ std::map<aid_t, ActorState> const& get_actors_list() { return actors_to_run_; }
+
+ int get_actor_count() { return actors_to_run_.size(); }
+ bool is_actor_enabled(int actor) { return actors_to_run_.at(actor).is_enabled(); }
Snapshot* get_system_state() const { return system_state_.get(); }
void set_system_state(std::shared_ptr<Snapshot> state) { system_state_ = std::move(state); }
Snapshot* get_system_state() const { return system_state_.get(); }
void set_system_state(std::shared_ptr<Snapshot> state) { system_state_ = std::move(state); }
@@
-51,7
+55,6
@@
public:
/* Returns the total amount of states created so far (for statistics) */
static long get_expanded_states() { return expended_states_; }
};
/* Returns the total amount of states created so far (for statistics) */
static long get_expanded_states() { return expended_states_; }
};
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc
#endif
#endif