X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7dc99afd8ce6ca99ac81c25d13b8d6a446ec1bd4..937f2eb5b429c3c03fc989a25fbc26fabd0cf529:/src/s4u/s4u_Actor.cpp diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index 2aef0dca9b..b933c632c4 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -10,6 +10,7 @@ #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 @@ -76,7 +77,13 @@ void Actor::set_auto_restart(bool autorestart) { simgrid::simix::simcall([this, autorestart]() { pimpl_->set_auto_restart(autorestart); - SIMIX_host_add_auto_restart_process(pimpl_->host_, pimpl_); + + std::map actors_map = pimpl_->host_->pimpl_->actors_at_boot_; + if (actors_map.find(pimpl_->name_) == actors_map.end()) { + 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()); + actors_map.insert({arg->name, arg}); + } }); } @@ -90,15 +97,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);