X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a3a100990355eb757dc81106b5aac6daed0b8e1..c139b4e36702f58bd8a75e87cf537959da82dbc9:/src/s4u/s4u_actor.cpp diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp index b9957b2186..8960fb8366 100644 --- a/src/s4u/s4u_actor.cpp +++ b/src/s4u/s4u_actor.cpp @@ -36,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(); } @@ -44,7 +44,7 @@ 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(); } @@ -88,6 +88,23 @@ void Actor::onExit(int_f_pvoid_pvoid_t fun, void* data) */ void Actor::migrate(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. @@ -99,6 +116,13 @@ void Actor::migrate(Host* 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() @@ -116,14 +140,14 @@ bool Actor::isDaemon() return this->pimpl_->isDaemon(); } -const simgrid::xbt::string& Actor::getName() const +const simgrid::xbt::string& Actor::get_name() const { - return this->pimpl_->getName(); + return this->pimpl_->get_name(); } -const char* Actor::getCname() const +const char* Actor::get_cname() const { - return this->pimpl_->getCname(); + return this->pimpl_->get_cname(); } aid_t Actor::getPid() @@ -139,7 +163,7 @@ 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"); + simgrid::instr::Container::byName(instr_pid(this))->getState("ACTOR_STATE")->pushEvent("suspend"); simcall_process_suspend(pimpl_); } @@ -148,7 +172,7 @@ 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(); + simgrid::instr::Container::byName(instr_pid(this))->getState("ACTOR_STATE")->popEvent(); } int Actor::isSuspended() @@ -305,36 +329,6 @@ ExecPtr exec_async(double flops) return res; } -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 -{ - chan->put(payload, simulatedSize); -} - -void send(MailboxPtr chan, void* payload, double simulatedSize, double timeout) // deprecated -{ - chan->put(payload, simulatedSize, timeout); -} - -CommPtr isend(MailboxPtr chan, void* payload, double simulatedSize) // deprecated -{ - return chan->put_async(payload, simulatedSize); -} - -CommPtr irecv(MailboxPtr chan, void** data) // deprecated -{ - return chan->get_async(data); -} - aid_t getPid() { return SIMIX_process_self()->pid; @@ -345,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() @@ -363,8 +357,8 @@ Host* getHost() void suspend() { if (TRACE_actor_is_enabled()) - instr::Container::byName(getName() + "-" + std::to_string(getPid())) - ->getState("MSG_PROCESS_STATE") + instr::Container::byName(get_name() + "-" + std::to_string(getPid())) + ->getState("ACTOR_STATE") ->pushEvent("suspend"); simcall_process_suspend(SIMIX_process_self()); } @@ -375,7 +369,7 @@ void resume() simgrid::simix::kernelImmediate([process] { process->resume(); }); if (TRACE_actor_is_enabled()) - instr::Container::byName(getName() + "-" + std::to_string(getPid()))->getState("MSG_PROCESS_STATE")->popEvent(); + instr::Container::byName(get_name() + "-" + std::to_string(getPid()))->getState("ACTOR_STATE")->popEvent(); } bool isSuspended() @@ -403,6 +397,163 @@ void migrate(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); }