X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..c5309c7efaf73d81f7aa8cb7908348d0db5677fe:/src/mc/mc_state.h

diff --git a/src/mc/mc_state.h b/src/mc/mc_state.h
index 8ab1b11fa5..68acc459e6 100644
--- a/src/mc/mc_state.h
+++ b/src/mc/mc_state.h
@@ -7,16 +7,16 @@
 #ifndef SIMGRID_MC_STATE_H
 #define SIMGRID_MC_STATE_H
 
+#include <list>
+#include <memory>
+
 #include <xbt/base.h>
+#include <xbt/dynar.h>
 
 #include <simgrid_config.h>
 #include "src/simix/smx_private.h"
 #include "src/mc/mc_snapshot.h"
 
-SG_BEGIN_DECL()
-
-extern XBT_PRIVATE mc_global_t initial_global_state;
-
 /* Possible exploration status of a process in a state */
 typedef enum {
   MC_NOT_INTERLEAVE=0,      /* Do not interleave (do not execute) */
@@ -32,39 +32,50 @@ typedef struct mc_procstate{
                                        interleaved */
 } s_mc_procstate_t, *mc_procstate_t;
 
+namespace simgrid {
+namespace mc {
+
+extern XBT_PRIVATE std::unique_ptr<s_mc_global_t> initial_global_state;
+
 /* An exploration state.
  *
  *  The `executed_state` is sometimes transformed into another `internal_req`.
  *  For example WAITANY is transformes into a WAIT and TESTANY into TEST.
  *  See `MC_state_set_executed_request()`.
  */
-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 */
+struct XBT_PRIVATE State {
+  unsigned long max_pid = 0;            /* Maximum pid at state's creation time */
+  mc_procstate_t proc_status = 0;       /* 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
+  int req_num = 0;                      /* 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;
+  std::shared_ptr<simgrid::mc::Snapshot> system_state = nullptr;      /* Snapshot of system state */
+  int num = 0;
+  int in_visited_states = 0;
   // 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_dynar_t incomplete_comm_pattern = nullptr;
+  xbt_dynar_t index_comm = nullptr; // comm determinism verification
+
+  State();
+  ~State();
+};
+
+XBT_PRIVATE void replay(std::list<simgrid::mc::State*> const& stack);
 
-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()
+XBT_PRIVATE simgrid::mc::State* MC_state_new(void);
+XBT_PRIVATE void MC_state_delete(simgrid::mc::State* state, int free_snapshot);
+XBT_PRIVATE void MC_state_interleave_process(simgrid::mc::State* state, smx_process_t process);
+XBT_PRIVATE unsigned int MC_state_interleave_size(simgrid::mc::State* state);
+XBT_PRIVATE int MC_state_process_is_done(simgrid::mc::State* state, smx_process_t process);
+XBT_PRIVATE void MC_state_set_executed_request(simgrid::mc::State* state, smx_simcall_t req, int value);
+XBT_PRIVATE smx_simcall_t MC_state_get_executed_request(simgrid::mc::State* state, int *value);
+XBT_PRIVATE smx_simcall_t MC_state_get_internal_request(simgrid::mc::State* state);
+XBT_PRIVATE smx_simcall_t MC_state_get_request(simgrid::mc::State* state, int *value);
+XBT_PRIVATE void MC_state_remove_interleave_process(simgrid::mc::State* state, smx_process_t process);
 
 #endif