Merge pull request #290 from kovin/master

[simgrid.git] / src / s4u / s4u_Mailbox.cpp

diff --git a/src/s4u/s4u_Mailbox.cpp b/src/s4u/s4u_Mailbox.cpp
index a810de4..8156900 100644 (file)
--- a/src/s4u/s4u_Mailbox.cpp
+++ b/src/s4u/s4u_Mailbox.cpp
@@ -43,6 +43,18 @@ bool Mailbox::listen()
   return not this->empty() || (pimpl_->permanent_receiver_ && not pimpl_->done_comm_queue_.empty());
 }
 
+bool Mailbox::ready()
+{
+  bool comm_ready = false;
+  if (not pimpl_->comm_queue_.empty()) {
+    comm_ready = pimpl_->comm_queue_.front()->state_ == SIMIX_DONE;
+    
+  } else if (pimpl_->permanent_receiver_ && not pimpl_->done_comm_queue_.empty()) {
+    comm_ready = pimpl_->done_comm_queue_.front()->state_ == SIMIX_DONE;
+  }
+  return comm_ready;
+}
+
 smx_activity_t Mailbox::front()
 {
   return pimpl_->comm_queue_.empty() ? nullptr : pimpl_->comm_queue_.front();
@@ -140,13 +152,13 @@ void* Mailbox::get(double timeout)
 } // namespace simgrid
 
 /* **************************** Public C interface *************************** */
-/** \brief Set the mailbox to receive in asynchronous mode
+/** @brief Set the mailbox to receive in asynchronous mode
  *
  * All messages sent to this mailbox will be transferred to the receiver without waiting for the receive call.
  * The receive call will still be necessary to use the received data.
  * If there is a need to receive some messages asynchronously, and some not, two different mailboxes should be used.
  *
- * \param alias The name of the mailbox
+ * @param alias The name of the mailbox
  */
 void sg_mailbox_set_receiver(const char* alias)
 {
@@ -154,10 +166,10 @@ void sg_mailbox_set_receiver(const char* alias)
   XBT_VERB("%s mailbox set to receive eagerly for myself\n", alias);
 }
 
-/** \brief Check if there is a communication going on in a mailbox.
+/** @brief Check if there is a communication going on in a mailbox.
  *
- * \param alias the name of the mailbox to be considered
- * \return Returns 1 if there is a communication, 0 otherwise
+ * @param alias the name of the mailbox to be considered
+ * @return Returns 1 if there is a communication, 0 otherwise
  */
 int sg_mailbox_listen(const char* alias)
 {