X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6f2b38437e4beb5f36b194f30d4cafef75b74ed1..9f62e12607e183452816941da3e99bb5efda40d0:/src/kernel/context/Context.cpp

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index 359ddf6357..9d66f8c649 100644
--- 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,56 @@ void Context::stop()
     watched_hosts.insert(actor_->host_->get_cname());
   }
 
+  // Execute the termination callbacks
+  smx_process_exit_status_t exit_status = (actor_->context_->iwannadie) ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS;
+  while (not actor_->on_exit.empty()) {
+    s_smx_process_exit_fun_t exit_fun = actor_->on_exit.back();
+    actor_->on_exit.pop_back();
+    (exit_fun.fun)(exit_status, exit_fun.arg);
+  }
+
+  /* cancel non-blocking activities */
+  for (auto activity : actor_->comms)
+    boost::static_pointer_cast<activity::CommImpl>(activity)->cancel();
+  actor_->comms.clear();
+
+  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()
-  simgrid::simix::simcall([this] { SIMIX_process_cleanup(this->actor_); });
+  this->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), because that's me
+  simgrid::simix::simcall([this] {
+    simgrid::s4u::Actor::on_destruction(actor_->iface());
+
+    /* Unregister from the kill timer if any */
+    if (actor_->kill_timer != nullptr) {
+      SIMIX_timer_remove(actor_->kill_timer);
+      actor_->kill_timer = nullptr;
+    }
+
+    SIMIX_process_cleanup(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;
   }