X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e83a6a62aac54e3477bd15c64f243cfa23b3add3..d4f45383d774dcee4a79b3ca281c6180b9005f04:/src/s4u/s4u_Host.cpp diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index f345566b9d..68698e80c1 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -1,11 +1,13 @@ -/* 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. */ #include "simgrid/kernel/routing/NetPoint.hpp" +#include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/Engine.hpp" -#include "src/simix/smx_host_private.hpp" +#include "simgrid/s4u/Exec.hpp" +#include "src/simix/smx_private.hpp" #include "src/surf/HostImpl.hpp" #include @@ -28,9 +30,9 @@ simgrid::xbt::signal Host::on_destruction; simgrid::xbt::signal Host::on_state_change; simgrid::xbt::signal Host::on_speed_change; -Host::Host(const char* name) : name_(name) +Host::Host(std::string name) : name_(std::move(name)) { - xbt_assert(Host::by_name_or_null(name) == nullptr, "Refusing to create a second host named '%s'.", name); + xbt_assert(Host::by_name_or_null(name_) == nullptr, "Refusing to create a second host named '%s'.", get_cname()); Engine::get_instance()->host_register(std::string(name_), this); new simgrid::surf::HostImpl(this); } @@ -48,7 +50,7 @@ Host::~Host() /** @brief Fire the required callbacks and destroy the object * - * Don't delete directly an Host, call h->destroy() instead. + * Don't delete directly a host, call h->destroy() instead. * * This is cumbersome but this is the simplest solution to ensure that the * onDestruction() callback receives a valid object (because of the destructor @@ -64,37 +66,29 @@ void Host::destroy() } } -Host* Host::by_name(std::string name) +Host* Host::by_name(const std::string& name) { return Engine::get_instance()->host_by_name(name); } -Host* Host::by_name(const char* name) -{ - return Engine::get_instance()->host_by_name(std::string(name)); -} -Host* Host::by_name_or_null(const char* name) -{ - return Engine::get_instance()->host_by_name_or_null(std::string(name)); -} -Host* Host::by_name_or_null(std::string name) +Host* Host::by_name_or_null(const std::string& name) { return Engine::get_instance()->host_by_name_or_null(name); } Host* Host::current() { - smx_actor_t smx_proc = SIMIX_process_self(); - if (smx_proc == nullptr) + smx_actor_t self = SIMIX_process_self(); + if (self == nullptr) xbt_die("Cannot call Host::current() from the maestro context"); - return smx_proc->host; + return self->get_host(); } void Host::turn_on() { - if (is_off()) { + if (not is_on()) { simgrid::simix::simcall([this] { - this->extension()->turnOn(); this->pimpl_cpu->turn_on(); + this->pimpl_->turn_on(); on_state_change(*this); }); } @@ -104,81 +98,65 @@ void Host::turn_on() void Host::turn_off() { if (is_on()) { - smx_actor_t self = SIMIX_process_self(); - simgrid::simix::simcall([this, self] { - simgrid::simix::Host* host = this->extension(); - - xbt_assert((host != nullptr), "Invalid parameters"); - + simgrid::simix::simcall([this] { this->pimpl_cpu->turn_off(); - - /* Clean Simulator data */ - if (not host->process_list.empty()) { - for (auto& process : host->process_list) { - SIMIX_process_kill(&process, self); - XBT_DEBUG("Killing %s@%s on behalf of %s which turned off that host.", process.get_cname(), - process.host->get_cname(), self->get_cname()); - } - } + this->pimpl_->turn_off(); on_state_change(*this); }); } } -bool Host::is_on() +bool Host::is_on() const { return this->pimpl_cpu->is_on(); } int Host::get_pstate_count() const { - return this->pimpl_cpu->get_pstates_count(); + return this->pimpl_cpu->get_pstate_count(); } /** - * \brief Return a copy of the list of actors that are executing on this host. + * @brief Return a copy of the list of actors that are executing on this host. * * Daemons and regular actors are all mixed in this list. */ std::vector Host::get_all_actors() { - std::vector res; - for (auto& actor : this->extension()->process_list) - res.push_back(actor.ciface()); - return res; + return pimpl_->get_all_actors(); } /** @brief Returns how many actors (daemonized or not) have been launched on this host */ int Host::get_actor_count() { - return this->extension()->process_list.size(); + return pimpl_->get_actor_count(); } /** @deprecated */ void Host::getProcesses(std::vector* list) { - for (auto& actor : this->extension()->process_list) { - list->push_back(actor.iface()); - } + auto actors = get_all_actors(); + for (auto& actor : actors) + list->push_back(actor); } /** @deprecated */ void Host::actorList(std::vector* whereto) { - for (auto& actor : this->extension()->process_list) { - whereto->push_back(actor.ciface()); - } + auto actors = get_all_actors(); + for (auto& actor : actors) + whereto->push_back(actor); } /** - * \brief Find a route toward another host + * @brief Find a route toward another host * - * \param dest [IN] where to - * \param links [OUT] where to store the list of links (must exist, cannot be nullptr). - * \param latency [OUT] where to store the latency experienced on the path (or nullptr if not interested) + * @param dest [IN] where to + * @param links [OUT] where to store the list of links (must exist, cannot be nullptr). + * @param latency [OUT] where to store the latency experienced on the path (or nullptr if not interested) * It is the caller responsibility to initialize latency to 0 (we add to provided route) - * \pre links!=nullptr + * @pre links!=nullptr * * walk through the routing components tree and find a route between hosts * by calling each "get_route" function in each routing component. @@ -204,49 +182,85 @@ void Host::route_to(Host* dest, std::vector& links, } /** Get the properties assigned to a host */ -std::map* Host::getProperties() +std::unordered_map* Host::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* Host::get_property(const char* key) +const char* Host::get_property(const std::string& key) const { - return this->pimpl_->getProperty(key); + return this->pimpl_->get_property(key); } -void Host::set_property(std::string key, std::string value) +void Host::set_property(const std::string& key, std::string value) +{ + simgrid::simix::simcall([this, key, value] { this->pimpl_->set_property(key, std::move(value)); }); +} +/** Specify a profile turning the host on and off according to a exhaustive list or a stochastic law. + * The profile must contain boolean values. */ +void Host::set_state_profile(kernel::profile::Profile* p) +{ + return simgrid::simix::simcall([this, p] { pimpl_cpu->set_state_profile(p); }); +} +/** Specify a profile modeling the external load according to a exhaustive list or a stochastic law. + * + * Each event of the profile represent a peak speed change that is due to external load. The values are given as a rate + * of the initial value. This means that the actual value is obtained by multiplying the initial value (the peek speed + * at this pstate level) by the rate coming from the profile. + */ +void Host::set_speed_profile(kernel::profile::Profile* p) { - simgrid::simix::simcall([this, key, value] { this->pimpl_->setProperty(key, value); }); + return simgrid::simix::simcall([this, p] { pimpl_cpu->set_speed_profile(p); }); } /** @brief Get the peak processor speed (in flops/s), at the specified pstate */ -double Host::getPstateSpeed(int pstate_index) +double Host::get_pstate_speed(int pstate_index) const { return simgrid::simix::simcall([this, pstate_index] { return this->pimpl_cpu->get_pstate_peak_speed(pstate_index); }); } -/** @brief Get the peak processor speed in flops/s, (under full load (=1.0), at the current pstate) +/** @brief Get the peak computing speed in flops/s at the current pstate, NOT taking the external load into account. + * + * The amount of flops per second available for computing depends on several things: + * - The current pstate determines the maximal peak computing speed (use @ref get_pstate_speed() to retrieve the + * computing speed you would get at another pstate) + * - If you declared an external load (with @ref simgrid::surf::Cpu::set_speed_profile()), you must multiply the + * result of get_speed() by get_available_speed() to retrieve what a new computation would get. * - * The result also takes the external load into account. + * The remaining speed is then shared between the executions located on this host. + * You can retrieve the amount of tasks currently running on this host with @ref get_load(). + * + * The host may have multiple cores, and your executions may be able to use more than a single core. + * + * Finally, executions of priority 2 get twice the amount of flops than executions of priority 1. */ -double Host::getSpeed() +double Host::get_speed() const { return this->pimpl_cpu->get_speed(1.0); } +/** @brief Returns the current computation load (in flops per second) + * + * The external load (coming from an availability trace) is not taken in account. + * You may also be interested in the load plugin. + */ +double Host::get_load() const +{ + return this->pimpl_cpu->get_load(); +} /** @brief Get the available speed ratio, between 0 and 1. * - * This accounts for external load (see @ref set_speed_trace()). + * This accounts for external load (see @ref simgrid::surf::Cpu::set_speed_profile()). */ -double Host::get_available_speed() +double Host::get_available_speed() const { return this->pimpl_cpu->get_speed_ratio(); } /** @brief Returns the number of core of the processor. */ -int Host::get_core_count() +int Host::get_core_count() const { - return this->pimpl_cpu->get_cores_count(); + return this->pimpl_cpu->get_core_count(); } /** @brief Set the pstate at which the host should run */ @@ -255,17 +269,17 @@ void Host::set_pstate(int pstate_index) simgrid::simix::simcall([this, pstate_index] { this->pimpl_cpu->set_pstate(pstate_index); }); } /** @brief Retrieve the pstate at which the host is currently running */ -int Host::get_pstate() +int Host::get_pstate() const { return this->pimpl_cpu->get_pstate(); } /** - * \ingroup simix_storage_management - * \brief Returns the list of storages attached to an host. - * \return a vector containing all storages attached to the host + * @ingroup simix_storage_management + * @brief Returns the list of storages attached to a host. + * @return a vector containing all storages attached to the host */ -std::vector Host::get_attached_storages() +std::vector Host::get_attached_storages() const { return simgrid::simix::simcall([this] { return this->pimpl_->get_attached_storages(); }); } @@ -278,7 +292,7 @@ void Host::getAttachedStorages(std::vector* storages) storages->push_back(elm); } -std::unordered_map const& Host::getMountedStorages() +std::unordered_map const& Host::get_mounted_storages() { if (mounts_ == nullptr) { mounts_ = new std::unordered_map(); @@ -289,19 +303,19 @@ std::unordered_map const& Host::getMountedStorages() return *mounts_; } -void Host::execute(double flops) +ExecPtr Host::exec_async(double flops) { - execute(flops, 1.0 /* priority */); + return this_actor::exec_init(flops)->set_host(this); } -void Host::execute(double flops, double priority) + +void Host::execute(double flops) { - smx_activity_t s = simcall_execution_start(nullptr, flops, 1 / priority /*priority*/, 0. /*bound*/, this); - simcall_execution_wait(s); + execute(flops, 1.0 /* priority */); } -double Host::getLoad() +void Host::execute(double flops, double priority) { - return this->pimpl_cpu->get_load(); + this_actor::exec_init(flops)->set_host(this)->set_priority(1 / priority)->start()->wait(); } } // namespace s4u @@ -316,11 +330,11 @@ size_t sg_host_count() * * Uses sg_host_count() to know the array size. * - * \return an array of \ref sg_host_t containing all the hosts in the platform. - * \remark The host order in this array is generally different from the + * @return an array of @ref sg_host_t containing all the hosts in the platform. + * @remark The host order in this array is generally different from the * creation/declaration order in the XML platform (we use a hash table * internally). - * \see sg_host_count() + * @see sg_host_count() */ sg_host_t* sg_host_list() { @@ -353,12 +367,6 @@ sg_host_t sg_host_by_name(const char* name) return simgrid::s4u::Host::by_name_or_null(name); } -static int hostcmp_voidp(const void* pa, const void* pb) -{ - return strcmp((*static_cast(pa))->get_cname(), - (*static_cast(pb))->get_cname()); -} - xbt_dynar_t sg_hosts_as_dynar() { xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr); @@ -369,7 +377,11 @@ xbt_dynar_t sg_hosts_as_dynar() if (host && host->pimpl_netpoint && host->pimpl_netpoint->is_host()) xbt_dynar_push(res, &host); } - xbt_dynar_sort(res, hostcmp_voidp); + xbt_dynar_sort(res, [](const void* pa, const void* pb) { + const std::string& na = (*static_cast(pa))->get_name(); + const std::string& nb = (*static_cast(pb))->get_name(); + return na.compare(nb); + }); return res; } @@ -394,7 +406,7 @@ xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host) { xbt_assert((host != nullptr), "Invalid parameters"); xbt_dict_t res = xbt_dict_new_homogeneous(nullptr); - for (auto const& elm : host->getMountedStorages()) { + for (auto const& elm : host->get_mounted_storages()) { const char* mount_name = elm.first.c_str(); sg_storage_t storage = elm.second; xbt_dict_set(res, mount_name, (void*)storage->get_cname(), nullptr); @@ -417,25 +429,25 @@ xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host) /** @brief Returns the total speed of a host */ double sg_host_speed(sg_host_t host) { - return host->getSpeed(); + return host->get_speed(); } -/** \brief Return the speed of the processor (in flop/s) at a given pstate. See also @ref plugin_energy. +/** @brief Return the speed of the processor (in flop/s) at a given pstate. See also @ref plugin_energy. * - * \param host host to test - * \param pstate_index pstate to test - * \return Returns the processor speed associated with pstate_index + * @param host host to test + * @param pstate_index pstate to test + * @return Returns the processor speed associated with pstate_index */ double sg_host_get_pstate_speed(sg_host_t host, int pstate_index) { - return host->getPstateSpeed(pstate_index); + return host->get_pstate_speed(pstate_index); } -/** \ingroup m_host_management - * \brief Return the number of cores. +/** @ingroup m_host_management + * @brief Return the number of cores. * - * \param host a host - * \return the number of cores + * @param host a host + * @return the number of cores */ int sg_host_core_count(sg_host_t host) { @@ -473,11 +485,11 @@ void sg_host_set_pstate(sg_host_t host, int pstate) host->set_pstate(pstate); } -/** \ingroup m_host_management +/** @ingroup m_host_management * - * \brief Start the host if it is off + * @brief Start the host if it is off * - * See also #sg_host_is_on() and #sg_host_is_off() to test the current state of the host and @ref plugin_energy + * See also #sg_host_is_on() to test the current state of the host and @ref plugin_energy * for more info on DVFS. */ void sg_host_turn_on(sg_host_t host) @@ -485,11 +497,11 @@ void sg_host_turn_on(sg_host_t host) host->turn_on(); } -/** \ingroup m_host_management +/** @ingroup m_host_management * - * \brief Stop the host if it is on + * @brief Stop the host if it is on * - * See also #MSG_host_is_on() and #MSG_host_is_off() to test the current state of the host and @ref plugin_energy + * See also #MSG_host_is_on() to test the current state of the host and @ref plugin_energy * for more info on DVFS. */ void sg_host_turn_off(sg_host_t host) @@ -511,22 +523,17 @@ int sg_host_is_on(sg_host_t host) return host->is_on(); } -/** @ingroup m_host_management - * @brief Determine if a host is currently off. - * - * See also #sg_host_turn_on() and #sg_host_turn_off() to switch the host ON and OFF and @ref plugin_energy for more - * info on DVFS. - */ +/** @deprecated */ int sg_host_is_off(sg_host_t host) { - return host->is_off(); + return not host->is_on(); } -/** @brief Get the properties of an host */ +/** @brief Get the properties of a host */ xbt_dict_t sg_host_get_properties(sg_host_t host) { xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f); - std::map* props = host->getProperties(); + std::unordered_map* props = host->get_properties(); if (props == nullptr) return nullptr; for (auto const& elm : *props) { @@ -535,13 +542,13 @@ xbt_dict_t sg_host_get_properties(sg_host_t host) return as_dict; } -/** \ingroup m_host_management - * \brief Returns the value of a given host property +/** @ingroup m_host_management + * @brief Returns the value of a given host property * - * \param host a host - * \param name a property name - * \return value of a property (or nullptr if property not set) -*/ + * @param host a host + * @param name a property name + * @return value of a property (or nullptr if property not set) + */ const char* sg_host_get_property_value(sg_host_t host, const char* name) { return host->get_property(name); @@ -553,11 +560,11 @@ void sg_host_set_property_value(sg_host_t host, const char* name, const char* va } /** - * \brief Find a route between two hosts + * @brief Find a route between two hosts * - * \param from where from - * \param to where to - * \param links [OUT] where to store the list of links (must exist, cannot be nullptr). + * @param from where from + * @param to where to + * @param links [OUT] where to store the list of links (must exist, cannot be nullptr). */ void sg_host_route(sg_host_t from, sg_host_t to, xbt_dynar_t links) { @@ -567,10 +574,10 @@ void sg_host_route(sg_host_t from, sg_host_t to, xbt_dynar_t links) xbt_dynar_push(links, &link); } /** - * \brief Find the latency of the route between two hosts + * @brief Find the latency of the route between two hosts * - * \param from where from - * \param to where to + * @param from where from + * @param to where to */ double sg_host_route_latency(sg_host_t from, sg_host_t to) { @@ -580,10 +587,10 @@ double sg_host_route_latency(sg_host_t from, sg_host_t to) return res; } /** - * \brief Find the bandwitdh of the route between two hosts + * @brief Find the bandwitdh of the route between two hosts * - * \param from where from - * \param to where to + * @param from where from + * @param to where to */ double sg_host_route_bandwidth(sg_host_t from, sg_host_t to) { @@ -603,9 +610,9 @@ double sg_host_route_bandwidth(sg_host_t from, sg_host_t to) void sg_host_dump(sg_host_t host) { XBT_INFO("Displaying host %s", host->get_cname()); - XBT_INFO(" - speed: %.0f", host->getSpeed()); + XBT_INFO(" - speed: %.0f", host->get_speed()); XBT_INFO(" - available speed: %.2f", sg_host_get_available_speed(host)); - std::map* props = host->getProperties(); + std::unordered_map* props = host->get_properties(); if (not props->empty()) { XBT_INFO(" - properties:"); @@ -615,21 +622,35 @@ void sg_host_dump(sg_host_t host) } } -/** \brief Return the list of actors attached to an host. +/** @brief Return the list of actors attached to a host. * - * \param host a host - * \param whereto a dynar in which we should push actors living on that host + * @param host a host + * @param whereto a dynar in which we should push actors living on that host */ void sg_host_get_actor_list(sg_host_t host, xbt_dynar_t whereto) { - for (auto& actor : host->extension()->process_list) { - s4u_Actor* p = actor.ciface(); - xbt_dynar_push(whereto, &p); - } + auto actors = host->get_all_actors(); + for (auto& actor : actors) + xbt_dynar_push(whereto, &actor); } sg_host_t sg_host_self() { smx_actor_t process = SIMIX_process_self(); - return (process == nullptr) ? nullptr : process->host; + return (process == nullptr) ? nullptr : process->get_host(); +} + +/* needs to be public and without simcall for exceptions and logging events */ +const char* sg_host_self_get_name() +{ + sg_host_t host = sg_host_self(); + if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process) + return ""; + + return host->get_cname(); +} + +double sg_host_load(sg_host_t host) +{ + return host->get_load(); }