Make it possible to detach direct communications

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

diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp
index 55a79e5..8548847 100644 (file)
--- a/src/s4u/s4u_Comm.cpp
+++ b/src/s4u/s4u_Comm.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2021. 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. */
@@ -95,10 +95,13 @@ CommPtr Comm::set_dst_data(void** buff)
   dst_buff_ = buff;
   return this;
 }
+void* Comm::get_dst_data()
+{
+  return dst_buff_;
+}
 
 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_;
 }
 CommPtr Comm::set_dst_data(void** buff, size_t size)
@@ -112,12 +115,36 @@ CommPtr Comm::set_dst_data(void** buff, size_t size)
   return this;
 }
 
+CommPtr Comm::sendto_init(Host* from, Host* to)
+{
+  CommPtr res(new Comm());
+  res->from_ = from;
+  res->to_   = to;
+
+  return res;
+}
+CommPtr Comm::sendto_async(Host* from, Host* to, double simulated_size_in_bytes)
+{
+  auto res = Comm::sendto_init(from, to);
+  res->set_remaining(simulated_size_in_bytes)->start();
+  return res;
+}
+
 Comm* Comm::start()
 {
   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
+  if (from_ != nullptr || to_ != nullptr) {
+    xbt_assert(from_ != nullptr && to_ != nullptr, "When either from_ or to_ is specified, both must be.");
+    xbt_assert(src_buff_ == nullptr && dst_buff_ == nullptr,
+               "Direct host-to-host communications cannot carry any data.");
+    pimpl_ = kernel::actor::simcall([this] {
+      auto res = new kernel::activity::CommImpl(this->from_, this->to_, this->get_remaining());
+      res->start();
+      return res;
+    });
+
+  } else if (src_buff_ != nullptr) { // Sender side
     on_start(*this, true /* is_sender*/);
     pimpl_ = simcall_comm_isend(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_,
                                 clean_fun_, copy_data_function_, get_user_data(), detached_);
@@ -157,8 +184,10 @@ Comm* Comm::wait_for(double timeout)
       break;
 
     case State::INITED:
-    case State::STARTING: // It's not started yet. Do it in one simcall
-      if (src_buff_ != nullptr) {
+    case State::STARTING: // It's not started yet. Do it in one simcall if it's a regular communication
+      if (from_ != nullptr || to_ != nullptr) {
+        return start()->wait_for(timeout); // In the case of host2host comm, do it in two simcalls
+      } else if (src_buff_ != nullptr) {
         on_start(*this, true /*is_sender*/);
         simcall_comm_send(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_,
                           copy_data_function_, get_user_data(), timeout);
@@ -201,9 +230,9 @@ int Comm::test_any(const std::vector<CommPtr>* comms)
 
 Comm* Comm::detach()
 {
-  xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
-             __FUNCTION__);
-  xbt_assert(src_buff_ != nullptr && src_buff_size_ != 0, "You can only detach sends, not recvs");
+  xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication is %s (not implemented)",
+             __FUNCTION__, get_state_str());
+  xbt_assert(dst_buff_ == nullptr && dst_buff_size_ == 0, "You can only detach sends, not recvs");
   detached_ = true;
   vetoable_start();
   return this;