X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de8c3ed2a5eafc299ca06c14323177878b582a2b..ec7ad1dc2186ddce2173039c2083384c5215dbd2:/src/mc/api.cpp

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index ac168db18a..e9ad2351f1 100644
--- a/src/mc/api.cpp
+++ b/src/mc/api.cpp
@@ -11,7 +11,6 @@
 #include "src/mc/remote/RemoteSimulation.hpp"
 #include <xbt/asserts.h>
 #include <xbt/log.h>
-// #include <xbt/dynar.h>
 
 #if HAVE_SMPI
 #include "src/smpi/include/smpi_request.hpp"
@@ -48,93 +47,6 @@ static char* buff_size_to_string(size_t buff_size)
   return xbt_strdup("(verbose only)");
 }
 
-inline
-smx_mailbox_t get_mbox(smx_simcall_t const r)
-{
-  switch (r->call_) {
-    case Simcall::COMM_ISEND:
-      return simcall_comm_isend__get__mbox(r);
-    case Simcall::COMM_IRECV:
-      return simcall_comm_irecv__get__mbox(r);
-    default:
-      return nullptr;
-  }
-}
-
-inline simgrid::kernel::activity::CommImpl* get_comm(smx_simcall_t const r)
-{
-  switch (r->call_) {
-    case Simcall::COMM_WAIT:
-      return simcall_comm_wait__getraw__comm(r);
-    case Simcall::COMM_TEST:
-      return simcall_comm_test__getraw__comm(r);
-    default:
-      return nullptr;
-  }
-}
-
-// Does half the job
-inline bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2)
-{
-  if (r1->call_ == Simcall::COMM_ISEND && r2->call_ == Simcall::COMM_IRECV)
-    return false;
-
-  if (r1->call_ == Simcall::COMM_IRECV && r2->call_ == Simcall::COMM_ISEND)
-    return false;
-
-  // Those are internal requests, we do not need indirection because those objects are copies:
-  const kernel::activity::CommImpl* synchro1 = get_comm(r1);
-  const kernel::activity::CommImpl* synchro2 = get_comm(r2);
-
-  if ((r1->call_ == Simcall::COMM_ISEND || r1->call_ == Simcall::COMM_IRECV) && r2->call_ == Simcall::COMM_WAIT) {
-    const kernel::activity::MailboxImpl* mbox = get_mbox(r1); // r1->get_mboxx')
-
-    if (mbox != synchro2->mbox_cpy
-        && simcall_comm_wait__get__timeout(r2) <= 0)
-      return false;
-
-    if ((r1->issuer_ != synchro2->src_actor_.get()) && (r1->issuer_ != synchro2->dst_actor_.get()) &&
-        simcall_comm_wait__get__timeout(r2) <= 0)
-      return false;
-
-    if ((r1->call_ == Simcall::COMM_ISEND) && (synchro2->type_ == kernel::activity::CommImpl::Type::SEND) &&
-        (synchro2->src_buff_ != simcall_comm_isend__get__src_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0)
-      return false;
-
-    if ((r1->call_ == Simcall::COMM_IRECV) && (synchro2->type_ == kernel::activity::CommImpl::Type::RECEIVE) &&
-        (synchro2->dst_buff_ != simcall_comm_irecv__get__dst_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0)
-      return false;
-  }
-
-  /* FIXME: the following rule assumes that the result of the isend/irecv call is not stored in a buffer used in the
-   * test call. */
-#if 0
-  if((r1->call == Simcall::COMM_ISEND || r1->call == Simcall::COMM_IRECV)
-      &&  r2->call == Simcall::COMM_TEST)
-    return false;
-#endif
-
-  if (r1->call_ == Simcall::COMM_WAIT && (r2->call_ == Simcall::COMM_WAIT || r2->call_ == Simcall::COMM_TEST) &&
-      (synchro1->src_actor_.get() == nullptr || synchro1->dst_actor_.get() == nullptr))
-    return false;
-
-  if (r1->call_ == Simcall::COMM_TEST &&
-      (simcall_comm_test__get__comm(r1) == nullptr || synchro1->src_buff_ == nullptr || synchro1->dst_buff_ == nullptr))
-    return false;
-
-  if (r1->call_ == Simcall::COMM_TEST && r2->call_ == Simcall::COMM_WAIT &&
-      synchro1->src_buff_ == synchro2->src_buff_ && synchro1->dst_buff_ == synchro2->dst_buff_)
-    return false;
-
-  if (r1->call_ == Simcall::COMM_WAIT && r2->call_ == Simcall::COMM_TEST && synchro1->src_buff_ != nullptr &&
-      synchro1->dst_buff_ != nullptr && synchro2->src_buff_ != nullptr && synchro2->dst_buff_ != nullptr &&
-      synchro1->dst_buff_ != synchro2->src_buff_ && synchro1->dst_buff_ != synchro2->dst_buff_ &&
-      synchro2->dst_buff_ != synchro1->src_buff_)
-    return false;
-
-  return true;
-}
-
 /* Search an enabled transition for the given process.
  *
  * This can be seen as an iterator returning the next transition of the process.
@@ -289,6 +201,80 @@ static inline smx_simcall_t MC_state_choose_request_for_process(simgrid::mc::Sta
   return req;
 }
 
+simgrid::kernel::activity::CommImpl* Api::get_comm(smx_simcall_t const r) const
+{
+  switch (r->call_) {
+    case Simcall::COMM_WAIT:
+      return simcall_comm_wait__getraw__comm(r);
+    case Simcall::COMM_TEST:
+      return simcall_comm_test__getraw__comm(r);
+    default:
+      return nullptr;
+  }
+}
+
+// Does half the job
+bool Api::request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2) const 
+{
+  if (r1->call_ == Simcall::COMM_ISEND && r2->call_ == Simcall::COMM_IRECV)
+    return false;
+
+  if (r1->call_ == Simcall::COMM_IRECV && r2->call_ == Simcall::COMM_ISEND)
+    return false;
+
+  // Those are internal requests, we do not need indirection because those objects are copies:
+  const kernel::activity::CommImpl* synchro1 = get_comm(r1);
+  const kernel::activity::CommImpl* synchro2 = get_comm(r2);
+
+  if ((r1->call_ == Simcall::COMM_ISEND || r1->call_ == Simcall::COMM_IRECV) && r2->call_ == Simcall::COMM_WAIT) {
+    const kernel::activity::MailboxImpl* mbox = get_mbox_remote_addr(r1);
+
+    if (mbox != synchro2->mbox_cpy
+        && simcall_comm_wait__get__timeout(r2) <= 0)
+      return false;
+
+    if ((r1->issuer_ != synchro2->src_actor_.get()) && (r1->issuer_ != synchro2->dst_actor_.get()) &&
+        simcall_comm_wait__get__timeout(r2) <= 0)
+      return false;
+
+    if ((r1->call_ == Simcall::COMM_ISEND) && (synchro2->type_ == kernel::activity::CommImpl::Type::SEND) &&
+        (synchro2->src_buff_ != simcall_comm_isend__get__src_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0)
+      return false;
+
+    if ((r1->call_ == Simcall::COMM_IRECV) && (synchro2->type_ == kernel::activity::CommImpl::Type::RECEIVE) &&
+        (synchro2->dst_buff_ != simcall_comm_irecv__get__dst_buff(r1)) && simcall_comm_wait__get__timeout(r2) <= 0)
+      return false;
+  }
+
+  /* FIXME: the following rule assumes that the result of the isend/irecv call is not stored in a buffer used in the
+   * test call. */
+#if 0
+  if((r1->call == Simcall::COMM_ISEND || r1->call == Simcall::COMM_IRECV)
+      &&  r2->call == Simcall::COMM_TEST)
+    return false;
+#endif
+
+  if (r1->call_ == Simcall::COMM_WAIT && (r2->call_ == Simcall::COMM_WAIT || r2->call_ == Simcall::COMM_TEST) &&
+      (synchro1->src_actor_.get() == nullptr || synchro1->dst_actor_.get() == nullptr))
+    return false;
+
+  if (r1->call_ == Simcall::COMM_TEST &&
+      (simcall_comm_test__get__comm(r1) == nullptr || synchro1->src_buff_ == nullptr || synchro1->dst_buff_ == nullptr))
+    return false;
+
+  if (r1->call_ == Simcall::COMM_TEST && r2->call_ == Simcall::COMM_WAIT &&
+      synchro1->src_buff_ == synchro2->src_buff_ && synchro1->dst_buff_ == synchro2->dst_buff_)
+    return false;
+
+  if (r1->call_ == Simcall::COMM_WAIT && r2->call_ == Simcall::COMM_TEST && synchro1->src_buff_ != nullptr &&
+      synchro1->dst_buff_ != nullptr && synchro2->src_buff_ != nullptr && synchro2->dst_buff_ != nullptr &&
+      synchro1->dst_buff_ != synchro2->src_buff_ && synchro1->dst_buff_ != synchro2->dst_buff_ &&
+      synchro2->dst_buff_ != synchro1->src_buff_)
+    return false;
+
+  return true;
+}
+
 void Api::initialize(char** argv) const
 {
   simgrid::mc::session = new simgrid::mc::Session([argv] {
@@ -328,6 +314,12 @@ RemotePtr<kernel::activity::CommImpl> Api::get_comm_isend_raw_addr(smx_simcall_t
   return RemotePtr<kernel::activity::CommImpl>(static_cast<kernel::activity::CommImpl*>(comm_addr));
 }
 
+RemotePtr<kernel::activity::CommImpl> Api::get_comm_irecv_raw_addr(smx_simcall_t request) const
+{
+  auto comm_addr = simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ActivityImpl*>(request->result_);
+  return RemotePtr<kernel::activity::CommImpl>(static_cast<kernel::activity::CommImpl*>(comm_addr));
+}
+
 RemotePtr<kernel::activity::CommImpl> Api::get_comm_wait_raw_addr(smx_simcall_t request) const
 {
   auto comm_addr = simgrid::simix::unmarshal_raw<simgrid::kernel::activity::CommImpl*>(request->args_[0]);
@@ -465,19 +457,65 @@ void Api::mc_show_deadlock() const
   MC_show_deadlock();
 }
 
+/** Get the issuer of a simcall (`req->issuer`)
+ *
+ *  In split-process mode, it does the black magic necessary to get an address
+ *  of a (shallow) copy of the data structure the issuer SIMIX actor in the local
+ *  address space.
+ *
+ *  @param process the MCed process
+ *  @param req     the simcall (copied in the local process)
+ */
 smx_actor_t Api::simcall_get_issuer(s_smx_simcall const* req) const
 {
-  return MC_smx_simcall_get_issuer(req);
+  xbt_assert(mc_model_checker != nullptr);
+
+  // This is the address of the smx_actor in the MCed process:
+  auto address = simgrid::mc::remote(req->issuer_);
+
+  // Lookup by address:
+  for (auto& actor : mc_model_checker->get_remote_simulation().actors())
+    if (actor.address == address)
+      return actor.copy.get_buffer();
+  for (auto& actor : mc_model_checker->get_remote_simulation().dead_actors())
+    if (actor.address == address)
+      return actor.copy.get_buffer();
+
+  xbt_die("Issuer not found");
 }
 
 long Api::simcall_get_actor_id(s_smx_simcall const* req) const
 {
-  return MC_smx_simcall_get_issuer(req)->get_pid();
+  return simcall_get_issuer(req)->get_pid();
+}
+
+smx_mailbox_t Api::get_mbox_remote_addr(smx_simcall_t const req) const
+{
+  switch (req->call_) {
+    case Simcall::COMM_ISEND:
+      return simix::unmarshal<smx_mailbox_t>(req->args_[1]); // simcall_comm_isend__get__mbox
+    case Simcall::COMM_IRECV:
+      return simix::unmarshal<smx_mailbox_t>(req->args_[1]); // simcall_comm_irecv__get__mbox
+    default:
+      return nullptr;
+  }
 }
 
-smx_mailbox_t Api::simcall_get_mbox(smx_simcall_t const req) const
+RemotePtr<kernel::activity::ActivityImpl> Api::get_comm_remote_addr(smx_simcall_t const req) const
 {
-  return get_mbox(req);
+  RemotePtr<kernel::activity::ActivityImpl> comm_addr;
+  switch (req->call_) {
+    case Simcall::COMM_ISEND:
+    case Simcall::COMM_IRECV: {
+      auto comm_addr_ptr = simgrid::simix::unmarshal_raw<simgrid::kernel::activity::ActivityImpl*>(req->result_);
+      comm_addr          = remote(comm_addr_ptr);
+      break;
+    }
+    default:
+      comm_addr = RemotePtr<kernel::activity::ActivityImpl>();
+      break;
+  }
+  return comm_addr;
 }
 
 bool Api::mc_is_null() const
@@ -595,7 +633,7 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType req
   const char* type = nullptr;
   char* args       = nullptr;
 
-  smx_actor_t issuer = MC_smx_simcall_get_issuer(req);
+  smx_actor_t issuer = simcall_get_issuer(req);
 
   switch (req->call_) {
     case Simcall::COMM_ISEND: {
@@ -765,7 +803,7 @@ std::string Api::request_to_string(smx_simcall_t req, int value, RequestType req
 
 std::string Api::request_get_dot_output(smx_simcall_t req, int value) const
 {
-  const smx_actor_t issuer = MC_smx_simcall_get_issuer(req);
+  const smx_actor_t issuer = simcall_get_issuer(req);
   const char* color        = get_color(issuer->get_pid() - 1);
 
   if (req->inspector_ != nullptr)
@@ -888,7 +926,7 @@ std::string Api::request_get_dot_output(smx_simcall_t req, int value) const
 
 const char* Api::simcall_get_name(simgrid::simix::Simcall kind) const
 {
-  return SIMIX_simcall_name(kind);
+  return simcall_names[static_cast<int>(kind)];
 }
 
 #if HAVE_SMPI