X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/04d920dbbca9867f8440d85781e33d1f603978c7..872d65264714799b25eb231609c3f05bae3d03dc:/src/mc/mc_state.h

diff --git a/src/mc/mc_state.h b/src/mc/mc_state.h
index c3d6190b5b..1e47840449 100644
--- a/src/mc/mc_state.h
+++ b/src/mc/mc_state.h
@@ -15,18 +15,28 @@
 
 #include <simgrid_config.h>
 #include "src/simix/smx_private.h"
+#include "src/simix/SynchroIo.hpp"
+#include "src/simix/SynchroComm.hpp"
+#include "src/simix/SynchroRaw.hpp"
+#include "src/simix/SynchroSleep.hpp"
+#include "src/simix/SynchroExec.hpp"
 #include "src/mc/mc_snapshot.h"
 #include "src/mc/mc_record.h"
+#include "src/mc/Transition.hpp"
 
 namespace simgrid {
 namespace mc {
 
-extern XBT_PRIVATE std::unique_ptr<s_mc_global_t> initial_global_state;
+enum class PatternCommunicationType {
+  none = 0,
+  send = 1,
+  receive = 2,
+};
 
 struct PatternCommunication {
   int num = 0;
   smx_synchro_t comm_addr;
-  e_smx_comm_type_t type = SIMIX_COMM_SEND;
+  PatternCommunicationType type = PatternCommunicationType::send;
   unsigned long src_proc = 0;
   unsigned long dst_proc = 0;
   const char *src_host = nullptr;
@@ -103,45 +113,30 @@ public:
   }
 };
 
-/* 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_get_request_for_process()`.
+/* A node in the exploration graph (kind-of)
  */
 struct XBT_PRIVATE State {
 
   /** Sequential state number (used for debugging) */
   int num = 0;
 
-  /* Next transition to explore for this communication
-   *
-   * Some transitions are not deterministic such as:
-   *
-   * * waitany which can receive different messages;
-   *
-   * * random which can produce different values.
-   *
-   * This variable is used to keep track of which transition
-   * should be explored next for a given simcall.
-   */
-  int req_num = 0;
-
   /** State's exploration status by process */
   std::vector<ProcessState> processStates;
 
-  /** The simcall */
+  Transition transition;
+
+  /** The simcall which was executed */
   s_smx_simcall_t executed_req;
 
   /* Internal translation of the simcall
    *
-   * IMCALL_COMM_TESTANY is translated to a SIMCALL_COMM_TEST
-   * and SIMCALL_COMM_WAITANY to a SIMCALL_COMM_WAIT.
+   * 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 */
-  s_smx_synchro_t internal_comm;
+  simgrid::mc::Remote<simgrid::simix::Comm> internal_comm;
 
   /** Snapshot of system state (if needed) */
   std::shared_ptr<simgrid::mc::Snapshot> system_state;
@@ -157,17 +152,13 @@ struct XBT_PRIVATE State {
   {
     this->processStates[process->pid].interleave();
   }
-  RecordTraceElement getRecordElement() const;
+  Transition getTransition() const;
 };
 
-XBT_PRIVATE void replay(std::list<std::unique_ptr<simgrid::mc::State>> const& stack);
-
 }
 }
 
-XBT_PRIVATE simgrid::mc::State* MC_state_new(void);
-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 simgrid::mc::State* MC_state_new(unsigned long state_number);
+XBT_PRIVATE smx_simcall_t MC_state_get_request(simgrid::mc::State* state);
 
 #endif