X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40e0bf5686dc6da940c2dfe33c2e8b4824fefb8f..583a10d8a63c6c037d2116f15dbbd3c2b035806e:/src/kernel/activity/MailboxImpl.cpp

diff --git a/src/kernel/activity/MailboxImpl.cpp b/src/kernel/activity/MailboxImpl.cpp
index f519fa224d..ad182f233a 100644
--- a/src/kernel/activity/MailboxImpl.cpp
+++ b/src/kernel/activity/MailboxImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -25,7 +25,7 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 /** @brief Returns the mailbox of that name, or nullptr */
-MailboxImpl* MailboxImpl::by_name_or_null(std::string name)
+MailboxImpl* MailboxImpl::by_name_or_null(const std::string& name)
 {
   auto mbox = mailboxes->find(name);
   if (mbox != mailboxes->end())
@@ -33,8 +33,9 @@ MailboxImpl* MailboxImpl::by_name_or_null(std::string name)
   else
     return nullptr;
 }
+
 /** @brief Returns the mailbox of that name, newly created on need */
-MailboxImpl* MailboxImpl::by_name_or_create(std::string name)
+MailboxImpl* MailboxImpl::by_name_or_create(const std::string& name)
 {
   /* two processes may have pushed the same mbox_create simcall at the same time */
   auto m = mailboxes->find(name);
@@ -47,7 +48,7 @@ MailboxImpl* MailboxImpl::by_name_or_create(std::string name)
     return m->second;
 }
 /** @brief set the receiver of the mailbox to allow eager sends
- *  \param actor The receiving dude
+ *  @param actor The receiving dude
  */
 void MailboxImpl::set_receiver(s4u::ActorPtr actor)
 {
@@ -59,20 +60,17 @@ void MailboxImpl::set_receiver(s4u::ActorPtr actor)
 /** @brief Pushes a communication activity into a mailbox
  *  @param comm What to add
  */
-void MailboxImpl::push(activity::CommImplPtr comm)
+void MailboxImpl::push(CommImplPtr comm)
 {
   comm->mbox = this;
   this->comm_queue_.push_back(std::move(comm));
 }
 
 /** @brief Removes a communication activity from a mailbox
- *  @param activity What to remove
+ *  @param comm What to remove
  */
-void MailboxImpl::remove(smx_activity_t activity)
+void MailboxImpl::remove(const CommImplPtr& comm)
 {
-  simgrid::kernel::activity::CommImplPtr comm =
-      boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(activity);
-
   xbt_assert(comm->mbox == this, "Comm %p is in mailbox %s, not mailbox %s", comm.get(),
              (comm->mbox ? comm->mbox->get_cname() : "(null)"), this->get_cname());
   comm->mbox = nullptr;
@@ -83,6 +81,76 @@ void MailboxImpl::remove(smx_activity_t activity)
     }
   xbt_die("Comm %p not found in mailbox %s", comm.get(), this->get_cname());
 }
+
+CommImplPtr MailboxImpl::iprobe(int type, int (*match_fun)(void*, void*, CommImpl*), void* data)
+{
+  XBT_DEBUG("iprobe from %p %p", this, &comm_queue_);
+
+  CommImplPtr this_comm;
+  CommImpl::Type smx_type;
+  if (type == 1) {
+    this_comm = CommImplPtr(new CommImpl(CommImpl::Type::SEND));
+    smx_type  = CommImpl::Type::RECEIVE;
+  } else {
+    this_comm = CommImplPtr(new CommImpl(CommImpl::Type::RECEIVE));
+    smx_type  = CommImpl::Type::SEND;
+  }
+  CommImplPtr other_comm = nullptr;
+  if (permanent_receiver_ != nullptr && not done_comm_queue_.empty()) {
+    XBT_DEBUG("first check in the permanent recv mailbox, to see if we already got something");
+    other_comm = find_matching_comm(smx_type, match_fun, data, this_comm, /*done*/ true, /*remove_matching*/ false);
+  }
+  if (not other_comm) {
+    XBT_DEBUG("check if we have more luck in the normal mailbox");
+    other_comm = find_matching_comm(smx_type, match_fun, data, this_comm, /*done*/ false, /*remove_matching*/ false);
+  }
+
+  return other_comm;
+}
+
+/**
+ *  @brief Checks if there is a communication activity queued in comm_queue_ matching our needs
+ *  @param type The type of communication we are looking for (comm_send, comm_recv)
+ *  @param match_fun the function to apply
+ *  @param this_user_data additional parameter to the match_fun
+ *  @param my_synchro what to compare against
+ *  @param remove_matching whether or not to clean the found object from the queue
+ *  @return The communication activity if found, nullptr otherwise
+ */
+CommImplPtr MailboxImpl::find_matching_comm(CommImpl::Type type, int (*match_fun)(void*, void*, CommImpl*),
+                                            void* this_user_data, const CommImplPtr& my_synchro, bool done,
+                                            bool remove_matching)
+{
+  void* other_user_data = nullptr;
+  auto& comm_queue      = done ? done_comm_queue_ : comm_queue_;
+
+  for (auto it = comm_queue.begin(); it != comm_queue.end(); it++) {
+    CommImplPtr& comm = *it;
+
+    if (comm->type == CommImpl::Type::SEND) {
+      other_user_data = comm->src_data_;
+    } else if (comm->type == CommImpl::Type::RECEIVE) {
+      other_user_data = comm->dst_data_;
+    }
+    if (comm->type == type && (match_fun == nullptr || match_fun(this_user_data, other_user_data, comm.get())) &&
+        (not comm->match_fun || comm->match_fun(other_user_data, this_user_data, my_synchro.get()))) {
+      XBT_DEBUG("Found a matching communication synchro %p", comm.get());
+#if SIMGRID_HAVE_MC
+      comm->mbox_cpy = comm->mbox;
+#endif
+      comm->mbox = nullptr;
+      CommImplPtr comm_cpy = comm;
+      if (remove_matching)
+        comm_queue.erase(it);
+      return comm_cpy;
+    }
+    XBT_DEBUG("Sorry, communication synchro %p does not match our needs:"
+              " its type is %d but we are looking for a comm of type %d (or maybe the filtering didn't match)",
+              comm.get(), (int)comm->type, (int)type);
+  }
+  XBT_DEBUG("No matching communication synchro found");
+  return nullptr;
+}
 }
 }
 }