X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/02643189e2cba3bd1101490285ac5a6f18487e37..4d02714ee138a3bd9b02e0064b7a2aa26407e9e8:/src/kernel/context/Context.cpp

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index c2ea68ac9f..dedbf2c147 100644
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -13,20 +13,6 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
-/**
- * @brief creates a new context for a user level process
- * @param code a main function
- * @param cleanup_func the function to call when the context stops
- * @param simix_process
- */
-smx_context_t SIMIX_context_new(
-  std::function<void()> code,
-  void_pfn_smxprocess_t cleanup_func,
-  smx_actor_t simix_process)
-{
-  return simix_global->context_factory->create_context(
-    std::move(code), cleanup_func, simix_process);
-}
 
 namespace simgrid {
 namespace kernel {
@@ -55,7 +41,7 @@ void Context::declare_context(std::size_t size)
 #endif
 }
 
-Context* ContextFactory::attach(void_pfn_smxprocess_t, smx_actor_t)
+Context* ContextFactory::attach(smx_actor_t)
 {
   xbt_die("Cannot attach with this ContextFactory.\n"
     "Try using --cfg=contexts/factory:thread instead.\n");
@@ -67,8 +53,7 @@ Context* ContextFactory::create_maestro(std::function<void()>, smx_actor_t)
     "Try using --cfg=contexts/factory:thread instead.\n");
 }
 
-Context::Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor)
-    : code_(std::move(code)), cleanup_func_(cleanup_func), actor_(actor)
+Context::Context(std::function<void()> code, smx_actor_t actor) : code_(std::move(code)), actor_(actor)
 {
   /* If no function was provided, this is the context for maestro
    * and we should set it as the current context */
@@ -86,77 +71,47 @@ void Context::stop()
 {
   actor_->finished_ = true;
 
-  if (actor_->auto_restart_ && actor_->host_->is_off()) {
-    XBT_DEBUG("Insert host %s to watched_hosts because it's off and %s needs to restart", actor_->host_->get_cname(),
-              actor_->get_cname());
-    watched_hosts.insert(actor_->host_->get_cname());
+  if (actor_->has_to_auto_restart() && not actor_->get_host()->is_on()) {
+    XBT_DEBUG("Insert host %s to watched_hosts because it's off and %s needs to restart",
+              actor_->get_host()->get_cname(), actor_->get_cname());
+    watched_hosts.insert(actor_->get_host()->get_name());
   }
 
-  actor_->finished_ = true;
-  SIMIX_process_on_exit_runall(actor_);
+  // 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 */
-  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, comm->dst_proc);
-      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, comm->dst_proc);
-      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();
-  }
+  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_);
+            actor_->get_pid());
 
-  if (this->cleanup_func_)
-    this->cleanup_func_(this->actor_);
+  this->actor_->cleanup();
 
   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_); });
+  simgrid::simix::simcall([this] {
+    simgrid::s4u::Actor::on_destruction(actor_->iface());
+
+    /* Unregister from the kill timer if any */
+    if (actor_->kill_timer != nullptr) {
+      actor_->kill_timer->remove();
+      actor_->kill_timer = nullptr;
+    }
+
+    actor_->cleanup();
+  });
   this->iwannadie = true;
 }
 
 AttachContext::~AttachContext() = default;
 
-StopRequest::~StopRequest() = default;
-
-void StopRequest::do_throw()
-{
-  throw StopRequest();
-}
-
-bool StopRequest::try_n_catch(std::function<void(void)> try_block)
-{
-  bool res;
-  try {
-    try_block();
-    res = true;
-  } catch (StopRequest const&) {
-    XBT_DEBUG("Caught a StopRequest");
-    res = false;
-  }
-  return res;
-}
 }}}
 
 /** @brief Executes all the processes to run (in parallel if possible). */