X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8ddc9cfcd5b4a250990b4ea6072e7db218b010f3..65046eb1778722070f113150acdb0ac45fc88efd:/src/mc/mc_state.hpp

diff --git a/src/mc/mc_state.hpp b/src/mc/mc_state.hpp
index f57f397900..b2ce0cc4f1 100644
--- a/src/mc/mc_state.hpp
+++ b/src/mc/mc_state.hpp
@@ -6,90 +6,13 @@
 #ifndef SIMGRID_MC_STATE_HPP
 #define SIMGRID_MC_STATE_HPP
 
-#include "src/kernel/activity/CommImpl.hpp"
 #include "src/mc/Transition.hpp"
 #include "src/mc/sosp/Snapshot.hpp"
+#include "src/mc/mc_pattern.hpp"
 
 namespace simgrid {
 namespace mc {
 
-enum class PatternCommunicationType {
-  none    = 0,
-  send    = 1,
-  receive = 2,
-};
-
-class PatternCommunication {
-public:
-  int num = 0;
-  simgrid::kernel::activity::CommImpl* comm_addr;
-  PatternCommunicationType type = PatternCommunicationType::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;
-  }
-};
-
-/* On every state, each actor has an entry of the following type.
- * This represents both the actor and its transition because
- *   an actor cannot have more than one enabled transition at a given time.
- */
-class ActorState {
-  /* Possible exploration status of an actor transition in a state.
-   * Either the checker did not consider the transition, or it was considered and still to do, or considered and done.
-   */
-  enum class InterleavingType {
-    /** This actor transition is not considered by the checker (yet?) */
-    disabled = 0,
-    /** The checker algorithm decided that this actor 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 is_disabled() const { return this->state == InterleavingType::disabled; }
-  bool is_done() const { return this->state == InterleavingType::done; }
-  bool is_todo() 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 set_done() { this->state = InterleavingType::done; }
-};
-
 /* A node in the exploration graph (kind-of) */
 class XBT_PRIVATE State {
 public: