Add one more state to assert.

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

diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp
index ea08cc5..14501e9 100644 (file)
--- a/src/s4u/s4u_Comm.cpp
+++ b/src/s4u/s4u_Comm.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2020. 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. */
@@ -10,6 +10,8 @@
 #include "simgrid/s4u/Comm.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
 
+#include <simgrid/comm.h>
+
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_comm, s4u_activity, "S4U asynchronous communications");
 
 namespace simgrid {
@@ -36,7 +38,10 @@ int Comm::wait_any_for(const std::vector<CommPtr>* comms, double timeout)
   std::unique_ptr<kernel::activity::CommImpl* []> rcomms(new kernel::activity::CommImpl*[comms->size()]);
   std::transform(begin(*comms), end(*comms), rcomms.get(),
                  [](const CommPtr& comm) { return static_cast<kernel::activity::CommImpl*>(comm->pimpl_.get()); });
-  return simcall_comm_waitany(rcomms.get(), comms->size(), timeout);
+  int changed_pos = simcall_comm_waitany(rcomms.get(), comms->size(), timeout);
+  if (changed_pos != -1)
+    comms->at(changed_pos)->release_dependencies();
+  return changed_pos;
 }
 
 void Comm::wait_all(const std::vector<CommPtr>* comms)
@@ -82,6 +87,7 @@ CommPtr Comm::set_src_data(void* buff, size_t size)
   src_buff_size_ = size;
   return this;
 }
+
 CommPtr Comm::set_dst_data(void** buff)
 {
   xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
@@ -91,7 +97,7 @@ CommPtr Comm::set_dst_data(void** buff)
   return this;
 }
 
-size_t Comm::get_dst_data_size()
+size_t Comm::get_dst_data_size() const
 {
   xbt_assert(state_ == State::FINISHED, "You cannot use %s before your communication terminated", __FUNCTION__);
   return dst_buff_size_;
@@ -116,8 +122,8 @@ CommPtr Comm::set_tracing_category(const std::string& category)
 
 Comm* Comm::start()
 {
-  xbt_assert(get_state() == State::INITED, "You cannot use %s() once your communication started (not implemented)",
-             __FUNCTION__);
+  xbt_assert(get_state() == State::INITED || get_state() == State::STARTING,
+             "You cannot use %s() once your communication started (not implemented)", __FUNCTION__);
 
   if (src_buff_ != nullptr) { // Sender side
     on_sender_start(*Actor::self());
@@ -154,7 +160,8 @@ Comm* Comm::wait_for(double timeout)
     case State::FINISHED:
       break;
 
-    case State::INITED: // It's not started yet. Do it in one simcall
+    case State::INITED:
+    case State::STARTING: // It's not started yet. Do it in one simcall
       if (src_buff_ != nullptr) {
         on_sender_start(*Actor::self());
         simcall_comm_send(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_,
@@ -166,12 +173,14 @@ Comm* Comm::wait_for(double timeout)
                           get_user_data(), timeout, rate_);
       }
       state_ = State::FINISHED;
+      this->release_dependencies();
       break;
 
     case State::STARTED:
-      simcall_comm_wait(pimpl_, timeout);
+      simcall_comm_wait(get_impl(), timeout);
       on_completion(*Actor::self());
       state_ = State::FINISHED;
+      this->release_dependencies();
       break;
 
     case State::CANCELED:
@@ -182,12 +191,16 @@ Comm* Comm::wait_for(double timeout)
   }
   return this;
 }
+
 int Comm::test_any(const std::vector<CommPtr>* comms)
 {
   std::unique_ptr<kernel::activity::CommImpl* []> rcomms(new kernel::activity::CommImpl*[comms->size()]);
   std::transform(begin(*comms), end(*comms), rcomms.get(),
                  [](const CommPtr& comm) { return static_cast<kernel::activity::CommImpl*>(comm->pimpl_.get()); });
-  return simcall_comm_testany(rcomms.get(), comms->size());
+  int changed_pos = simcall_comm_testany(rcomms.get(), comms->size());
+  if (changed_pos != -1)
+    comms->at(changed_pos)->release_dependencies();
+  return changed_pos;
 }
 
 Comm* Comm::detach()
@@ -196,7 +209,8 @@ Comm* Comm::detach()
              __FUNCTION__);
   xbt_assert(src_buff_ != nullptr && src_buff_size_ != 0, "You can only detach sends, not recvs");
   detached_ = true;
-  return start();
+  vetoable_start();
+  return this;
 }
 
 Comm* Comm::cancel()
@@ -211,30 +225,48 @@ Comm* Comm::cancel()
 
 bool Comm::test()
 {
-  xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::FINISHED);
+  xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::STARTING ||
+             state_ == State::FINISHED);
 
   if (state_ == State::FINISHED)
     return true;
 
-  if (state_ == State::INITED)
-    this->start();
+  if (state_ == State::INITED || state_ == State::STARTING)
+    this->vetoable_start();
 
-  if (simcall_comm_test(pimpl_)) {
+  if (simcall_comm_test(get_impl())) {
     state_ = State::FINISHED;
+    this->release_dependencies();
     return true;
   }
   return false;
 }
 
-Mailbox* Comm::get_mailbox()
+Mailbox* Comm::get_mailbox() const
 {
   return mailbox_;
 }
 
-Actor* Comm::get_sender()
+Actor* Comm::get_sender() const
 {
   return sender_ ? sender_->ciface() : nullptr;
 }
 
 } // namespace s4u
 } // namespace simgrid
+/* **************************** Public C interface *************************** */
+int sg_comm_wait_any(sg_comm_t* comms, size_t count)
+{
+  return sg_comm_wait_any_for(comms, count, -1);
+}
+int sg_comm_wait_any_for(sg_comm_t* comms, size_t count, double timeout)
+{
+  std::vector<simgrid::s4u::CommPtr> s4u_comms;
+  for (unsigned int i = 0; i < count; i++) {
+    s4u_comms.emplace_back(comms[i]);
+  }
+  int pos = simgrid::s4u::Comm::wait_any_for(&s4u_comms, timeout);
+  if (pos != -1)
+    s4u_comms[pos]->unref();
+  return pos;
+}