X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ca503f10be3854ddf6b5369cbba7ac0950871202..791d2a621277a221aa84be5602565208ca441f44:/src/simix/ActorImpl.cpp

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index 3b16efa0f6..b01c51aab2 100644
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -5,6 +5,8 @@
 
 #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"
@@ -149,8 +151,8 @@ simgrid::s4u::Actor* ActorImpl::restart()
   SIMIX_process_kill(this, (this == simix_global->maestro_process) ? this : SIMIX_process_self());
 
   // start the new process
-  ActorImpl* actor =
-      SIMIX_process_create(arg.name, std::move(arg.code), arg.data, arg.host, arg.properties.get(), nullptr);
+  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);
 
@@ -174,7 +176,7 @@ 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", "", nullptr, this->host_))->start(0.0, 1.0, 0.0);
   }
 }
 
@@ -204,13 +206,8 @@ smx_activity_t ActorImpl::sleep(double duration)
     throw_exception(std::make_exception_ptr(simgrid::HostFailureException(
         XBT_THROW_POINT, std::string("Host ") + std::string(host_->get_cname()) + " failed, you cannot sleep there.")));
 
-  simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl();
-  synchro->host                                 = host_;
-  synchro->surf_action_                         = host_->pimpl_cpu->sleep(duration);
-  synchro->surf_action_->set_data(synchro);
-  XBT_DEBUG("Create sleep synchronization %p", synchro);
-
-  return synchro;
+  return simgrid::kernel::activity::SleepImplPtr(new simgrid::kernel::activity::SleepImpl("sleep", host_))
+      ->start(duration);
 }
 
 void ActorImpl::throw_exception(std::exception_ptr e)
@@ -262,78 +259,76 @@ void ActorImpl::throw_exception(std::exception_ptr e)
   waiting_synchro = nullptr;
 }
 
-void create_maestro(simgrid::simix::ActorCode code)
+void ActorImpl::set_host(sg_host_t 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 {
-    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 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)
+ActorImplPtr ActorImpl::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_actor)
 {
 
   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());
+    XBT_WARN("Cannot launch actor '%s' on failed host '%s'", name.c_str(), host->get_cname());
     return nullptr;
   }
 
-  smx_actor_t process = new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(name), host);
+  ActorImpl* actor = 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;
+  /* actor data */
+  actor->set_user_data(data);
+  actor->code = code;
 
-  if (parent_process != nullptr)
-    process->ppid_ = parent_process->pid_;
+  if (parent_actor != nullptr)
+    actor->ppid_ = parent_actor->pid_;
 
-  XBT_VERB("Create context %s", process->get_cname());
-  process->context_ = SIMIX_context_new(std::move(code), &SIMIX_process_cleanup, process);
+  XBT_VERB("Create context %s", actor->get_cname());
+  actor->context_ = SIMIX_context_new(std::move(code), &SIMIX_process_cleanup, actor);
 
   /* Add properties */
   if (properties != nullptr)
     for (auto const& kv : *properties)
-      process->set_property(kv.first, kv.second);
+      actor->set_property(kv.first, kv.second);
 
   /* Add the process to its host's process list */
-  host->pimpl_->process_list_.push_back(*process);
+  host->pimpl_->process_list_.push_back(*actor);
 
-  XBT_DEBUG("Start context '%s'", process->get_cname());
+  XBT_DEBUG("Start context '%s'", actor->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);
+  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);
 
   /* The on_creation() signal must be delayed until there, where the pid and everything is set */
-  simgrid::s4u::Actor::on_creation(process->iface());
+  simgrid::s4u::Actor::on_creation(actor->iface());
+
+  return ActorImplPtr(actor);
+}
+
+void create_maestro(simgrid::simix::ActorCode code)
+{
+  /* Create maestro process and initialize it */
+  smx_actor_t maestro = new simgrid::kernel::actor::ActorImpl(simgrid::xbt::string(""), /*host*/ nullptr);
 
-  return process;
+  if (not code) {
+    maestro->context_ = SIMIX_context_new(simgrid::simix::ActorCode(), nullptr, maestro);
+  } else {
+    maestro->context_ = simix_global->context_factory->create_maestro(code, maestro);
+  }
+
+  maestro->simcall.issuer       = maestro;
+  simix_global->maestro_process = maestro;
+}
+
+} // namespace actor
+} // namespace kernel
 }
 
 smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname,
@@ -559,13 +554,6 @@ void SIMIX_process_killall(smx_actor_t 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)
 {
@@ -759,7 +747,7 @@ 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(name, std::move(code), data, host, properties, self).get();
   });
 }