X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/11ce6b59ec29ed55d422a0c97a7d734ac1eb7a39..932e745735378c442e2348a3a428d97b69398f86:/src/mc/mc_state.h

diff --git a/src/mc/mc_state.h b/src/mc/mc_state.h
index 90706daa4b..032a6e5b4d 100644
--- a/src/mc/mc_state.h
+++ b/src/mc/mc_state.h
@@ -22,6 +22,43 @@ namespace mc {
 
 extern XBT_PRIVATE std::unique_ptr<s_mc_global_t> initial_global_state;
 
+struct PatternCommunication {
+  int num = 0;
+  smx_synchro_t comm_addr;
+  e_smx_comm_type_t type = SIMIX_COMM_SEND;
+  unsigned long src_proc = 0;
+  unsigned long dst_proc = 0;
+  const char *src_host = nullptr;
+  const char *dst_host = nullptr;
+  std::string rdv;
+  std::vector<char> data;
+  int tag = 0;
+  int index = 0;
+
+  PatternCommunication()
+  {
+    std::memset(&comm_addr, 0, sizeof(comm_addr));
+  }
+
+  PatternCommunication dup() const
+  {
+    simgrid::mc::PatternCommunication res;
+    // num?
+    res.comm_addr = this->comm_addr;
+    res.type = this->type;
+    // src_proc?
+    // dst_proc?
+    res.dst_proc = this->dst_proc;
+    res.dst_host = this->dst_host;
+    res.rdv = this->rdv;
+    res.data = this->data;
+    // tag?
+    res.index = this->index;
+    return res;
+  }
+
+};
+
 /* Possible exploration status of a process in a state */
 enum class ProcessInterleaveState {
   no_interleave=0, /* Do not interleave (do not execute) */
@@ -51,28 +88,50 @@ struct ProcessState {
  *
  *  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()`.
+ *  See `MC_state_get_request_for_process()`.
  */
 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;
-  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 = 0;                      /* The request number (in the case of a
-                                       multi-request like waitany ) */
-  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 = nullptr;
+  /** The simcall */
+  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.
+   */
+  s_smx_simcall_t internal_req;
+
+  /* Can be used as a copy of the remote synchro object */
+  s_smx_synchro_t internal_comm;
+
+  /** Snapshot of system state (if needed) */
+  std::shared_ptr<simgrid::mc::Snapshot> system_state;
 
-  // For communication determinism verification:
+  // For CommunicationDeterminismChecker
+  std::vector<std::vector<simgrid::mc::PatternCommunication>> incomplete_comm_pattern;
   std::vector<unsigned> communicationIndices;
 
   State();
-  ~State();
 
   std::size_t interleaveSize() const;
 };
@@ -84,10 +143,8 @@ XBT_PRIVATE void replay(std::list<std::unique_ptr<simgrid::mc::State>> const& st
 
 XBT_PRIVATE simgrid::mc::State* MC_state_new(void);
 XBT_PRIVATE void MC_state_interleave_process(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