copy_incomplete_comm_pattern() and copy_index_comm_pattern() moved from mc_api to...

diff --git a/src/mc/mc_api.cpp b/src/mc/mc_api.cpp
index e3e1093..d08035d 100644 (file)
--- a/src/mc/mc_api.cpp
+++ b/src/mc/mc_api.cpp
@@ -210,24 +210,6 @@ int mc_api::get_actors_size() const
   return mc_model_checker->get_remote_simulation().actors().size();
 }
 
-void mc_api::copy_incomplete_comm_pattern(simgrid::mc::State* state) const
-{
-  state->incomplete_comm_pattern_.clear();
-  for (unsigned i=0; i < MC_smx_get_maxpid(); i++) {
-    std::vector<simgrid::mc::PatternCommunication> res;
-    for (auto const& comm : incomplete_communications_pattern[i])
-      res.push_back(comm->dup());
-    state->incomplete_comm_pattern_.push_back(std::move(res));
-  }
-}
-
-void mc_api::copy_index_comm_pattern(simgrid::mc::State* state) const
-{
-  state->communication_indices_.clear();
-  for (auto const& list_process_comm : initial_communications_pattern)
-    state->communication_indices_.push_back(list_process_comm.index_comm);
-}
-
 bool mc_api::comm_addr_equal(const kernel::activity::CommImpl* comm_addr1, const kernel::activity::CommImpl* comm_addr2) const
 {
   return remote(comm_addr1) == remote(comm_addr2);

diff --git a/src/mc/mc_api.hpp b/src/mc/mc_api.hpp
index dceca5e..cea7d6e 100644 (file)
--- a/src/mc/mc_api.hpp
+++ b/src/mc/mc_api.hpp
@@ -45,8 +45,6 @@ public:
   int get_actors_size() const;
 
   // COMMUNICATION APIs
-  void copy_incomplete_comm_pattern(simgrid::mc::State* state) const;
-  void copy_index_comm_pattern(simgrid::mc::State* state) const;
   bool comm_addr_equal(const kernel::activity::CommImpl* comm_addr1, const kernel::activity::CommImpl* comm_addr2) const;
   kernel::activity::CommImpl* get_comm_isend_raw_addr(smx_simcall_t request) const;
   kernel::activity::CommImpl* get_comm_wait_raw_addr(smx_simcall_t request) const;

diff --git a/src/mc/mc_comm_pattern.hpp b/src/mc/mc_comm_pattern.hpp
index 01b7524..1c95e49 100644 (file)
--- a/src/mc/mc_comm_pattern.hpp
+++ b/src/mc/mc_comm_pattern.hpp
@@ -7,8 +7,7 @@
 #define SIMGRID_MC_COMM_PATTERN_H
 
 #include <vector>
-
-#include "src/mc/mc_state.hpp"
+#include "src/mc/mc_pattern.hpp"
 
 namespace simgrid {
 namespace mc {

diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp
index c078742..967d730 100644 (file)
--- a/src/mc/mc_state.cpp
+++ b/src/mc/mc_state.cpp
@@ -25,8 +25,8 @@ State::State(unsigned long state_number) : num_(state_number)
     auto snapshot_ptr = mcapi::get().take_snapshot(num_);
     system_state_ = std::shared_ptr<simgrid::mc::Snapshot>(snapshot_ptr);
     if (_sg_mc_comms_determinism || _sg_mc_send_determinism) {
-      mcapi::get().copy_incomplete_comm_pattern(this);
-      mcapi::get().copy_index_comm_pattern(this);
+      copy_incomplete_comm_pattern();
+      copy_index_comm_pattern();
     }
   }
 }
@@ -41,5 +41,23 @@ Transition State::get_transition() const
   return this->transition_;
 }
 
+void State::copy_incomplete_comm_pattern()
+{
+  incomplete_comm_pattern_.clear();
+  for (auto i=0; i < mcapi::get().get_maxpid(); i++) {
+    std::vector<simgrid::mc::PatternCommunication> res;
+    for (auto const& comm : incomplete_communications_pattern[i])
+      res.push_back(comm->dup());
+    incomplete_comm_pattern_.push_back(std::move(res));
+  }
+}
+
+void State::copy_index_comm_pattern()
+{
+  communication_indices_.clear();
+  for (auto const& list_process_comm : initial_communications_pattern)
+    this->communication_indices_.push_back(list_process_comm.index_comm);
+}
+
 }
 }

diff --git a/src/mc/mc_state.hpp b/src/mc/mc_state.hpp
index 2f347e3..ec53b61 100644 (file)
--- a/src/mc/mc_state.hpp
+++ b/src/mc/mc_state.hpp
@@ -8,7 +8,7 @@
 
 #include "src/mc/Transition.hpp"
 #include "src/mc/sosp/Snapshot.hpp"
-#include "src/mc/mc_pattern.hpp"
+#include "src/mc/mc_comm_pattern.hpp"
 
 namespace simgrid {
 namespace mc {
@@ -52,6 +52,10 @@ public:
     this->actor_states_[actor->get_pid()].consider();
   }
   Transition get_transition() const;
+
+private:
+  void copy_incomplete_comm_pattern();
+  void copy_index_comm_pattern();
 };
 }
 }