X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2807fde4fd1f59c230d69a934634c5dfb77905f2..c7c5def2870e604025be03b866967c0c5e293afe:/src/s4u/s4u_actor.cpp diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp index 86ea2e2fb4..5e07894d8d 100644 --- a/src/s4u/s4u_actor.cpp +++ b/src/s4u/s4u_actor.cpp @@ -7,6 +7,7 @@ #include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/Comm.hpp" +#include "simgrid/s4u/Exec.hpp" #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Mailbox.hpp" @@ -20,6 +21,8 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors"); namespace simgrid { namespace s4u { +simgrid::xbt::signal s4u::Actor::onCreation; + // ***** Actor creation ***** ActorPtr Actor::self() { @@ -46,12 +49,10 @@ ActorPtr Actor::createActor(const char* name, s4u::Host* host, const char* funct void intrusive_ptr_add_ref(Actor* actor) { - xbt_assert(actor != nullptr); intrusive_ptr_add_ref(actor->pimpl_); } void intrusive_ptr_release(Actor* actor) { - xbt_assert(actor != nullptr); intrusive_ptr_release(actor->pimpl_); } @@ -61,6 +62,11 @@ void Actor::join() { simcall_process_join(this->pimpl_, -1); } +void Actor::join(double timeout) +{ + simcall_process_join(this->pimpl_, timeout); +} + void Actor::setAutoRestart(bool autorestart) { simgrid::simix::kernelImmediate([this, autorestart]() { pimpl_->auto_restart = autorestart; }); } @@ -70,9 +76,28 @@ void Actor::onExit(int_f_pvoid_pvoid_t fun, void* data) simcall_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) { - simgrid::simix::kernelImmediate([this, new_host]() { pimpl_->new_host = new_host; }); + simgrid::simix::kernelImmediate([this, new_host]() { + if (pimpl_->waiting_synchro != nullptr) { + // The actor is blocked on an activity. If it's an exec, migrate it too. + // FIXME: implement the migration of other kind of activities + simgrid::kernel::activity::ExecImplPtr exec = + boost::dynamic_pointer_cast(pimpl_->waiting_synchro); + xbt_assert(exec.get() != nullptr, "We can only migrate blocked actors when they are blocked on executions."); + exec->migrate(new_host); + } + SIMIX_process_change_host(this->pimpl_, new_host); + }); } s4u::Host* Actor::getHost() @@ -107,12 +132,17 @@ aid_t Actor::getPpid() void Actor::suspend() { + if (TRACE_actor_is_enabled()) + simgrid::instr::Container::byName(instr_pid(this))->getState("MSG_PROCESS_STATE")->pushEvent("suspend"); + simcall_process_suspend(pimpl_); } void Actor::resume() { simgrid::simix::kernelImmediate([this] { pimpl_->resume(); }); + if (TRACE_actor_is_enabled()) + simgrid::instr::Container::byName(instr_pid(this))->getState("MSG_PROCESS_STATE")->popEvent(); } int Actor::isSuspended() @@ -173,6 +203,11 @@ void Actor::killAll(int resetPid) simcall_process_killall(resetPid); } +std::map* Actor::getProperties() +{ + return simgrid::simix::kernelImmediate([this] { return this->pimpl_->getProperties(); }); +} + /** Retrieve the property value (or nullptr if not set) */ const char* Actor::getProperty(const char* key) { @@ -228,16 +263,45 @@ XBT_PUBLIC(void) sleep_until(double timeout) void execute(double flops) { - smx_activity_t s = simcall_execution_start(nullptr,flops,1.0/*priority*/,0./*bound*/); + smx_activity_t s = simcall_execution_start(nullptr, flops, 1.0 /*priority*/, 0. /*bound*/, getHost()); + simcall_execution_wait(s); +} + +void execute(double flops, double priority) +{ + smx_activity_t s = simcall_execution_start(nullptr, flops, 1 / priority /*priority*/, 0. /*bound*/, getHost()); simcall_execution_wait(s); } -void execute(double flops,double priority) +void parallel_execute(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double timeout) { - smx_activity_t s = simcall_execution_start(nullptr,flops,1 / priority/*priority*/,0./*bound*/); + smx_activity_t s = + simcall_execution_parallel_start(nullptr, host_nb, host_list, flops_amount, bytes_amount, -1, timeout); simcall_execution_wait(s); } +void parallel_execute(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount) +{ + smx_activity_t s = simcall_execution_parallel_start(nullptr, host_nb, host_list, flops_amount, bytes_amount, -1, -1); + simcall_execution_wait(s); +} + +ExecPtr exec_init(double flops_amount) +{ + ExecPtr res = ExecPtr(new Exec()); + res->host_ = getHost(); + res->flops_amount_ = flops_amount; + res->setRemains(flops_amount); + return res; +} + +ExecPtr exec_async(double flops) +{ + ExecPtr res = exec_init(flops); + res->start(); + return res; +} + void* recv(MailboxPtr chan) // deprecated { return chan->get(); @@ -295,6 +359,10 @@ Host* getHost() void suspend() { + if (TRACE_actor_is_enabled()) + instr::Container::byName(getName() + "-" + std::to_string(getPid())) + ->getState("MSG_PROCESS_STATE") + ->pushEvent("suspend"); simcall_process_suspend(SIMIX_process_self()); } @@ -302,6 +370,9 @@ void resume() { smx_actor_t process = SIMIX_process_self(); simgrid::simix::kernelImmediate([process] { process->resume(); }); + + if (TRACE_actor_is_enabled()) + instr::Container::byName(getName() + "-" + std::to_string(getPid()))->getState("MSG_PROCESS_STATE")->popEvent(); } bool isSuspended() @@ -321,10 +392,13 @@ void onExit(int_f_pvoid_pvoid_t fun, void* data) simcall_process_on_exit(SIMIX_process_self(), fun, data); } +/** @brief Moves the current actor to another host + * + * @see simgrid::s4u::Actor::migrate() for more information + */ void migrate(Host* new_host) { - smx_actor_t process = SIMIX_process_self(); - simgrid::simix::kernelImmediate([process, new_host] { process->new_host = new_host; }); + SIMIX_process_self()->iface()->migrate(new_host); } } }