X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/28c1e589d18279b654f17ff2c42acfa1936960d2..d4f45383d774dcee4a79b3ca281c6180b9005f04:/src/s4u/s4u_Host.cpp diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index e78c4eb956..68698e80c1 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.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. */ @@ -7,6 +7,7 @@ #include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Exec.hpp" +#include "src/simix/smx_private.hpp" #include "src/surf/HostImpl.hpp" #include @@ -29,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(std::string 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.c_str()); + 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); } @@ -49,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 @@ -65,26 +66,26 @@ 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_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->pimpl_cpu->turn_on(); this->pimpl_->turn_on(); @@ -187,14 +188,30 @@ std::unordered_map* Host::get_properties() } /** Retrieve the property value (or nullptr if not set) */ -const char* Host::get_property(std::string key) const +const char* Host::get_property(const std::string& key) const { 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, 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) +{ + 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 */ @@ -203,13 +220,13 @@ 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 computing speed in flops/s at the current pstate, taking the external load into account. +/** @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, then this reduces the available computing speed - * (see @ref simgrid::surf::Cpu::set_speed_trace()) + * - 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 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(). @@ -223,7 +240,9 @@ 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 { @@ -231,7 +250,7 @@ double Host::get_load() const } /** @brief Get the available speed ratio, between 0 and 1. * - * This accounts for external load (see @ref simgrid::surf::Cpu::set_speed_trace()). + * This accounts for external load (see @ref simgrid::surf::Cpu::set_speed_profile()). */ double Host::get_available_speed() const { @@ -257,7 +276,7 @@ int Host::get_pstate() const /** * @ingroup simix_storage_management - * @brief Returns the list of storages attached to an host. + * @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() const @@ -284,10 +303,16 @@ std::unordered_map const& Host::get_mounted_storages() return *mounts_; } +ExecPtr Host::exec_async(double flops) +{ + return this_actor::exec_init(flops)->set_host(this); +} + void Host::execute(double flops) { execute(flops, 1.0 /* priority */); } + void Host::execute(double flops, double priority) { this_actor::exec_init(flops)->set_host(this)->set_priority(1 / priority)->start()->wait(); @@ -342,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); @@ -358,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; } @@ -466,7 +489,7 @@ void sg_host_set_pstate(sg_host_t host, int pstate) * * @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) @@ -478,7 +501,7 @@ void sg_host_turn_on(sg_host_t host) * * @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) @@ -500,18 +523,13 @@ 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); @@ -604,7 +622,7 @@ 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 @@ -619,5 +637,20 @@ void sg_host_get_actor_list(sg_host_t host, xbt_dynar_t whereto) 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(); }