Automatic refcounting on the src and dst actors of a comm

[simgrid.git] / src / kernel / context / Context.cpp

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index 359ddf6..5ed694f 100644 (file)
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -6,6 +6,7 @@
 #include "mc/mc.h"
 
 #include "simgrid/s4u/Host.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
 #include "src/kernel/context/Context.hpp"
 #include "src/simix/smx_private.hpp"
 #include "src/surf/surf_interface.hpp"
@@ -54,13 +55,13 @@ void Context::declare_context(std::size_t size)
 #endif
 }
 
-Context* ContextFactory::attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process)
+Context* ContextFactory::attach(void_pfn_smxprocess_t, smx_actor_t)
 {
   xbt_die("Cannot attach with this ContextFactory.\n"
     "Try using --cfg=contexts/factory:thread instead.\n");
 }
 
-Context* ContextFactory::create_maestro(std::function<void()> code, smx_actor_t process)
+Context* ContextFactory::create_maestro(std::function<void()>, smx_actor_t)
 {
   xbt_die("Cannot create_maestro with this ContextFactory.\n"
     "Try using --cfg=contexts/factory:thread instead.\n");
@@ -91,28 +92,66 @@ void Context::stop()
     watched_hosts.insert(actor_->host_->get_cname());
   }
 
+  actor_->finished_ = true;
+  SIMIX_process_on_exit_runall(actor_);
+
+  /* cancel non-blocking activities */
+  while (not actor_->comms.empty()) {
+    smx_activity_t synchro = actor_->comms.front();
+    actor_->comms.pop_front();
+    simgrid::kernel::activity::CommImplPtr comm =
+        boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro);
+
+    /* make sure no one will finish the comm after this process is destroyed,
+     * because src_proc or dst_proc would be an invalid pointer */
+
+    if (comm->src_proc == actor_) {
+      XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", comm.get(),
+                comm->detached, (int)comm->state_, comm->src_proc.get(), comm->dst_proc.get());
+      comm->src_proc = nullptr;
+
+    } else if (comm->dst_proc == actor_) {
+      XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", comm.get(), (int)comm->state_,
+                comm->src_proc.get(), comm->dst_proc.get());
+      comm->dst_proc = nullptr;
+
+      if (comm->detached && comm->src_proc != nullptr) {
+        /* the comm will be freed right now, remove it from the sender */
+        comm->src_proc->comms.remove(comm);
+      }
+    } else {
+      xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro.get());
+    }
+    comm->cancel();
+  }
+
+  XBT_DEBUG("%s@%s(%ld) should not run anymore", actor_->get_cname(), actor_->iface()->get_host()->get_cname(),
+            actor_->pid_);
+
   if (this->cleanup_func_)
     this->cleanup_func_(this->actor_);
 
-  this->iwannadie = false; // don't let the yield call ourself -- Context::stop()
+  this->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), because that's me
   simgrid::simix::simcall([this] { SIMIX_process_cleanup(this->actor_); });
   this->iwannadie = true;
 }
 
 AttachContext::~AttachContext() = default;
 
-void throw_stoprequest()
+StopRequest::~StopRequest() = default;
+
+void StopRequest::do_throw()
 {
-  throw Context::StopRequest();
+  throw StopRequest();
 }
 
-bool try_n_catch_stoprequest(std::function<void(void)> try_block)
+bool StopRequest::try_n_catch(std::function<void(void)> try_block)
 {
   bool res;
   try {
     try_block();
     res = true;
-  } catch (Context::StopRequest const&) {
+  } catch (StopRequest const&) {
     XBT_DEBUG("Caught a StopRequest");
     res = false;
   }