#ifndef SIMGRID_MC_STATE_HPP
#define SIMGRID_MC_STATE_HPP
-#include "src/mc/api/Transition.hpp"
-#include "src/mc/mc_comm_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"
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
/* A node in the exploration graph (kind-of) */
-class XBT_PRIVATE State {
+class XBT_PRIVATE State : public xbt::Extendable<State> {
static long expended_states_; /* Count total amount of states, for stats */
- /* Outgoing transition: what was the last transition that we took to leave this state? Useful for replay */
+ /* Outgoing transition: what was the last transition that we took to leave this state? */
std::unique_ptr<Transition> transition_;
-public:
- explicit State();
-
- /** Sequential state number (used for debugging) */
+ /** Sequential state ID (used for debugging) */
long num_ = 0;
- /** State's exploration status by process */
- std::vector<ActorState> actor_states_;
-
- /** The simcall which was executed, going out of that state */
- s_smx_simcall executed_req_;
+ /** 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<simgrid::mc::Snapshot> system_state_;
+ std::shared_ptr<Snapshot> system_state_;
- // For CommunicationDeterminismChecker
- std::vector<std::vector<simgrid::mc::PatternCommunication>> incomplete_comm_pattern_;
- std::vector<unsigned> communication_indices_;
+public:
+ explicit State(RemoteApp& remote_app);
/* Returns a positive number if there is another transition to pick, or -1 if not */
- int next_transition() const;
+ aid_t next_transition() const;
- /* Explore a new path */
- void execute_next(int next);
+ /* Explore a new path; the parameter must be the result of a previous call to next_transition() */
+ void execute_next(aid_t next);
+ long get_num() const { return num_; }
std::size_t count_todo() const;
- void mark_todo(aid_t actor) { this->actor_states_[actor].mark_todo(); }
+ 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); }
+ std::map<aid_t, ActorState> const& get_actors_list() const { return actors_to_run_; }
+
+ unsigned long get_actor_count() const { 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); }
/* Returns the total amount of states created so far (for statistics) */
static long get_expanded_states() { return expended_states_; }
-
-private:
- void copy_incomplete_comm_pattern();
- void copy_index_comm_pattern();
};
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc
#endif
