copy_incomplete_comm_pattern() and copy_index_comm_pattern() in mc_api

diff --git a/src/mc/mc_api.cpp b/src/mc/mc_api.cpp
index 8e61bbe..ec1e63b 100644 (file)
--- a/src/mc/mc_api.cpp
+++ b/src/mc/mc_api.cpp
@@ -5,6 +5,7 @@
 #include "src/mc/mc_smx.hpp"
 #include "src/mc/remote/RemoteSimulation.hpp"
 #include "src/mc/mc_record.hpp"
+#include "src/mc/mc_comm_pattern.hpp"
 
 #include <xbt/asserts.h>
 #include <xbt/log.h>
@@ -42,6 +43,16 @@ unsigned long mc_api::get_maxpid() const
   return MC_smx_get_maxpid();
 }
 
+void mc_api::copy_incomplete_comm_pattern(const simgrid::mc::State* state) const
+{
+  MC_state_copy_incomplete_communications_pattern((simgrid::mc::State*)state);
+}
+
+void mc_api::copy_index_comm_pattern(const simgrid::mc::State* state) const
+{
+  MC_state_copy_index_communications_pattern((simgrid::mc::State*)state);
+}
+
 void mc_api::s_initialize() const
 {
   session->initialize();

diff --git a/src/mc/mc_api.hpp b/src/mc/mc_api.hpp
index 4bfc92b..676576e 100644 (file)
--- a/src/mc/mc_api.hpp
+++ b/src/mc/mc_api.hpp
@@ -43,6 +43,10 @@ public:
   bool actor_is_enabled(aid_t pid) const;
   unsigned long get_maxpid() const;
 
+  // COMM FUNCTIONS
+  void copy_incomplete_comm_pattern(const simgrid::mc::State* state) const;
+  void copy_index_comm_pattern(const simgrid::mc::State* state) const;
+
   // MODEL_CHECKER FUNCTIONS
   ModelChecker* get_model_checker() const;
   void mc_inc_visited_states() const;

diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp
index 72627c2..98b2344 100644 (file)
--- a/src/mc/mc_state.cpp
+++ b/src/mc/mc_state.cpp
@@ -4,7 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/mc/mc_state.hpp"
-#include "src/mc/mc_comm_pattern.hpp"
+// #include "src/mc/mc_comm_pattern.hpp"
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_request.hpp"
 #include "src/mc/mc_api.hpp"
@@ -27,8 +27,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) {
-      MC_state_copy_incomplete_communications_pattern(this);
-      MC_state_copy_index_communications_pattern(this);
+      mcapi::get().copy_incomplete_comm_pattern(this);
+      mcapi::get().copy_index_comm_pattern(this);
     }
   }
 }