-typedef struct XBT_PRIVATE mc_state {
- unsigned long max_pid; /* Maximum pid at state's creation time */
- mc_procstate_t proc_status; /* State's exploration status by process */
- s_smx_synchro_t internal_comm; /* To be referenced by the internal_req */
- s_smx_simcall_t internal_req; /* Internal translation of request */
- s_smx_simcall_t executed_req; /* The executed request of the state */
- int req_num; /* The request number (in the case of a
- multi-request like waitany ) */
- mc_snapshot_t system_state; /* Snapshot of system state */
- int num;
- int in_visited_states;
- // comm determinism verification (xbt_dynar_t<xbt_dynar_t<mc_comm_pattern_t>):
- xbt_dynar_t incomplete_comm_pattern;
- xbt_dynar_t index_comm; // comm determinism verification
-} s_mc_state_t, *mc_state_t;
-
-XBT_PRIVATE mc_state_t MC_state_new(void);
-XBT_PRIVATE void MC_state_delete(mc_state_t state, int free_snapshot);
-XBT_PRIVATE void MC_state_interleave_process(mc_state_t state, smx_process_t process);
-XBT_PRIVATE unsigned int MC_state_interleave_size(mc_state_t state);
-XBT_PRIVATE int MC_state_process_is_done(mc_state_t state, smx_process_t process);
-XBT_PRIVATE void MC_state_set_executed_request(mc_state_t state, smx_simcall_t req, int value);
-XBT_PRIVATE smx_simcall_t MC_state_get_executed_request(mc_state_t state, int *value);
-XBT_PRIVATE smx_simcall_t MC_state_get_internal_request(mc_state_t state);
-XBT_PRIVATE smx_simcall_t MC_state_get_request(mc_state_t state, int *value);
-XBT_PRIVATE void MC_state_remove_interleave_process(mc_state_t state, smx_process_t process);
-
-SG_END_DECL()
+class ProcessState {
+ /* Possible exploration status of a process transition in a state.
+ * Either the checker did not consider the transition, or it was considered and to do, or considered and done.
+ */
+ enum class InterleavingType {
+ /** This process transition is not considered by the checker (yet?) */
+ disabled = 0,
+ /** The checker algorithm decided that this process transitions should be done at some point */
+ todo,
+ /** The checker algorithm decided that this should be done, but it was done in the meanwhile */
+ done,
+ };
+
+ /** Exploration control information */
+ InterleavingType state = InterleavingType::disabled;
+public:
+ /** Number of times that the process was considered to be executed */
+ // TODO, make this private
+ unsigned int times_considered = 0;
+
+ bool isDisabled() const {
+ return this->state == InterleavingType::disabled;
+ }
+ bool isDone() const {
+ return this->state == InterleavingType::done;
+ }
+ bool isTodo() const {
+ return this->state == InterleavingType::todo;
+ }
+ /** Mark that we should try executing this process at some point in the future of the checker algorithm */
+ void consider() {
+ this->state = InterleavingType::todo;
+ this->times_considered = 0;
+ }
+ void setDone() {
+ this->state = InterleavingType::done;
+ }
+};
+
+/* A node in the exploration graph (kind-of)
+ */
+struct XBT_PRIVATE State {
+
+ /** Sequential state number (used for debugging) */
+ int num = 0;
+
+ /** State's exploration status by process */
+ std::vector<ProcessState> actorStates;
+
+ Transition transition;
+
+ /** The simcall which was executed, going out of that state */
+ s_smx_simcall_t executed_req;
+
+ /* Internal translation of the executed_req simcall
+ *
+ * SIMCALL_COMM_TESTANY is translated to a SIMCALL_COMM_TEST
+ * and SIMCALL_COMM_WAITANY to a SIMCALL_COMM_WAIT.
+ */
+ s_smx_simcall_t internal_req;
+
+ /* Can be used as a copy of the remote synchro object */
+ simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> internal_comm;
+
+ /** Snapshot of system state (if needed) */
+ std::shared_ptr<simgrid::mc::Snapshot> system_state;
+
+ // For CommunicationDeterminismChecker
+ std::vector<std::vector<simgrid::mc::PatternCommunication>> incomplete_comm_pattern;
+ std::vector<unsigned> communicationIndices;
+
+ State(unsigned long state_number);
+
+ std::size_t interleaveSize() const;
+ void addInterleavingSet(smx_actor_t actor) { this->actorStates[actor->pid].consider(); }
+ Transition getTransition() const;
+};
+
+}
+}
+
+XBT_PRIVATE smx_simcall_t MC_state_get_request(simgrid::mc::State* state);