X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9bf3d6642fe270799d6fe2ce759c0c6c82120434..2e66bdc36efcaaf728af85511d74cf25cdd226c4:/src/s4u/s4u_Actor.cpp diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index b1f74569ab..945dfb47fd 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -8,7 +8,9 @@ #include "simgrid/s4u/Exec.hpp" #include "simgrid/s4u/Host.hpp" #include "src/kernel/activity/ExecImpl.hpp" +#include "src/simix/smx_host_private.hpp" #include "src/simix/smx_private.hpp" +#include "src/surf/HostImpl.hpp" #include @@ -73,7 +75,14 @@ void Actor::join(double timeout) void Actor::set_auto_restart(bool autorestart) { - simgrid::simix::simcall([this, autorestart]() { pimpl_->set_auto_restart(autorestart); }); + simgrid::simix::simcall([this, autorestart]() { + xbt_assert(autorestart && not pimpl_->auto_restart_); // FIXME: handle all cases + pimpl_->set_auto_restart(autorestart); + + simgrid::kernel::actor::ProcessArg* arg = new simgrid::kernel::actor::ProcessArg(pimpl_->host_, pimpl_); + XBT_DEBUG("Adding Process %s to the actors_at_boot_ list of Host %s", arg->name.c_str(), arg->host->get_cname()); + pimpl_->host_->pimpl_->actors_at_boot_.emplace_back(arg); + }); } void Actor::on_exit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */ @@ -86,15 +95,6 @@ void Actor::on_exit(std::function fun, void* data) simgrid::simix::simcall([this, fun, data] { SIMIX_process_on_exit(pimpl_, fun, data); }); } -/** @brief Moves the actor to another host - * - * If the actor is currently blocked on an execution activity, the activity is also - * migrated to the new host. If it's blocked on another kind of activity, an error is - * raised as the mandated code is not written yet. Please report that bug if you need it. - * - * Asynchronous activities started by the actor are not migrated automatically, so you have - * to take care of this yourself (only you knows which ones should be migrated). - */ void Actor::migrate(Host* new_host) { s4u::Actor::on_migration_start(this);