X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7dfcd2aaf386196ce3022317d5402a7016279d43..937f2eb5b429c3c03fc989a25fbc26fabd0cf529:/src/s4u/s4u_Actor.cpp diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index 18339edffd..b933c632c4 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -7,7 +7,11 @@ #include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/Exec.hpp" #include "simgrid/s4u/Host.hpp" +#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 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors"); @@ -34,13 +38,13 @@ ActorPtr Actor::self() return self_context->process()->iface(); } -ActorPtr Actor::create(const char* name, s4u::Host* host, std::function code) +ActorPtr Actor::create(std::string name, s4u::Host* host, std::function code) { simgrid::kernel::actor::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr); return actor->iface(); } -ActorPtr Actor::create(const char* name, s4u::Host* host, const char* function, std::vector args) +ActorPtr Actor::create(std::string name, s4u::Host* host, std::string function, std::vector args) { simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function); simgrid::simix::ActorCode code = factory(std::move(args)); @@ -71,23 +75,28 @@ void Actor::join(double timeout) void Actor::set_auto_restart(bool autorestart) { - simgrid::simix::simcall([this, autorestart]() { pimpl_->auto_restart = autorestart; }); + simgrid::simix::simcall([this, autorestart]() { + pimpl_->set_auto_restart(autorestart); + + 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}); + } + }); } -void Actor::on_exit(int_f_pvoid_pvoid_t fun, void* data) +void Actor::on_exit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */ +{ + simgrid::simix::simcall([this, fun, data] { SIMIX_process_on_exit(pimpl_, fun, data); }); +} + +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); @@ -109,7 +118,7 @@ void Actor::migrate(Host* new_host) s4u::Host* Actor::get_host() { - return this->pimpl_->host; + return this->pimpl_->host_; } void Actor::daemonize() @@ -119,7 +128,7 @@ void Actor::daemonize() bool Actor::is_daemon() const { - return this->pimpl_->isDaemon(); + return this->pimpl_->is_daemon(); } const simgrid::xbt::string& Actor::get_name() const @@ -134,12 +143,12 @@ const char* Actor::get_cname() const aid_t Actor::get_pid() const { - return this->pimpl_->pid; + return this->pimpl_->pid_; } aid_t Actor::get_ppid() const { - return this->pimpl_->ppid; + return this->pimpl_->ppid_; } void Actor::suspend() @@ -154,9 +163,9 @@ void Actor::resume() s4u::Actor::on_resume(this); } -int Actor::is_suspended() +bool Actor::is_suspended() { - return simgrid::simix::simcall([this] { return pimpl_->suspended; }); + return simgrid::simix::simcall([this] { return pimpl_->suspended_; }); } void Actor::set_kill_time(double time) @@ -164,7 +173,7 @@ void Actor::set_kill_time(double time) simcall_process_set_kill_time(pimpl_, time); } -/** \brief Get the kill time of an actor(or 0 if unset). */ +/** @brief Get the kill time of an actor(or 0 if unset). */ double Actor::get_kill_time() { return SIMIX_timer_get_date(pimpl_->kill_timer); @@ -212,20 +221,20 @@ void Actor::kill_all() simgrid::simix::simcall([&self] { SIMIX_process_killall(self); }); } -std::map* Actor::get_properties() +std::unordered_map* Actor::get_properties() { - return simgrid::simix::simcall([this] { return this->pimpl_->getProperties(); }); + return simgrid::simix::simcall([this] { return this->pimpl_->get_properties(); }); } /** Retrieve the property value (or nullptr if not set) */ -const char* Actor::get_property(const char* key) +const char* Actor::get_property(std::string key) { - return simgrid::simix::simcall([this, key] { return pimpl_->getProperty(key); }); + return simgrid::simix::simcall([this, key] { return pimpl_->get_property(key); }); } -void Actor::set_property(const char* key, const char* value) +void Actor::set_property(std::string key, std::string value) { - simgrid::simix::simcall([this, key, value] { pimpl_->setProperty(key, value); }); + simgrid::simix::simcall([this, key, value] { pimpl_->set_property(key, value); }); } Actor* Actor::restart() @@ -278,18 +287,18 @@ XBT_PUBLIC void sleep_until(double timeout) void execute(double flops) { - get_host()->execute(flops); + execute(flops, 1.0 /* priority */); } void execute(double flops, double priority) { - get_host()->execute(flops, priority); + exec_init(flops)->set_priority(priority)->start()->wait(); } void parallel_execute(int host_nb, s4u::Host** 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, /* rate */ -1, timeout); + simcall_execution_parallel_start("", host_nb, host_list, flops_amount, bytes_amount, /* rate */ -1, timeout); simcall_execution_wait(s); } @@ -316,12 +325,12 @@ ExecPtr exec_async(double flops) aid_t get_pid() { - return SIMIX_process_self()->pid; + return SIMIX_process_self()->pid_; } aid_t get_ppid() { - return SIMIX_process_self()->ppid; + return SIMIX_process_self()->ppid_; } std::string get_name() @@ -336,7 +345,7 @@ const char* get_cname() Host* get_host() { - return SIMIX_process_self()->host; + return SIMIX_process_self()->host_; } void suspend() @@ -357,16 +366,16 @@ void resume() bool is_suspended() { smx_actor_t process = SIMIX_process_self(); - return simgrid::simix::simcall([process] { return process->suspended; }); + return simgrid::simix::simcall([process] { return process->suspended_; }); } -void kill() +void exit() { smx_actor_t process = SIMIX_process_self(); simgrid::simix::simcall([process] { SIMIX_process_kill(process, process); }); } -void on_exit(int_f_pvoid_pvoid_t fun, void* data) +void on_exit(std::function fun, void* data) { SIMIX_process_self()->iface()->on_exit(fun, data); } @@ -408,9 +417,17 @@ bool isSuspended() /* deprecated */ { return is_suspended(); } -void onExit /* deprecated */ (int_f_pvoid_pvoid_t fun, void* data) +void on_exit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */ { - on_exit(fun, data); + SIMIX_process_self()->iface()->on_exit([fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data); +} +void onExit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */ +{ + on_exit([fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data); +} +void kill() /* deprecated */ +{ + exit(); } } // namespace this_actor @@ -419,10 +436,10 @@ void onExit /* deprecated */ (int_f_pvoid_pvoid_t fun, void* data) /* **************************** Public C interface *************************** */ -/** \ingroup m_actor_management - * \brief Returns the process ID of \a actor. +/** @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). + * 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) { @@ -433,10 +450,10 @@ int sg_actor_get_PID(sg_actor_t actor) return actor->get_pid(); } -/** \ingroup m_actor_management - * \brief Returns the process ID of the parent of \a actor. +/** @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. + * 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) @@ -444,12 +461,12 @@ int sg_actor_get_PPID(sg_actor_t actor) return actor->get_ppid(); } -/** \ingroup m_actor_management +/** @ingroup m_actor_management * - * \brief Return a #sg_actor_t given its PID. + * @brief Return a #sg_actor_t given its PID. * - * This function search in the list of all the created sg_actor_t for a sg_actor_t whose PID is equal to \a PID. - * If none is found, \c nullptr is returned. + * This function search in the list of all the created sg_actor_t for a sg_actor_t whose PID is equal to @a PID. + * If none is found, @c nullptr is returned. Note that the PID are unique in the whole simulation, not only on a given host. */ sg_actor_t sg_actor_by_PID(aid_t pid) @@ -457,8 +474,8 @@ sg_actor_t sg_actor_by_PID(aid_t pid) return simgrid::s4u::Actor::by_pid(pid).get(); } -/** \ingroup m_actor_management - * \brief Return the name of an actor. +/** @ingroup m_actor_management + * @brief Return the name of an actor. */ const char* sg_actor_get_name(sg_actor_t actor) { @@ -470,20 +487,20 @@ sg_host_t sg_actor_get_host(sg_actor_t actor) return actor->get_host(); } -/** \ingroup m_actor_management - * \brief Returns the value of a given actor property +/** @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) + * @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->get_property(name); } -/** \ingroup m_actor_management - * \brief Return the list of properties +/** @ingroup m_actor_management + * @brief Return the list of properties * * This function returns all the parameters associated with an actor */ @@ -491,17 +508,17 @@ 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->get_properties(); + std::unordered_map* props = actor->get_properties(); 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); + for (auto const& kv : *props) { + xbt_dict_set(as_dict, kv.first.c_str(), xbt_strdup(kv.second.c_str()), nullptr); } return as_dict; } -/** \ingroup m_actor_management - * \brief Suspend the actor. +/** @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. */ @@ -511,8 +528,8 @@ void sg_actor_suspend(sg_actor_t actor) actor->suspend(); } -/** \ingroup m_actor_management - * \brief Resume a suspended actor. +/** @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. */ @@ -522,8 +539,8 @@ void sg_actor_resume(sg_actor_t actor) actor->resume(); } -/** \ingroup m_actor_management - * \brief Returns true if the actor is suspended . +/** @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. */ @@ -533,8 +550,8 @@ int sg_actor_is_suspended(sg_actor_t actor) } /** - * \ingroup m_actor_management - * \brief Restarts an actor from the beginning. + * @ingroup m_actor_management + * @brief Restarts an actor from the beginning. */ sg_actor_t sg_actor_restart(sg_actor_t actor) { @@ -542,8 +559,8 @@ sg_actor_t sg_actor_restart(sg_actor_t actor) } /** - * \ingroup m_actor_management - * \brief Sets the "auto-restart" flag of the actor. + * @ingroup m_actor_management + * @brief Sets the "auto-restart" flag of the actor. * If the flag is set to 1, the actor will be automatically restarted when its host comes back up. */ void sg_actor_set_auto_restart(sg_actor_t actor, int auto_restart) @@ -559,21 +576,21 @@ void sg_actor_daemonize(sg_actor_t actor) actor->daemonize(); } -/** \ingroup m_actor_management - * \brief Migrates an actor to another location. +/** @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. + * 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. +/** @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 + * @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) { @@ -590,11 +607,11 @@ void sg_actor_kill_all() simgrid::s4u::Actor::kill_all(); } -/** \ingroup m_actor_management - * \brief Set the kill time of an actor. +/** @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. + * @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) {