-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 ) */
- simgrid::mc::Snapshot* 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()
+struct XBT_PRIVATE State {
+
+ /** Sequential state number (used for debugging) */
+ int num = 0;
+
+ /** State's exploration status by process */
+ std::vector<ProcessState> processStates;
+
+ Transition transition;
+
+ /** The simcall which was executed */
+ s_smx_simcall_t executed_req;
+
+ /* Internal translation of the 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::simix::Comm> 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();
+
+ std::size_t interleaveSize() const;
+ void interleave(smx_process_t process)
+ {
+ this->processStates[process->pid].interleave();
+ }
+ Transition getTransition() const;
+};
+
+}
+}
+
+XBT_PRIVATE simgrid::mc::State* MC_state_new(unsigned long state_number);
+XBT_PRIVATE smx_simcall_t MC_state_get_request(simgrid::mc::State* state);