X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/69fa0c6e72fedc8b1016965248dc3c5665c24292..be4186e3689b74b38253d5425cbd6d08b2854a2b:/src/s4u/s4u_actor.cpp diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp index 81d3323e0e..a81f54a2e7 100644 --- a/src/s4u/s4u_actor.cpp +++ b/src/s4u/s4u_actor.cpp @@ -7,11 +7,12 @@ #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" #include "src/kernel/context/Context.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include @@ -20,6 +21,9 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors"); namespace simgrid { namespace s4u { +simgrid::xbt::signal s4u::Actor::onCreation; +simgrid::xbt::signal s4u::Actor::onDestruction; + // ***** Actor creation ***** ActorPtr Actor::self() { @@ -46,12 +50,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,8 +63,13 @@ 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) { - simcall_process_auto_restart_set(pimpl_,autorestart); + simgrid::simix::kernelImmediate([this, autorestart]() { pimpl_->auto_restart = autorestart; }); } void Actor::onExit(int_f_pvoid_pvoid_t fun, void* data) @@ -70,12 +77,31 @@ 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::host() +s4u::Host* Actor::getHost() { return this->pimpl_->host; } @@ -85,34 +111,39 @@ void Actor::daemonize() simgrid::simix::kernelImmediate([this]() { pimpl_->daemonize(); }); } -const char* Actor::cname() +const simgrid::xbt::string& Actor::getName() const { - return this->pimpl_->name.c_str(); + return this->pimpl_->getName(); } -simgrid::xbt::string Actor::name() +const char* Actor::getCname() const { - return this->pimpl_->name; + return this->pimpl_->getCname(); } -aid_t Actor::pid() +aid_t Actor::getPid() { return this->pimpl_->pid; } -aid_t Actor::ppid() +aid_t Actor::getPpid() { return this->pimpl_->ppid; } 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() @@ -125,7 +156,7 @@ void Actor::setKillTime(double time) { } /** \brief Get the kill time of an actor(or 0 if unset). */ -double Actor::killTime() +double Actor::getKillTime() { return SIMIX_timer_get_date(pimpl_->kill_timer); } @@ -134,7 +165,7 @@ void Actor::kill(aid_t pid) { smx_actor_t process = SIMIX_process_from_PID(pid); if(process != nullptr) { - simcall_process_kill(process); + simgrid::simix::kernelImmediate([process] { SIMIX_process_kill(process, process); }); } else { std::ostringstream oss; oss << "kill: ("<< pid <<") - No such process" << std::endl; @@ -147,7 +178,9 @@ smx_actor_t Actor::getImpl() { } void Actor::kill() { - simcall_process_kill(pimpl_); + smx_actor_t process = SIMIX_process_self(); + simgrid::simix::kernelImmediate( + [this, process] { SIMIX_process_kill(pimpl_, (pimpl_ == simix_global->maestro_process) ? pimpl_ : process); }); } // ***** Static functions ***** @@ -171,17 +204,25 @@ 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::property(const char* key) +const char* Actor::getProperty(const char* key) { - return (char*)xbt_dict_get_or_null(simcall_process_get_properties(pimpl_), key); + return simgrid::simix::kernelImmediate([this, key] { return pimpl_->getProperty(key); }); } void Actor::setProperty(const char* key, const char* value) { - simgrid::simix::kernelImmediate([this, key, value] { - xbt_dict_set(simcall_process_get_properties(pimpl_), key, (char*)value, (void_f_pvoid_t) nullptr); - }); + simgrid::simix::kernelImmediate([this, key, value] { pimpl_->setProperty(key, value); }); +} + +Actor* Actor::restart() +{ + return simgrid::simix::kernelImmediate([this]() { return pimpl_->restart(); }); } // ***** this_actor ***** @@ -209,6 +250,11 @@ void sleep_for(double duration) simcall_process_sleep(duration); } +void yield() +{ + simgrid::simix::kernelImmediate([] { /* do nothing*/ }); +} + XBT_PUBLIC(void) sleep_until(double timeout) { double now = SIMIX_get_clock(); @@ -216,62 +262,108 @@ XBT_PUBLIC(void) sleep_until(double timeout) simcall_process_sleep(timeout - now); } -e_smx_state_t execute(double flops) { - smx_activity_t s = simcall_execution_start(nullptr,flops,1.0/*priority*/,0./*bound*/); - return simcall_execution_wait(s); +void execute(double flops) +{ + smx_activity_t s = simcall_execution_start(nullptr, flops, 1.0 /*priority*/, 0. /*bound*/, getHost()); + simcall_execution_wait(s); } -void* recv(MailboxPtr chan) { +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 parallel_execute(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double timeout) +{ + 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(); } -void* recv(MailboxPtr chan, double timeout) +void* recv(MailboxPtr chan, double timeout) // deprecated { return chan->get(timeout); } -void send(MailboxPtr chan, void* payload, double simulatedSize) +void send(MailboxPtr chan, void* payload, double simulatedSize) // deprecated { chan->put(payload, simulatedSize); } -void send(MailboxPtr chan, void* payload, double simulatedSize, double timeout) +void send(MailboxPtr chan, void* payload, double simulatedSize, double timeout) // deprecated { chan->put(payload, simulatedSize, timeout); } -CommPtr isend(MailboxPtr chan, void* payload, double simulatedSize) +CommPtr isend(MailboxPtr chan, void* payload, double simulatedSize) // deprecated { return chan->put_async(payload, simulatedSize); } -CommPtr irecv(MailboxPtr chan, void** data) +CommPtr irecv(MailboxPtr chan, void** data) // deprecated { return chan->get_async(data); } -aid_t pid() +aid_t getPid() { return SIMIX_process_self()->pid; } -aid_t ppid() +aid_t getPpid() { return SIMIX_process_self()->ppid; } -std::string name() +std::string getName() +{ + return SIMIX_process_self()->getName(); +} + +const char* getCname() { - return SIMIX_process_self()->name; + return SIMIX_process_self()->getCname(); } -Host* host() +Host* getHost() { return SIMIX_process_self()->host; } 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()); } @@ -279,6 +371,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() @@ -289,7 +384,8 @@ bool isSuspended() void kill() { - simcall_process_kill(SIMIX_process_self()); + smx_actor_t process = SIMIX_process_self(); + simgrid::simix::kernelImmediate([process] { SIMIX_process_kill(process, process); }); } void onExit(int_f_pvoid_pvoid_t fun, void* data) @@ -297,10 +393,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); } } }