mc_api::s_initialize() renamed to mc_api::session_initialize()

[simgrid.git] / src / mc / mc_api.cpp

diff --git a/src/mc/mc_api.cpp b/src/mc/mc_api.cpp
index e3e1093..cbf5bbc 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);
@@ -316,6 +298,7 @@ const char* mc_api::get_actor_host_name(smx_actor_t actor) const
   return host_name;
 }
 
+#if HAVE_SMPI
 bool mc_api::check_send_request_detached(smx_simcall_t const& simcall) const
 {
   simgrid::smpi::Request mpi_request;
@@ -323,6 +306,7 @@ bool mc_api::check_send_request_detached(smx_simcall_t const& simcall) const
       &mpi_request, remote(static_cast<smpi::Request*>(simcall_comm_isend__get__data(simcall))));
   return mpi_request.detached();
 }
+#endif
 
 smx_actor_t mc_api::get_src_actor(const kernel::activity::CommImpl* comm_addr) const
 {
@@ -351,7 +335,7 @@ std::size_t mc_api::get_remote_heap_bytes() const
   return heap_bytes_used;
 }
 
-void mc_api::s_initialize() const
+void mc_api::session_initialize() const
 {
   session->initialize();
 }
@@ -432,7 +416,7 @@ std::string const& mc_api::mc_get_host_name(std::string const& hostname) const
   return mc_model_checker->get_host_name(hostname);
 }
 
-void mc_api::mc_dump_record_path() const
+void mc_api::dump_record_path() const
 {
   simgrid::mc::dumpRecordPath();
 }
@@ -511,11 +495,18 @@ void mc_api::restore_initial_state() const
   session->restore_initial_state();
 }
 
-void mc_api::execute(Transition const& transition)
+void mc_api::execute(Transition const& transition) const
 {
   session->execute(transition);
 }
 
+#if SIMGRID_HAVE_MC
+void mc_api::automaton_load(const char *file) const
+{ 
+  MC_automaton_load(file); 
+}
+#endif
+
 void mc_api::log_state() const
 {
   session->log_state();