Merge branch 'master' of https://framagit.org/simgrid/simgrid

[simgrid.git] / src / kernel / activity / MailboxImpl.cpp

diff --git a/src/kernel/activity/MailboxImpl.cpp b/src/kernel/activity/MailboxImpl.cpp
index a2620a33d9ba12c4e9eb733f9b1aacfe9ec5695c..7bbb8152ce39e674761fac68982eee1c87ddeb34 100644 (file)
--- a/src/kernel/activity/MailboxImpl.cpp
+++ b/src/kernel/activity/MailboxImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2023. 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. */
@@ -14,15 +14,17 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_mailbox, kernel, "Mailbox implementation");
 /*                           Rendez-Vous Points                               */
 /******************************************************************************/
 
-namespace simgrid {
-namespace kernel {
-namespace activity {
+namespace simgrid::kernel::activity {
 
 unsigned MailboxImpl::next_id_ = 0;
 
 MailboxImpl::~MailboxImpl()
 {
-  clear();
+  try {
+    clear(false);
+  } catch (const std::bad_alloc& ba) {
+    XBT_ERROR("MailboxImpl::clear() failure: %s", ba.what());
+  }
   set_receiver(nullptr);
 }
 
@@ -69,23 +71,28 @@ void MailboxImpl::remove(const CommImplPtr& comm)
 
 /** @brief Removes all communication activities from a mailbox
  */
-void MailboxImpl::clear()
+void MailboxImpl::clear( bool do_post )
 {
+  // CommImpl::cancel() will remove the comm from the mailbox..
   for (auto comm : done_comm_queue_) {
     comm->cancel();
-    comm->set_state(State::DST_HOST_FAILURE);
+    comm->set_state(State::FAILED);
+    if(do_post)
+      comm->post();
   }
   done_comm_queue_.clear();
 
-  // CommImpl::cancel() will remove the comm from the mailbox..
   while (not comm_queue_.empty()) {
     auto comm = comm_queue_.back();
     if (comm->get_state() == State::WAITING && not comm->is_detached()) {
       comm->cancel();
-      comm->set_state(State::DST_HOST_FAILURE);
+      comm->set_state(State::FAILED);
+      if(do_post)
+        comm->post();
     } else
       comm_queue_.pop_back();
   }
+  xbt_assert(comm_queue_.empty() && done_comm_queue_.empty());
 }
 
 CommImplPtr MailboxImpl::iprobe(int type, const std::function<bool(void*, void*, CommImpl*)>& match_fun, void* data)
@@ -149,6 +156,4 @@ CommImplPtr MailboxImpl::find_matching_comm(CommImplType type,
     comm_queue.erase(iter);
   return comm_cpy;
 }
-} // namespace activity
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::activity