From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Tue, 15 Jan 2019 20:19:44 +0000 (+0100)
Subject: cleanups around the actor terminaison
X-Git-Tag: v3_22~557
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/121b00bee831d631cfe3ccd1cf5df8301de47073?ds=sidebyside

cleanups around the actor terminaison
---

diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp
index c04ae5b84b..cdce4e0546 100644
--- a/src/kernel/context/Context.cpp
+++ b/src/kernel/context/Context.cpp
@@ -66,14 +66,11 @@ Context* ContextFactory::create_maestro(std::function<void()> code, smx_actor_t
 }
 
 Context::Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor)
-    : code_(std::move(code)), actor_(actor)
+    : code_(std::move(code)), cleanup_func_(cleanup_func), actor_(actor)
 {
-  /* If the user provided a function for the process then use it.
-     Otherwise, it is the context for maestro and we should set it as the
-     current context */
-  if (has_code())
-    this->cleanup_func_ = cleanup_func;
-  else
+  /* If no function was provided, this is the context for maestro
+   * and we should set it as the current context */
+  if (not has_code())
     set_current(this);
 }
 
diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index 73c1c7e9e9..06e64afc33 100644
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -369,9 +369,8 @@ smx_actor_t SIMIX_process_create(std::string name, simgrid::simix::ActorCode cod
   simix_global->process_to_run.push_back(process);
   intrusive_ptr_add_ref(process);
 
-  /* The onCreation() signal must be delayed until there, where the pid and everything is set */
-  simgrid::s4u::ActorPtr tmp = process->iface(); // Passing this directly to onCreation will lead to crashes
-  simgrid::s4u::Actor::on_creation(tmp);
+  /* The on_creation() signal must be delayed until there, where the pid and everything is set */
+  simgrid::s4u::Actor::on_creation(process->iface());
 
   return process;
 }