Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Make ActorImpl::context_ a std::unique_ptr.
[simgrid.git] / src / simix / ActorImpl.cpp
index 4b16464..984e0ec 100644 (file)
@@ -1,10 +1,12 @@
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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. */
 
 #include "mc/mc.h"
 #include "simgrid/Exception.hpp"
+#include "simgrid/s4u/Actor.hpp"
+#include "simgrid/s4u/Exec.hpp"
 #include "smx_private.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/kernel/activity/ExecImpl.hpp"
@@ -13,9 +15,6 @@
 #include "src/kernel/activity/SynchroRaw.hpp"
 #include "src/mc/mc_replay.hpp"
 #include "src/mc/remote/Client.hpp"
-#include "src/simix/smx_host_private.hpp"
-#include "src/simix/smx_io_private.hpp"
-#include "src/simix/smx_synchro_private.hpp"
 #include "src/surf/HostImpl.hpp"
 #include "src/surf/cpu_interface.hpp"
 
@@ -23,7 +22,7 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)");
 
-unsigned long simix_process_maxpid = 0;
+static unsigned long simix_process_maxpid = 0;
 
 /**
  * @brief Returns the current agent.
@@ -36,115 +35,215 @@ smx_actor_t SIMIX_process_self()
 {
   smx_context_t self_context = simgrid::kernel::context::Context::self();
 
-  return (self_context != nullptr) ? self_context->process() : nullptr;
+  return (self_context != nullptr) ? self_context->get_actor() : nullptr;
 }
 
 /**
  * @brief Returns whether a process has pending asynchronous communications.
  * @return true if there are asynchronous communications in this process
+ * @deprecated
  */
 int SIMIX_process_has_pending_comms(smx_actor_t process) {
 
   return process->comms.size() > 0;
 }
 
-/**
- * @brief Moves a process to the list of processes to destroy.
+namespace simgrid {
+namespace kernel {
+namespace actor {
+
+ActorImpl::ActorImpl(simgrid::xbt::string name, s4u::Host* host) : host_(host), name_(name), piface_(this)
+{
+  pid_ = simix_process_maxpid++;
+  simcall.issuer = this;
+}
+
+ActorImpl::~ActorImpl() = default;
+
+/* Become an actor in the simulation
+ *
+ * Currently this can only be called by the main thread (once) and only work with some thread factories
+ * (currently ThreadContextFactory).
+ *
+ * In the future, it might be extended in order to attach other threads created by a third party library.
  */
-void SIMIX_process_cleanup(smx_actor_t process)
+
+ActorImplPtr ActorImpl::attach(std::string name, void* data, s4u::Host* host,
+                               std::unordered_map<std::string, std::string>* properties)
 {
-  XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p", process->get_cname(), process,
-            process->waiting_synchro.get());
+  // This is mostly a copy/paste from create(), it'd be nice to share some code between those two functions.
 
-  process->finished_ = true;
-  SIMIX_process_on_exit_runall(process);
+  XBT_DEBUG("Attach process %s on host '%s'", name.c_str(), host->get_cname());
 
-  /* Unregister from the kill timer if any */
-  if (process->kill_timer != nullptr) {
-    SIMIX_timer_remove(process->kill_timer);
-    process->kill_timer = nullptr;
+  if (not host->is_on()) {
+    XBT_WARN("Cannot launch process '%s' on failed host '%s'", name.c_str(), host->get_cname());
+    std::rethrow_exception(
+        std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Cannot attach actor on failed host.")));
   }
 
-  simix_global->mutex.lock();
+  ActorImpl* actor = new ActorImpl(xbt::string(name), host);
+  /* Actor data */
+  actor->set_user_data(data);
+  actor->code = nullptr;
 
-  /* cancel non-blocking communications */
-  while (not process->comms.empty()) {
-    smx_activity_t synchro = process->comms.front();
-    process->comms.pop_front();
-    simgrid::kernel::activity::CommImplPtr comm =
-        boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro);
+  XBT_VERB("Create context %s", actor->get_cname());
+  xbt_assert(simix_global != nullptr, "simix is not initialized, please call MSG_init first");
+  actor->context_.reset(simix_global->context_factory->attach(actor));
 
-    /* make sure no one will finish the comm after this process is destroyed,
-     * because src_proc or dst_proc would be an invalid pointer */
+  /* Add properties */
+  if (properties != nullptr)
+    for (auto const& kv : *properties)
+      actor->set_property(kv.first, kv.second);
 
-    if (comm->src_proc == process) {
-      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;
+  /* Add the process to it's host process list */
+  host->pimpl_->process_list_.push_back(*actor);
 
-    } else if (comm->dst_proc == process) {
-      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;
+  /* Now insert it in the global process list and in the process to run list */
+  simix_global->process_list[actor->get_pid()] = actor;
+  XBT_DEBUG("Inserting [%p] %s(%s) in the to_run list", actor, actor->get_cname(), host->get_cname());
+  simix_global->actors_to_run.push_back(actor);
+  intrusive_ptr_add_ref(actor);
 
-      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();
-  }
+  auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(actor->context_.get());
+  xbt_assert(nullptr != context, "Not a suitable context");
+  context->attach_start();
 
-  XBT_DEBUG("%s@%s(%ld) should not run anymore", process->get_cname(), process->iface()->get_host()->get_cname(),
-            process->pid_);
-  simix_global->process_list.erase(process->pid_);
-  if (process->host_ && process->host_process_list_hook.is_linked())
-    simgrid::xbt::intrusive_erase(process->host_->pimpl_->process_list_, *process);
-  if (not process->smx_destroy_list_hook.is_linked()) {
+  /* The on_creation() signal must be delayed until there, where the pid and everything is set */
+  simgrid::s4u::ActorPtr tmp = actor->iface(); // Passing this directly to on_creation will lead to crashes
+  simgrid::s4u::Actor::on_creation(tmp);
+
+  return ActorImplPtr(actor);
+}
+/** @brief Detach an actor attached with `attach()`
+ *
+ *  This is called when the current actor has finished its job.
+ *  Used in the main thread, it waits for the simulation to finish before returning. When it returns, the other
+ *  simulated actors and the maestro are destroyed.
+ */
+void ActorImpl::detach()
+{
+  auto* context = dynamic_cast<context::AttachContext*>(context::Context::self());
+  if (context == nullptr)
+    xbt_die("Not a suitable context");
+
+  context->get_actor()->cleanup();
+  context->attach_stop();
+}
+
+void ActorImpl::cleanup()
+{
+  if (this == simix_global->maestro_process) /* Do not cleanup maestro */
+    return;
+
+  XBT_DEBUG("Cleanup actor %s (%p), waiting synchro %p", get_cname(), this, waiting_synchro.get());
+
+  simix_global->mutex.lock();
+
+  simix_global->process_list.erase(pid_);
+  if (host_ && host_process_list_hook.is_linked())
+    simgrid::xbt::intrusive_erase(host_->pimpl_->process_list_, *this);
+  if (not smx_destroy_list_hook.is_linked()) {
 #if SIMGRID_HAVE_MC
-    xbt_dynar_push_as(simix_global->dead_actors_vector, smx_actor_t, process);
+    xbt_dynar_push_as(simix_global->dead_actors_vector, smx_actor_t, this);
 #endif
-    simix_global->process_to_destroy.push_back(*process);
+    simix_global->actors_to_destroy.push_back(*this);
   }
-  process->context_->iwannadie = false;
+  context_->iwannadie = false;
 
   simix_global->mutex.unlock();
 }
 
-/**
- * Garbage collection
- *
- * Should be called some time to time to free the memory allocated for processes that have finished (or killed).
- */
-void SIMIX_process_empty_trash()
+void ActorImpl::exit()
 {
-  while (not simix_global->process_to_destroy.empty()) {
-    smx_actor_t process = &simix_global->process_to_destroy.front();
-    simix_global->process_to_destroy.pop_front();
-    XBT_DEBUG("Getting rid of %p",process);
-    intrusive_ptr_release(process);
+  context_->iwannadie = true;
+  blocked_            = false;
+  suspended_          = false;
+  exception_          = nullptr;
+
+  // Forcefully kill the actor if its host is turned off. Not a HostFailureException because you should not survive that
+  if (not host_->is_on())
+    this->throw_exception(std::make_exception_ptr(ForcefulKillException("host failed")));
+
+  /* destroy the blocking synchro if any */
+  if (waiting_synchro != nullptr) {
+
+    activity::ExecImplPtr exec   = boost::dynamic_pointer_cast<activity::ExecImpl>(waiting_synchro);
+    activity::CommImplPtr comm   = boost::dynamic_pointer_cast<activity::CommImpl>(waiting_synchro);
+    activity::SleepImplPtr sleep = boost::dynamic_pointer_cast<activity::SleepImpl>(waiting_synchro);
+    activity::RawImplPtr raw     = boost::dynamic_pointer_cast<activity::RawImpl>(waiting_synchro);
+    activity::IoImplPtr io       = boost::dynamic_pointer_cast<activity::IoImpl>(waiting_synchro);
+
+    if (exec != nullptr && exec->surf_action_) {
+      exec->cancel();
+      exec->surf_action_->unref();
+      exec->surf_action_ = nullptr;
+    } else if (comm != nullptr) {
+      comms.remove(waiting_synchro);
+      comm->cancel();
+      // Remove first occurrence of &actor->simcall:
+      auto i = boost::range::find(waiting_synchro->simcalls_, &simcall);
+      if (i != waiting_synchro->simcalls_.end())
+        waiting_synchro->simcalls_.remove(&simcall);
+    } else if (sleep != nullptr) {
+      if (sleep->surf_action_)
+        sleep->surf_action_->cancel();
+      sleep->post();
+    } else if (raw != nullptr) {
+      raw->finish();
+    } else if (io != nullptr) {
+      io->cancel();
+    } else {
+      simgrid::kernel::activity::ActivityImplPtr activity = waiting_synchro;
+      xbt_die("Activity %s is of unknown type %s", activity->get_cname(),
+              simgrid::xbt::demangle(typeid(activity).name()).get());
+    }
+
+    waiting_synchro = nullptr;
   }
-#if SIMGRID_HAVE_MC
-  xbt_dynar_reset(simix_global->dead_actors_vector);
-#endif
 }
 
-namespace simgrid {
+void ActorImpl::kill(ActorImpl* actor)
+{
+  if (actor->finished_) {
+    XBT_DEBUG("Ignoring request to kill actor %s@%s that is already dead", actor->get_cname(),
+              actor->host_->get_cname());
+    return;
+  }
 
-namespace kernel {
-namespace actor {
+  XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", get_cname(), host_ ? host_->get_cname() : "", actor->get_cname(),
+            actor->host_ ? actor->host_->get_cname() : "");
+
+  actor->exit();
 
-ActorImpl::ActorImpl(simgrid::xbt::string name, simgrid::s4u::Host* host) : name_(name), host_(host), piface_(this)
+  if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), actor) ==
+          end(simix_global->actors_to_run) &&
+      actor != this) {
+    XBT_DEBUG("Inserting %s in the to_run list", actor->get_cname());
+    simix_global->actors_to_run.push_back(actor);
+  }
+}
+
+void ActorImpl::kill_all()
 {
-  pid_ = simix_process_maxpid++;
-  simcall.issuer = this;
+  for (auto const& kv : simix_global->process_list)
+    if (kv.second != this)
+      this->kill(kv.second);
 }
 
-ActorImpl::~ActorImpl()
+void ActorImpl::set_kill_time(double kill_time)
 {
-  delete this->context_;
+  if (kill_time <= SIMIX_get_clock())
+    return;
+  XBT_DEBUG("Set kill time %f for actor %s@%s", kill_time, get_cname(), host_->get_cname());
+  kill_timer = simix::Timer::set(kill_time, [this] {
+    this->exit();
+    kill_timer = nullptr;
+  });
+}
+
+double ActorImpl::get_kill_time()
+{
+  return kill_timer ? kill_timer->get_date() : 0;
 }
 
 static void dying_daemon(int /*exit_status*/, void* data)
@@ -159,7 +258,45 @@ static void dying_daemon(int /*exit_status*/, void* data)
   vect->pop_back();
 }
 
-/** This process will be terminated automatically when the last non-daemon process finishes */
+void ActorImpl::yield()
+{
+  XBT_DEBUG("Yield actor '%s'", get_cname());
+
+  /* Go into sleep and return control to maestro */
+  context_->suspend();
+
+  /* Ok, maestro returned control to us */
+  XBT_DEBUG("Control returned to me: '%s'", get_cname());
+
+  if (context_->iwannadie) {
+
+    XBT_DEBUG("Actor %s@%s is dead", get_cname(), host_->get_cname());
+    // throw simgrid::kernel::context::ForcefulKillException(); Does not seem to properly kill the actor
+    context_->stop();
+    THROW_IMPOSSIBLE;
+  }
+
+  if (suspended_) {
+    XBT_DEBUG("Hey! I'm suspended.");
+
+    xbt_assert(exception_ == nullptr, "Gasp! This exception may be lost by subsequent calls.");
+    suspended_ = false;
+    suspend(this);
+  }
+
+  if (exception_ != nullptr) {
+    XBT_DEBUG("Wait, maestro left me an exception");
+    std::exception_ptr exception = std::move(exception_);
+    exception_                   = nullptr;
+    std::rethrow_exception(std::move(exception));
+  }
+
+  if (SMPI_switch_data_segment && not finished_) {
+    SMPI_switch_data_segment(iface());
+  }
+}
+
+/** This actor will be terminated automatically when the last non-daemon actor finishes */
 void ActorImpl::daemonize()
 {
   if (not daemon_) {
@@ -169,26 +306,26 @@ void ActorImpl::daemonize()
   }
 }
 
-simgrid::s4u::Actor* ActorImpl::restart()
+s4u::Actor* ActorImpl::restart()
 {
-  XBT_DEBUG("Restarting process %s on %s", get_cname(), host_->get_cname());
+  XBT_DEBUG("Restarting actor %s on %s", get_cname(), host_->get_cname());
 
-  // retrieve the arguments of the old process
-  simgrid::kernel::actor::ProcessArg arg = ProcessArg(host_, this);
+  // retrieve the arguments of the old actor
+  ProcessArg arg = ProcessArg(host_, this);
 
-  // kill the old process
-  SIMIX_process_kill(this, (this == simix_global->maestro_process) ? this : SIMIX_process_self());
+  // kill the old actor
+  (this == simix_global->maestro_process) ? this->exit() : SIMIX_process_self()->kill(this);
 
-  // start the new process
-  ActorImpl* actor =
-      SIMIX_process_create(arg.name, std::move(arg.code), arg.data, arg.host, arg.properties.get(), nullptr);
-  simcall_process_set_kill_time(actor, arg.kill_time);
+  // start the new actor
+  ActorImplPtr actor =
+      ActorImpl::create(arg.name, std::move(arg.code), arg.data, arg.host, arg.properties.get(), nullptr);
+  actor->set_kill_time(arg.kill_time);
   actor->set_auto_restart(arg.auto_restart);
 
   return actor->ciface();
 }
 
-smx_activity_t ActorImpl::suspend(ActorImpl* issuer)
+activity::ActivityImplPtr ActorImpl::suspend(ActorImpl* issuer)
 {
   if (suspended_) {
     XBT_DEBUG("Actor '%s' is already suspended", get_cname());
@@ -205,13 +342,13 @@ smx_activity_t ActorImpl::suspend(ActorImpl* issuer)
 
     return nullptr;
   } else {
-    return SIMIX_execution_start("suspend", "", 0.0, 1.0, 0.0, this->host_);
+    return activity::ExecImplPtr(new activity::ExecImpl("suspend", ""))->set_host(host_)->start(0.0, 1.0, 0.0);
   }
 }
 
 void ActorImpl::resume()
 {
-  XBT_IN("process = %p", this);
+  XBT_IN("actor = %p", this);
 
   if (context_->iwannadie) {
     XBT_VERB("Ignoring request to suspend an actor that is currently dying.");
@@ -229,24 +366,34 @@ void ActorImpl::resume()
   XBT_OUT();
 }
 
-smx_activity_t ActorImpl::sleep(double duration)
+activity::ActivityImplPtr ActorImpl::join(smx_actor_t actor, double timeout)
 {
-  if (host_->is_off())
-    throw_exception(std::make_exception_ptr(simgrid::HostFailureException(
-        XBT_THROW_POINT, std::string("Host ") + std::string(host_->get_cname()) + " failed, you cannot sleep there.")));
+  activity::ActivityImplPtr res = this->sleep(timeout);
+  intrusive_ptr_add_ref(res.get());
+  SIMIX_process_on_exit(actor,
+                        [](int, void* arg) {
+                          auto sleep = static_cast<simgrid::kernel::activity::SleepImpl*>(arg);
+                          if (sleep->surf_action_)
+                            sleep->surf_action_->finish(simgrid::kernel::resource::Action::State::FINISHED);
+                          intrusive_ptr_release(sleep);
+                        },
+                        res.get());
+  return res;
+}
 
-  simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl();
-  synchro->host                                 = host_;
-  synchro->surf_sleep                           = host_->pimpl_cpu->sleep(duration);
-  synchro->surf_sleep->set_data(synchro);
-  XBT_DEBUG("Create sleep synchronization %p", synchro);
+activity::ActivityImplPtr ActorImpl::sleep(double duration)
+{
+  if (not host_->is_on())
+    throw_exception(std::make_exception_ptr(simgrid::HostFailureException(
+        XBT_THROW_POINT, std::string("Host ") + host_->get_cname() + " failed, you cannot sleep there.")));
 
-  return synchro;
+  return simgrid::kernel::activity::SleepImplPtr(new simgrid::kernel::activity::SleepImpl("sleep", host_))
+      ->start(duration);
 }
 
 void ActorImpl::throw_exception(std::exception_ptr e)
 {
-  exception = e;
+  exception_ = e;
 
   if (suspended_)
     resume();
@@ -254,309 +401,140 @@ void ActorImpl::throw_exception(std::exception_ptr e)
   /* cancel the blocking synchro if any */
   if (waiting_synchro) {
 
-    simgrid::kernel::activity::ExecImplPtr exec =
-        boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(waiting_synchro);
-    if (exec != nullptr && exec->surf_action_)
-      exec->surf_action_->cancel();
+    activity::ExecImplPtr exec = boost::dynamic_pointer_cast<activity::ExecImpl>(waiting_synchro);
+    if (exec != nullptr)
+      exec->cancel();
 
-    simgrid::kernel::activity::CommImplPtr comm =
-        boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(waiting_synchro);
+    activity::CommImplPtr comm = boost::dynamic_pointer_cast<activity::CommImpl>(waiting_synchro);
     if (comm != nullptr) {
       comms.remove(comm);
       comm->cancel();
     }
 
-    simgrid::kernel::activity::SleepImplPtr sleep =
-        boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(waiting_synchro);
+    activity::SleepImplPtr sleep = boost::dynamic_pointer_cast<activity::SleepImpl>(waiting_synchro);
     if (sleep != nullptr) {
       SIMIX_process_sleep_destroy(waiting_synchro);
-      if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), this) ==
-              end(simix_global->process_to_run) &&
+      if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), this) ==
+              end(simix_global->actors_to_run) &&
           this != SIMIX_process_self()) {
-        XBT_DEBUG("Inserting %s in the to_run list", get_cname());
-        simix_global->process_to_run.push_back(this);
+        XBT_DEBUG("Inserting [%p] %s in the to_run list", this, get_cname());
+        simix_global->actors_to_run.push_back(this);
       }
     }
 
-    simgrid::kernel::activity::RawImplPtr raw =
-        boost::dynamic_pointer_cast<simgrid::kernel::activity::RawImpl>(waiting_synchro);
+    activity::RawImplPtr raw = boost::dynamic_pointer_cast<activity::RawImpl>(waiting_synchro);
     if (raw != nullptr) {
-      SIMIX_synchro_stop_waiting(this, &simcall);
+      raw->finish();
     }
 
-    simgrid::kernel::activity::IoImplPtr io =
-        boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(waiting_synchro);
+    activity::IoImplPtr io = boost::dynamic_pointer_cast<activity::IoImpl>(waiting_synchro);
     if (io != nullptr) {
-      delete io.get();
+      io->cancel();
     }
   }
   waiting_synchro = nullptr;
 }
 
-void create_maestro(simgrid::simix::ActorCode code)
+void ActorImpl::set_host(s4u::Host* dest)
 {
-  /* Create maestro process and initialize it */
-  smx_actor_t maestro = new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(""), /*host*/ nullptr);
-
-  if (not code) {
-    maestro->context_ = SIMIX_context_new(simgrid::simix::ActorCode(), nullptr, maestro);
-  } else {
-    if (not simix_global)
-      xbt_die("simix is not initialized, please call MSG_init first");
-    maestro->context_ = simix_global->context_factory->create_maestro(code, maestro);
-  }
-
-  maestro->simcall.issuer = maestro;
-  simix_global->maestro_process = maestro;
+  simgrid::xbt::intrusive_erase(host_->pimpl_->process_list_, *this);
+  host_ = dest;
+  dest->pimpl_->process_list_.push_back(*this);
 }
 
-} // namespace actor
-}
-}
-
-/** @brief Creates and runs the maestro process */
-void SIMIX_maestro_create(void (*code)(void*), void* data)
+ActorImplPtr ActorImpl::init(std::string name, s4u::Host* host)
 {
-  simgrid::kernel::actor::create_maestro(std::bind(code, data));
+  ActorImpl* actor = new ActorImpl(simgrid::xbt::string(name), host);
+  actor->set_ppid(this->pid_);
+
+  intrusive_ptr_add_ref(actor);
+  /* The on_creation() signal must be delayed until there, where the pid and everything is set */
+  s4u::Actor::on_creation(actor->iface());
+
+  return ActorImplPtr(actor);
 }
 
-/**
- * @brief Internal function to create a process.
- *
- * This function actually creates the process.
- * It may be called when a SIMCALL_PROCESS_CREATE simcall occurs,
- * or directly for SIMIX internal purposes. The sure thing is that it's called from maestro context.
- *
- * @return the process created
- */
-smx_actor_t SIMIX_process_create(std::string name, simgrid::simix::ActorCode code, void* data, simgrid::s4u::Host* host,
-                                 std::unordered_map<std::string, std::string>* properties, smx_actor_t parent_process)
+ActorImpl* ActorImpl::start(const simix::ActorCode& code)
 {
+  xbt_assert(code && host_ != nullptr, "Invalid parameters");
 
-  XBT_DEBUG("Start actor %s@'%s'", name.c_str(), host->get_cname());
-
-  if (host->is_off()) {
-    XBT_WARN("Cannot launch process '%s' on failed host '%s'", name.c_str(), host->get_cname());
-    return nullptr;
+  if (not host_->is_on()) {
+    XBT_WARN("Cannot launch actor '%s' on failed host '%s'", name_.c_str(), host_->get_cname());
+    intrusive_ptr_release(this);
+    std::rethrow_exception(
+        std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host.")));
   }
 
-  smx_actor_t process = new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(name), host);
-
-  xbt_assert(code && host != nullptr, "Invalid parameters");
-  /* Process data */
-  process->set_user_data(data);
-  process->code = code;
+  this->code = code;
+  XBT_VERB("Create context %s", get_cname());
+  context_.reset(simix_global->context_factory->create_context(simix::ActorCode(code), this));
 
-  if (parent_process != nullptr)
-    process->ppid_ = parent_process->pid_;
+  XBT_DEBUG("Start context '%s'", get_cname());
 
-  XBT_VERB("Create context %s", process->get_cname());
-  process->context_ = SIMIX_context_new(std::move(code), &SIMIX_process_cleanup, process);
+  /* Add the actor to its host's actor list */
+  host_->pimpl_->process_list_.push_back(*this);
+  simix_global->process_list[pid_] = this;
 
-  /* Add properties */
-  if (properties != nullptr)
-    for (auto const& kv : *properties)
-      process->set_property(kv.first, kv.second);
-
-  /* Add the process to its host's process list */
-  host->pimpl_->process_list_.push_back(*process);
-
-  XBT_DEBUG("Start context '%s'", process->get_cname());
-
-  /* Now insert it in the global process list and in the process to run list */
-  simix_global->process_list[process->pid_] = process;
-  XBT_DEBUG("Inserting %s(%s) in the to_run list", process->get_cname(), host->get_cname());
-  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);
+  /* Now insert it in the global actor list and in the actor to run list */
+  XBT_DEBUG("Inserting [%p] %s(%s) in the to_run list", this, get_cname(), host_->get_cname());
+  simix_global->actors_to_run.push_back(this);
 
-  return process;
+  return this;
 }
 
-smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname,
-                                 std::unordered_map<std::string, std::string>* properties, smx_actor_t parent_process)
+ActorImplPtr ActorImpl::create(std::string name, const simix::ActorCode& code, void* data, s4u::Host* host,
+                               std::unordered_map<std::string, std::string>* properties, ActorImpl* parent_actor)
 {
-  // This is mostly a copy/paste from SIMIX_process_new(),
-  // it'd be nice to share some code between those two functions.
-
-  sg_host_t host = sg_host_by_name(hostname);
-  XBT_DEBUG("Attach process %s on host '%s'", name, hostname);
+  XBT_DEBUG("Start actor %s@'%s'", name.c_str(), host->get_cname());
 
-  if (host->is_off()) {
-    XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, hostname);
-    return nullptr;
-  }
+  ActorImplPtr actor;
+  if (parent_actor != nullptr)
+    actor = parent_actor->init(simgrid::xbt::string(name), host);
+  else
+    actor = SIMIX_process_self()->init(simgrid::xbt::string(name), host);
 
-  smx_actor_t actor = new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(name), host);
-  /* Actor data */
+  /* actor data */
   actor->set_user_data(data);
-  actor->code = nullptr;
-
-  if (parent_process != nullptr)
-    actor->ppid_ = parent_process->pid_;
-
-  XBT_VERB("Create context %s", actor->get_cname());
-  xbt_assert(simix_global != nullptr, "simix is not initialized, please call MSG_init first");
-  actor->context_ = simix_global->context_factory->attach(&SIMIX_process_cleanup, actor);
 
   /* Add properties */
   if (properties != nullptr)
     for (auto const& kv : *properties)
       actor->set_property(kv.first, kv.second);
 
-  /* Add the process to it's host process list */
-  host->pimpl_->process_list_.push_back(*actor);
-
-  /* Now insert it in the global process list and in the process to run list */
-  simix_global->process_list[actor->pid_] = actor;
-  XBT_DEBUG("Inserting %s(%s) in the to_run list", actor->get_cname(), host->get_cname());
-  simix_global->process_to_run.push_back(actor);
-  intrusive_ptr_add_ref(actor);
-
-  auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(actor->context_);
-  xbt_assert(nullptr != context, "Not a suitable context");
-  context->attach_start();
-
-  /* The on_creation() signal must be delayed until there, where the pid and everything is set */
-  simgrid::s4u::ActorPtr tmp = actor->iface(); // Passing this directly to on_creation will lead to crashes
-  simgrid::s4u::Actor::on_creation(tmp);
+  actor->start(code);
 
   return actor;
 }
 
-void SIMIX_process_detach()
+void create_maestro(const std::function<void()>& code)
 {
-  auto* context = dynamic_cast<simgrid::kernel::context::AttachContext*>(simgrid::kernel::context::Context::self());
-  if (context == nullptr)
-    xbt_die("Not a suitable context");
+  /* Create maestro actor and initialize it */
+  ActorImpl* maestro = new ActorImpl(xbt::string(""), /*host*/ nullptr);
 
-  SIMIX_process_cleanup(context->process());
-  context->attach_stop();
-}
+  if (not code) {
+    maestro->context_.reset(simix_global->context_factory->create_context(simix::ActorCode(), maestro));
+  } else {
+    maestro->context_.reset(simix_global->context_factory->create_maestro(simix::ActorCode(code), maestro));
+  }
 
-/**
- * @brief Executes the processes from simix_global->process_to_run.
- *
- * The processes of simix_global->process_to_run are run (in parallel if
- * possible).  On exit, simix_global->process_to_run is empty, and
- * simix_global->process_that_ran contains the list of processes that just ran.
- * The two lists are swapped so, be careful when using them before and after a
- * call to this function.
- */
-void SIMIX_process_runall()
-{
-  SIMIX_context_runall();
+  maestro->simcall.issuer       = maestro;
+  simix_global->maestro_process = maestro;
+}
 
-  simix_global->process_to_run.swap(simix_global->process_that_ran);
-  simix_global->process_to_run.clear();
+} // namespace actor
+} // namespace kernel
 }
 
-/**
- * @brief Internal function to kill a SIMIX process.
- *
- * This function may be called when a SIMCALL_PROCESS_KILL simcall occurs,
- * or directly for SIMIX internal purposes.
- *
- * @param actor poor victim
- * @param issuer the actor which has sent the PROCESS_KILL. Important to not schedule twice the same actor.
- */
-void SIMIX_process_kill(smx_actor_t actor, smx_actor_t issuer)
+void SIMIX_process_detach()
 {
+  simgrid::kernel::actor::ActorImpl::detach();
+}
 
-  if (actor->finished_) {
-    XBT_DEBUG("Ignoring request to kill process %s@%s that is already dead", actor->get_cname(),
-              actor->host_->get_cname());
-    return;
-  }
-
-  XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer->get_cname(),
-            (issuer->host_ == nullptr ? "(null)" : issuer->host_->get_cname()), actor->get_cname(),
-            actor->host_->get_cname());
-
-  actor->context_->iwannadie = true;
-  actor->blocked_            = false;
-  actor->suspended_          = false;
-  actor->exception           = nullptr;
-
-  // Forcefully kill the actor if its host is turned off. Not an HostFailureException because you should not survive that
-  if (actor->host_->is_off()) {
-    /* HORRIBLE HACK: Don't throw an StopRequest exception in Java, because it breaks sometimes.
-     *
-     * It seems to break for the actors started from the Java world, with new Process()
-     * while it works for the ones started from the C world, with the deployment file.
-     * When it happens, the simulation stops brutally with a message "untrapped exception StopRequest".
-     *
-     * From what I understand, it works for the native actors because they have a nice try/catch block around their main
-     * but I fail to have something like that for pure Java actors. That's probably a story of C->Java vs Java->C
-     * calling conventions. The right solution may be to have try/catch(StopRequest) blocks around each native call in
-     * JNI. ie, protect every Java->C++ call from C++ exceptions. But this sounds long and painful to do before we
-     * switch to an automatic generator such as SWIG. For now, we don't throw here that exception that we sometimes fail
-     * to catch.
-     *
-     * One of the unfortunate outcome is that the threads started from the deployment file are not stopped anymore.
-     * Or maybe this is the actors stopping gracefully as opposed to the killed ones? Or maybe this is absolutely all
-     * actors of the Java simulation? I'm not sure. Anyway. Because of them, the simulation hangs at the end, waiting
-     * for them to stop but they won't. The current answer to that is very brutal:
-     * we do a "exit(0)" to kill the JVM from the C code after the call to MSG_run(). Definitely unpleasant.
-     */
-
-    if (simgrid::kernel::context::factory_initializer == nullptr) // Only Java sets a factory_initializer, for now
-      actor->throw_exception(std::make_exception_ptr(simgrid::kernel::context::Context::StopRequest("host failed")));
-  }
-
-  /* destroy the blocking synchro if any */
-  if (actor->waiting_synchro != nullptr) {
-
-    simgrid::kernel::activity::ExecImplPtr exec =
-        boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(actor->waiting_synchro);
-    simgrid::kernel::activity::CommImplPtr comm =
-        boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(actor->waiting_synchro);
-    simgrid::kernel::activity::SleepImplPtr sleep =
-        boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(actor->waiting_synchro);
-    simgrid::kernel::activity::RawImplPtr raw =
-        boost::dynamic_pointer_cast<simgrid::kernel::activity::RawImpl>(actor->waiting_synchro);
-    simgrid::kernel::activity::IoImplPtr io =
-        boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(actor->waiting_synchro);
-
-    if (exec != nullptr) {
-      if (exec->surf_action_) {
-        exec->surf_action_->cancel();
-        exec->surf_action_->unref();
-        exec->surf_action_ = nullptr;
-      }
-    } else if (comm != nullptr) {
-      actor->comms.remove(actor->waiting_synchro);
-      comm->cancel();
-      // Remove first occurrence of &process->simcall:
-      auto i = boost::range::find(actor->waiting_synchro->simcalls_, &actor->simcall);
-      if (i != actor->waiting_synchro->simcalls_.end())
-        actor->waiting_synchro->simcalls_.remove(&actor->simcall);
-    } else if (sleep != nullptr) {
-      if (sleep->surf_sleep)
-        sleep->surf_sleep->cancel();
-      sleep->post();
-    } else if (raw != nullptr) {
-      SIMIX_synchro_stop_waiting(actor, &actor->simcall);
-
-    } else if (io != nullptr) {
-      delete io.get();
-    } else {
-      simgrid::kernel::activity::ActivityImplPtr activity = actor->waiting_synchro;
-      xbt_die("Activity %s is of unknown type %s", activity->name_.c_str(),
-              simgrid::xbt::demangle(typeid(activity).name()).get());
-    }
-
-    actor->waiting_synchro = nullptr;
-  }
-  if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), actor) ==
-          end(simix_global->process_to_run) &&
-      actor != issuer) {
-    XBT_DEBUG("Inserting %s in the to_run list", actor->get_cname());
-    simix_global->process_to_run.push_back(actor);
-  }
+smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname,
+                                 std::unordered_map<std::string, std::string>* properties,
+                                 smx_actor_t /*parent_process*/)
+{
+  return simgrid::kernel::actor::ActorImpl::attach(name, data, sg_host_by_name(hostname), properties).get();
 }
 
 /** @deprecated When this function gets removed, also remove the xbt_ex class, that is only there to help users to
@@ -565,7 +543,7 @@ void SIMIX_process_throw(smx_actor_t actor, xbt_errcat_t cat, int value, const c
 {
   SMX_EXCEPTION(actor, cat, value, msg);
 
-  if (actor->suspended_)
+  if (actor->is_suspended())
     actor->resume();
 
   /* cancel the blocking synchro if any */
@@ -573,8 +551,8 @@ void SIMIX_process_throw(smx_actor_t actor, xbt_errcat_t cat, int value, const c
 
     simgrid::kernel::activity::ExecImplPtr exec =
         boost::dynamic_pointer_cast<simgrid::kernel::activity::ExecImpl>(actor->waiting_synchro);
-    if (exec != nullptr && exec->surf_action_)
-      exec->surf_action_->cancel();
+    if (exec != nullptr)
+      exec->cancel();
 
     simgrid::kernel::activity::CommImplPtr comm =
         boost::dynamic_pointer_cast<simgrid::kernel::activity::CommImpl>(actor->waiting_synchro);
@@ -587,48 +565,29 @@ void SIMIX_process_throw(smx_actor_t actor, xbt_errcat_t cat, int value, const c
         boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(actor->waiting_synchro);
     if (sleep != nullptr) {
       SIMIX_process_sleep_destroy(actor->waiting_synchro);
-      if (std::find(begin(simix_global->process_to_run), end(simix_global->process_to_run), actor) ==
-              end(simix_global->process_to_run) &&
+      if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), actor) ==
+              end(simix_global->actors_to_run) &&
           actor != SIMIX_process_self()) {
-        XBT_DEBUG("Inserting %s in the to_run list", actor->get_cname());
-        simix_global->process_to_run.push_back(actor);
+        XBT_DEBUG("Inserting [%p] %s in the to_run list", actor, actor->get_cname());
+        simix_global->actors_to_run.push_back(actor);
       }
     }
 
     simgrid::kernel::activity::RawImplPtr raw =
         boost::dynamic_pointer_cast<simgrid::kernel::activity::RawImpl>(actor->waiting_synchro);
     if (raw != nullptr) {
-      SIMIX_synchro_stop_waiting(actor, &actor->simcall);
+      raw->finish();
     }
 
     simgrid::kernel::activity::IoImplPtr io =
         boost::dynamic_pointer_cast<simgrid::kernel::activity::IoImpl>(actor->waiting_synchro);
     if (io != nullptr) {
-      delete io.get();
+      io->cancel();
     }
   }
   actor->waiting_synchro = nullptr;
 }
 
-/**
- * @brief Kills all running processes.
- * @param issuer this one will not be killed
- */
-void SIMIX_process_killall(smx_actor_t issuer)
-{
-  for (auto const& kv : simix_global->process_list)
-    if (kv.second != issuer)
-      SIMIX_process_kill(kv.second, issuer);
-}
-
-void SIMIX_process_change_host(smx_actor_t actor, sg_host_t dest)
-{
-  xbt_assert((actor != nullptr), "Invalid parameters");
-  simgrid::xbt::intrusive_erase(actor->host_->pimpl_->process_list_, *actor);
-  actor->host_ = dest;
-  dest->pimpl_->process_list_.push_back(*actor);
-}
-
 void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor)
 {
   smx_activity_t sync_suspend = actor->suspend(simcall->issuer);
@@ -652,7 +611,7 @@ int SIMIX_process_count()
   return simix_global->process_list.size();
 }
 
-void* SIMIX_process_self_get_data()
+void* SIMIX_process_self_get_data() // deprecated
 {
   smx_actor_t self = SIMIX_process_self();
 
@@ -662,7 +621,7 @@ void* SIMIX_process_self_get_data()
   return self->get_user_data();
 }
 
-void SIMIX_process_self_set_data(void *data)
+void SIMIX_process_self_set_data(void* data) // deprecated
 {
   SIMIX_process_self()->set_user_data(data);
 }
@@ -687,26 +646,11 @@ void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, do
     SIMIX_simcall_answer(simcall);
     return;
   }
-  smx_activity_t sync = SIMIX_process_join(simcall->issuer, process, timeout);
+  smx_activity_t sync = simcall->issuer->join(process, timeout);
   sync->simcalls_.push_back(simcall);
   simcall->issuer->waiting_synchro = sync;
 }
 
-smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, double timeout)
-{
-  smx_activity_t res = issuer->sleep(timeout);
-  intrusive_ptr_add_ref(res.get());
-  SIMIX_process_on_exit(process,
-                        [](int, void* arg) {
-                          auto sleep = static_cast<simgrid::kernel::activity::SleepImpl*>(arg);
-                          if (sleep->surf_sleep)
-                            sleep->surf_sleep->finish(simgrid::kernel::resource::Action::State::FINISHED);
-                          intrusive_ptr_release(sleep);
-                        },
-                        res.get());
-  return res;
-}
-
 void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration)
 {
   if (MC_is_active() || MC_record_replay_is_active()) {
@@ -724,11 +668,11 @@ void SIMIX_process_sleep_destroy(smx_activity_t synchro)
 {
   XBT_DEBUG("Destroy sleep synchro %p", synchro.get());
   simgrid::kernel::activity::SleepImplPtr sleep =
-      boost::dynamic_pointer_cast<simgrid::kernel::activity::SleepImpl>(synchro);
+      boost::static_pointer_cast<simgrid::kernel::activity::SleepImpl>(synchro);
 
-  if (sleep->surf_sleep) {
-    sleep->surf_sleep->unref();
-    sleep->surf_sleep = nullptr;
+  if (sleep->surf_action_) {
+    sleep->surf_action_->unref();
+    sleep->surf_action_ = nullptr;
   }
 }
 
@@ -739,58 +683,13 @@ void SIMIX_process_sleep_destroy(smx_activity_t synchro)
  *
  * @param self the current process
  */
-void SIMIX_process_yield(smx_actor_t self)
-{
-  XBT_DEBUG("Yield actor '%s'", self->get_cname());
-
-  /* Go into sleep and return control to maestro */
-  self->context_->suspend();
-
-  /* Ok, maestro returned control to us */
-  XBT_DEBUG("Control returned to me: '%s'", self->get_cname());
-
-  if (self->context_->iwannadie) {
-    XBT_DEBUG("I wanna die!");
-    self->finished_ = true;
-    /* execute the on_exit functions */
-    SIMIX_process_on_exit_runall(self);
-
-    if (self->auto_restart_ && self->host_->is_off() &&
-        watched_hosts.find(self->host_->get_cname()) == watched_hosts.end()) {
-      XBT_DEBUG("Push host %s to watched_hosts because it's off and %s needs to restart", self->host_->get_cname(),
-                self->get_cname());
-      watched_hosts.insert(self->host_->get_cname());
-    }
-
-    XBT_DEBUG("Process %s@%s is dead", self->get_cname(), self->host_->get_cname());
-    self->context_->stop();
-    xbt_backtrace_display_current();
-    xbt_die("I should be dead by now.");
-  }
 
-  if (self->suspended_) {
-    XBT_DEBUG("Hey! I'm suspended.");
-    xbt_assert(self->exception != nullptr, "Gasp! This exception may be lost by subsequent calls.");
-    self->suspended_ = false;
-    self->suspend(self);
-  }
-
-  if (self->exception != nullptr) {
-    XBT_DEBUG("Wait, maestro left me an exception");
-    std::exception_ptr exception = std::move(self->exception);
-    self->exception = nullptr;
-    std::rethrow_exception(std::move(exception));
-  }
-
-  if (SMPI_switch_data_segment && not self->finished_) {
-    SMPI_switch_data_segment(self->iface());
-  }
-}
-
-/** @brief Returns the list of processes to run. */
+/** @brief Returns the list of processes to run.
+ * @deprecated
+ */
 const std::vector<smx_actor_t>& simgrid::simix::process_get_runnable()
 {
-  return simix_global->process_to_run;
+  return simix_global->actors_to_run;
 }
 
 /** @brief Returns the process from PID. */
@@ -800,23 +699,12 @@ smx_actor_t SIMIX_process_from_PID(aid_t PID)
   return actor == simix_global->process_list.end() ? nullptr : actor->second;
 }
 
-void SIMIX_process_on_exit_runall(smx_actor_t actor)
-{
-  simgrid::s4u::Actor::on_destruction(actor->iface());
-  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);
-  }
-}
-
 void SIMIX_process_on_exit(smx_actor_t actor, int_f_pvoid_pvoid_t fun, void* data)
 {
   SIMIX_process_on_exit(actor, [fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data);
 }
 
-void SIMIX_process_on_exit(smx_actor_t actor, std::function<void(int, void*)> fun, void* data)
+void SIMIX_process_on_exit(smx_actor_t actor, const std::function<void(bool, void*)>& fun, void* data)
 {
   xbt_assert(actor, "current process not found: are you in maestro context ?");
 
@@ -843,6 +731,12 @@ smx_actor_t simcall_process_create(std::string name, simgrid::simix::ActorCode c
 {
   smx_actor_t self = SIMIX_process_self();
   return simgrid::simix::simcall([name, code, data, host, properties, self] {
-    return SIMIX_process_create(name, std::move(code), data, host, properties, self);
+    return simgrid::kernel::actor::ActorImpl::create(std::move(name), std::move(code), data, host, properties, self)
+        .get();
   });
 }
+
+void simcall_process_set_data(smx_actor_t process, void* data)
+{
+  simgrid::simix::simcall([process, data] { process->set_user_data(data); });
+}