X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..c139b4e36702f58bd8a75e87cf537959da82dbc9:/src/s4u/s4u_actor.cpp diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp index 1553bb9313..8960fb8366 100644 --- a/src/s4u/s4u_actor.cpp +++ b/src/s4u/s4u_actor.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -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,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() { @@ -32,7 +36,7 @@ ActorPtr Actor::self() ActorPtr Actor::createActor(const char* name, s4u::Host* host, std::function code) { - simgrid::simix::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr); + simgrid::kernel::actor::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr); return actor->iface(); } @@ -40,18 +44,16 @@ ActorPtr Actor::createActor(const char* name, s4u::Host* host, const char* funct { simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function); simgrid::simix::ActorCode code = factory(std::move(args)); - simgrid::simix::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr); + simgrid::kernel::actor::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr); return actor->iface(); } 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 +63,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 +77,52 @@ 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; }); + std::string key; + simgrid::instr::LinkType* link = nullptr; + if (TRACE_actor_is_enabled()) { + static long long int counter = 0; + + key = std::to_string(counter); + counter++; + + // start link + container_t actor_container = simgrid::instr::Container::byName(instr_pid(this)); + link = simgrid::instr::Container::getRoot()->getLink("ACTOR_LINK"); + link->startEvent(actor_container, "M", key); + + // destroy existing container of this process + actor_container->removeFromParent(); + } + + 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); + }); + + if (TRACE_actor_is_enabled()) { + // create new container on the new_host location + simgrid::instr::Container::byName(new_host->get_name())->createChild(instr_pid(this), "ACTOR"); + // end link + link->endEvent(simgrid::instr::Container::byName(instr_pid(this)), "M", key); + } } s4u::Host* Actor::getHost() @@ -85,14 +135,19 @@ void Actor::daemonize() simgrid::simix::kernelImmediate([this]() { pimpl_->daemonize(); }); } -const simgrid::xbt::string& Actor::getName() const +bool Actor::isDaemon() { - return this->pimpl_->getName(); + return this->pimpl_->isDaemon(); } -const char* Actor::getCname() const +const simgrid::xbt::string& Actor::get_name() const { - return this->pimpl_->getCname(); + return this->pimpl_->get_name(); +} + +const char* Actor::get_cname() const +{ + return this->pimpl_->get_cname(); } aid_t Actor::getPid() @@ -107,12 +162,17 @@ aid_t Actor::getPpid() void Actor::suspend() { + if (TRACE_actor_is_enabled()) + simgrid::instr::Container::byName(instr_pid(this))->getState("ACTOR_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("ACTOR_STATE")->popEvent(); } int Actor::isSuspended() @@ -132,26 +192,28 @@ double Actor::getKillTime() void Actor::kill(aid_t pid) { + smx_actor_t killer = SIMIX_process_self(); smx_actor_t process = SIMIX_process_from_PID(pid); if(process != nullptr) { - simgrid::simix::kernelImmediate([process] { SIMIX_process_kill(process, process); }); + simgrid::simix::kernelImmediate([killer, process] { SIMIX_process_kill(process, killer); }); } else { std::ostringstream oss; - oss << "kill: ("<< pid <<") - No such process" << std::endl; + oss << "kill: (" << pid << ") - No such actor" << std::endl; throw std::runtime_error(oss.str()); } } -smx_actor_t Actor::getImpl() { - return pimpl_; -} - void Actor::kill() { smx_actor_t process = SIMIX_process_self(); simgrid::simix::kernelImmediate( [this, process] { SIMIX_process_kill(pimpl_, (pimpl_ == simix_global->maestro_process) ? pimpl_ : process); }); } +smx_actor_t Actor::getImpl() +{ + return pimpl_; +} + // ***** Static functions ***** ActorPtr Actor::byPid(aid_t pid) @@ -165,12 +227,12 @@ ActorPtr Actor::byPid(aid_t pid) void Actor::killAll() { - simcall_process_killall(1); + simcall_process_killall(); } -void Actor::killAll(int resetPid) +std::map* Actor::getProperties() { - simcall_process_killall(resetPid); + return simgrid::simix::kernelImmediate([this] { return this->pimpl_->getProperties(); }); } /** Retrieve the property value (or nullptr if not set) */ @@ -214,7 +276,12 @@ void sleep_for(double duration) simcall_process_sleep(duration); } -XBT_PUBLIC(void) sleep_until(double timeout) +void yield() +{ + simgrid::simix::kernelImmediate([] { /* do nothing*/ }); +} + +XBT_PUBLIC void sleep_until(double timeout) { double now = SIMIX_get_clock(); if (timeout > now) @@ -223,44 +290,43 @@ 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) +void execute(double flops, double priority) { - smx_activity_t s = simcall_execution_start(nullptr,flops,1 / priority/*priority*/,0./*bound*/); + smx_activity_t s = simcall_execution_start(nullptr, flops, 1 / priority /*priority*/, 0. /*bound*/, getHost()); simcall_execution_wait(s); } -void* recv(MailboxPtr chan) // deprecated -{ - return chan->get(); -} - -void* recv(MailboxPtr chan, double timeout) // deprecated -{ - return chan->get(timeout); -} - -void send(MailboxPtr chan, void* payload, double simulatedSize) // deprecated +void parallel_execute(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double timeout) { - chan->put(payload, simulatedSize); + smx_activity_t s = + simcall_execution_parallel_start(nullptr, host_nb, host_list, flops_amount, bytes_amount, -1, timeout); + simcall_execution_wait(s); } -void send(MailboxPtr chan, void* payload, double simulatedSize, double timeout) // deprecated +void parallel_execute(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount) { - chan->put(payload, simulatedSize, timeout); + smx_activity_t s = simcall_execution_parallel_start(nullptr, host_nb, host_list, flops_amount, bytes_amount, -1, -1); + simcall_execution_wait(s); } -CommPtr isend(MailboxPtr chan, void* payload, double simulatedSize) // deprecated +ExecPtr exec_init(double flops_amount) { - return chan->put_async(payload, simulatedSize); + ExecPtr res = ExecPtr(new Exec()); + res->host_ = getHost(); + res->flops_amount_ = flops_amount; + res->setRemains(flops_amount); + return res; } -CommPtr irecv(MailboxPtr chan, void** data) // deprecated +ExecPtr exec_async(double flops) { - return chan->get_async(data); + ExecPtr res = exec_init(flops); + res->start(); + return res; } aid_t getPid() @@ -273,14 +339,14 @@ aid_t getPpid() return SIMIX_process_self()->ppid; } -std::string getName() +std::string get_name() { - return SIMIX_process_self()->getName(); + return SIMIX_process_self()->get_name(); } -const char* getCname() +const char* get_cname() { - return SIMIX_process_self()->getCname(); + return SIMIX_process_self()->get_cname(); } Host* getHost() @@ -290,6 +356,10 @@ Host* getHost() void suspend() { + if (TRACE_actor_is_enabled()) + instr::Container::byName(get_name() + "-" + std::to_string(getPid())) + ->getState("ACTOR_STATE") + ->pushEvent("suspend"); simcall_process_suspend(SIMIX_process_self()); } @@ -297,6 +367,9 @@ void resume() { smx_actor_t process = SIMIX_process_self(); simgrid::simix::kernelImmediate([process] { process->resume(); }); + + if (TRACE_actor_is_enabled()) + instr::Container::byName(get_name() + "-" + std::to_string(getPid()))->getState("ACTOR_STATE")->popEvent(); } bool isSuspended() @@ -316,11 +389,171 @@ 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); +} + +} // namespace this_actor +} // namespace s4u +} // namespace simgrid + +/* **************************** Public C interface *************************** */ + +/** \ingroup m_actor_management + * \brief Returns the process ID of \a actor. + * + * This function checks whether \a actor is a valid pointer and return its PID (or 0 in case of problem). + */ +int sg_actor_get_PID(sg_actor_t actor) +{ + /* Do not raise an exception here: this function is called by the logs + * and the exceptions, so it would be called back again and again */ + if (actor == nullptr || actor->getImpl() == nullptr) + return 0; + return actor->getPid(); +} + +/** \ingroup m_actor_management + * \brief Returns the process ID of the parent of \a actor. + * + * This function checks whether \a actor is a valid pointer and return its parent's PID. + * Returns -1 if the actor has not been created by any other actor. + */ +int sg_actor_get_PPID(sg_actor_t actor) +{ + return actor->getPpid(); +} + +/** \ingroup m_actor_management + * \brief Return the name of an actor. + */ +const char* sg_actor_get_name(sg_actor_t actor) +{ + return actor->get_cname(); +} + +sg_host_t sg_actor_get_host(sg_actor_t actor) +{ + return actor->getHost(); +} + +/** \ingroup m_actor_management + * \brief Returns the value of a given actor property + * + * \param actor an actor + * \param name a property name + * \return value of a property (or nullptr if the property is not set) + */ +const char* sg_actor_get_property_value(sg_actor_t actor, const char* name) +{ + return actor->getProperty(name); +} + +/** \ingroup m_actor_management + * \brief Return the list of properties + * + * This function returns all the parameters associated with an actor + */ +xbt_dict_t sg_actor_get_properties(sg_actor_t actor) +{ + xbt_assert(actor != nullptr, "Invalid parameter: First argument must not be nullptr"); + xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f); + std::map* props = actor->getProperties(); + if (props == nullptr) + return nullptr; + for (auto const& elm : *props) { + xbt_dict_set(as_dict, elm.first.c_str(), xbt_strdup(elm.second.c_str()), nullptr); + } + return as_dict; +} + +/** \ingroup m_actor_management + * \brief Suspend the actor. + * + * This function suspends the actor by suspending the task on which it was waiting for the completion. + */ +void sg_actor_suspend(sg_actor_t actor) +{ + xbt_assert(actor != nullptr, "Invalid parameter: First argument must not be nullptr"); + actor->suspend(); +} + +/** \ingroup m_actor_management + * \brief Resume a suspended actor. + * + * This function resumes a suspended actor by resuming the task on which it was waiting for the completion. + */ +void sg_actor_resume(sg_actor_t actor) +{ + xbt_assert(actor != nullptr, "Invalid parameter: First argument must not be nullptr"); + actor->resume(); } + +/** \ingroup m_actor_management + * \brief Returns true if the actor is suspended . + * + * This checks whether an actor is suspended or not by inspecting the task on which it was waiting for the completion. + */ +int sg_actor_is_suspended(sg_actor_t actor) +{ + return actor->isSuspended(); +} + +/** + * \ingroup m_actor_management + * \brief Restarts an actor from the beginning. + */ +sg_actor_t sg_actor_restart(sg_actor_t actor) +{ + return actor->restart(); +} + +/** @ingroup m_actor_management + * @brief This actor will be terminated automatically when the last non-daemon actor finishes + */ +void sg_actor_daemonize(sg_actor_t actor) +{ + actor->daemonize(); +} + +/** \ingroup m_actor_management + * \brief Migrates an actor to another location. + * + * This function changes the value of the #sg_host_t on which \a actor is running. + */ +void sg_actor_migrate(sg_actor_t process, sg_host_t host) +{ + process->migrate(host); } + +/** \ingroup m_actor_management +* \brief Wait for the completion of a #sg_actor_t. +* +* \param actor the actor to wait for +* \param timeout wait until the actor is over, or the timeout expires +*/ +void sg_actor_join(sg_actor_t actor, double timeout) +{ + actor->join(timeout); } + +void sg_actor_kill(sg_actor_t actor) +{ + actor->kill(); +} + +/** \ingroup m_actor_management + * \brief Set the kill time of an actor. + * + * \param actor an actor + * \param kill_time the time when the actor is killed. + */ +void sg_actor_set_kill_time(sg_actor_t actor, double kill_time) +{ + actor->setKillTime(kill_time); }