X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/163f8696544cfc2c11a545b9ed06011903780031..66e4277badef8f22852720b79a78e1f091c3b679:/src/s4u/s4u_Actor.cpp diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index 8c45ca0142..5e2988b6e8 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2019. 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. */ @@ -8,7 +8,9 @@ #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 @@ -29,25 +31,23 @@ simgrid::xbt::signal s4u::Actor::on_destruction; // ***** Actor creation ***** ActorPtr Actor::self() { - smx_context_t self_context = SIMIX_context_self(); + smx_context_t self_context = simgrid::kernel::context::Context::self(); if (self_context == nullptr) return simgrid::s4u::ActorPtr(); - return self_context->process()->iface(); + return self_context->get_actor()->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)); - simgrid::kernel::actor::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr); - return actor->iface(); + return create(name, host, factory(std::move(args))); } void intrusive_ptr_add_ref(Actor* actor) @@ -73,7 +73,14 @@ void Actor::join(double timeout) void Actor::set_auto_restart(bool autorestart) { - simgrid::simix::simcall([this, autorestart]() { pimpl_->set_auto_restart(autorestart); }); + simgrid::simix::simcall([this, autorestart]() { + xbt_assert(autorestart && not pimpl_->auto_restart_); // FIXME: handle all cases + pimpl_->set_auto_restart(autorestart); + + 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()); + pimpl_->host_->pimpl_->actors_at_boot_.emplace_back(arg); + }); } void Actor::on_exit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */ @@ -86,15 +93,6 @@ 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); @@ -171,13 +169,13 @@ 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); } -void Actor::kill(aid_t pid) +void Actor::kill(aid_t pid) // deprecated { smx_actor_t killer = SIMIX_process_self(); smx_actor_t process = SIMIX_process_from_PID(pid); @@ -225,12 +223,12 @@ std::unordered_map* Actor::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_->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_->set_property(key, value); }); } @@ -285,33 +283,62 @@ 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(std::vector hosts, std::vector flops_amounts, + std::vector bytes_amounts) +{ + parallel_execute(hosts, flops_amounts, bytes_amounts, -1); } +void parallel_execute(std::vector hosts, std::vector flops_amounts, + std::vector bytes_amounts, double timeout) +{ + xbt_assert(hosts.size() > 0, "Your parallel executions must span over at least one host."); + xbt_assert(hosts.size() == flops_amounts.size() || flops_amounts.empty(), + "Host count (%zu) does not match flops_amount count (%zu).", hosts.size(), flops_amounts.size()); + xbt_assert(hosts.size() * hosts.size() == bytes_amounts.size() || bytes_amounts.empty(), + "bytes_amounts must be a matrix of size host_count * host_count (%zu*%zu), but it's of size %zu.", + hosts.size(), hosts.size(), flops_amounts.size()); + /* The vectors live as parameter of parallel_execute. No copy is created for simcall_execution_parallel_start(), + * but that's OK because simcall_execution_wait() is called from here too. + */ + smx_activity_t s = simcall_execution_parallel_start("", hosts.size(), hosts.data(), + (flops_amounts.empty() ? nullptr : flops_amounts.data()), + (bytes_amounts.empty() ? nullptr : bytes_amounts.data()), + /* rate */ -1, timeout); + simcall_execution_wait(s); +} + +// deprecated 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); + delete[] flops_amount; + delete[] bytes_amount; } +// deprecated void parallel_execute(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount) { - parallel_execute(host_nb, host_list, flops_amount, bytes_amount, /* timeout */ -1); + smx_activity_t s = simcall_execution_parallel_start("", host_nb, host_list, flops_amount, bytes_amount, + /* rate */ -1, /*timeout*/ -1); + simcall_execution_wait(s); + delete[] flops_amount; + delete[] bytes_amount; } ExecPtr exec_init(double flops_amount) { - ExecPtr res = ExecPtr(new Exec()); - res->host_ = get_host(); - res->flops_amount_ = flops_amount; - res->set_remaining(flops_amount); - return res; + return ExecPtr(new Exec(get_host(), flops_amount)); } ExecPtr exec_async(double flops) @@ -361,13 +388,7 @@ void resume() simgrid::s4u::Actor::on_resume(process->iface()); } -bool is_suspended() -{ - smx_actor_t process = SIMIX_process_self(); - 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); }); @@ -411,10 +432,6 @@ Host* getHost() /* deprecated */ { return get_host(); } -bool isSuspended() /* deprecated */ -{ - return is_suspended(); -} void on_exit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */ { SIMIX_process_self()->iface()->on_exit([fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data); @@ -423,6 +440,10 @@ 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 } // namespace s4u @@ -430,12 +451,12 @@ void onExit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */ /* **************************** 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) +aid_t 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 */ @@ -444,23 +465,23 @@ 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) +aid_t 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) @@ -468,8 +489,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) { @@ -481,20 +502,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 */ @@ -511,8 +532,8 @@ xbt_dict_t sg_actor_get_properties(sg_actor_t actor) 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. */ @@ -522,8 +543,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. */ @@ -533,8 +554,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. */ @@ -544,8 +565,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) { @@ -553,8 +574,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) @@ -570,21 +591,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) { @@ -601,11 +622,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) {