Fix ActivityImpl::wait_for to not cancel the activity on timeout.

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

diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp
index 23eaf0d..b0c22d8 100644 (file)
--- a/src/s4u/s4u_Comm.cpp
+++ b/src/s4u/s4u_Comm.cpp
@@ -19,6 +19,12 @@ namespace s4u {
 xbt::signal<void(Comm const&, bool is_sender)> Comm::on_start;
 xbt::signal<void(Comm const&)> Comm::on_completion;
 
+void Comm::complete(Activity::State state)
+{
+  Activity::complete(state);
+  on_completion(*this);
+}
+
 Comm::~Comm()
 {
   if (state_ == State::STARTED && not detached_ &&
@@ -38,10 +44,8 @@ int Comm::wait_any_for(const std::vector<CommPtr>* comms, double timeout)
   std::transform(begin(*comms), end(*comms), begin(rcomms),
                  [](const CommPtr& comm) { return static_cast<kernel::activity::CommImpl*>(comm->pimpl_.get()); });
   int changed_pos = simcall_comm_waitany(rcomms.data(), rcomms.size(), timeout);
-  if (changed_pos != -1) {
-    on_completion(*(comms->at(changed_pos)));
-    comms->at(changed_pos)->release_dependencies();
-  }
+  if (changed_pos != -1)
+    comms->at(changed_pos)->complete(State::FINISHED);
   return changed_pos;
 }
 
@@ -178,12 +182,6 @@ Comm* Comm::start()
   return this;
 }
 
-/** @brief Block the calling actor until the communication is finished */
-Comm* Comm::wait()
-{
-  return this->wait_for(-1);
-}
-
 /** @brief Block the calling actor until the communication is finished, or until timeout
  *
  * On timeout, an exception is thrown and the communication is invalidated.
@@ -210,14 +208,10 @@ Comm* Comm::wait_for(double timeout)
         simcall_comm_recv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_, copy_data_function_,
                           get_user_data(), timeout, rate_);
       }
-      state_ = State::FINISHED;
-      this->release_dependencies();
       break;
 
     case State::STARTED:
       simcall_comm_wait(get_impl(), timeout);
-      state_ = State::FINISHED;
-      this->release_dependencies();
       break;
 
     case State::CANCELED:
@@ -226,7 +220,7 @@ Comm* Comm::wait_for(double timeout)
     default:
       THROW_IMPOSSIBLE;
   }
-  on_completion(*this);
+  complete(State::FINISHED);
   return this;
 }
 
@@ -237,7 +231,7 @@ int Comm::test_any(const std::vector<CommPtr>* comms)
                  [](const CommPtr& comm) { return static_cast<kernel::activity::CommImpl*>(comm->pimpl_.get()); });
   int changed_pos = simcall_comm_testany(rcomms.data(), rcomms.size());
   if (changed_pos != -1)
-    comms->at(changed_pos)->release_dependencies();
+    comms->at(changed_pos)->complete(State::FINISHED);
   return changed_pos;
 }
 
@@ -251,30 +245,19 @@ Comm* Comm::detach()
   return this;
 }
 
-Comm* Comm::cancel()
-{
-  kernel::actor::simcall([this] {
-    if (pimpl_)
-      boost::static_pointer_cast<kernel::activity::CommImpl>(pimpl_)->cancel();
-  });
-  state_ = State::CANCELED;
-  return this;
-}
-
-bool Comm::test()
+bool Comm::test() // TODO: merge with Activity::test, once modernized
 {
   xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::STARTING ||
-             state_ == State::FINISHED);
+             state_ == State::CANCELED || state_ == State::FINISHED);
 
-  if (state_ == State::FINISHED)
+  if (state_ == State::CANCELED || state_ == State::FINISHED)
     return true;
 
   if (state_ == State::INITED || state_ == State::STARTING)
     this->vetoable_start();
 
   if (simcall_comm_test(get_impl())) {
-    state_ = State::FINISHED;
-    this->release_dependencies();
+    complete(State::FINISHED);
     return true;
   }
   return false;