X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/68c4f3d5e544c5fe8e2a67a5607d7a268a0e59a1..d6a6f4f26c0d542e0aae18af844d28e5501fed72:/src/s4u/s4u_Host.cpp diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index 9db61956a8..12ce201b06 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -3,19 +3,19 @@ /* 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/Exception.hpp" -#include "simgrid/host.h" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/s4u/Actor.hpp" -#include "simgrid/s4u/Comm.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Exec.hpp" -#include "simgrid/s4u/VirtualMachine.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/HostImpl.hpp" -#include "xbt/parse_units.hpp" -#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_host, s4u, "Logging specific to the S4U hosts"); @@ -32,6 +32,13 @@ xbt::signal Host::on_destruction; xbt::signal Host::on_state_change; xbt::signal Host::on_speed_change; +Host* Host::set_cpu(kernel::resource::CpuImpl* cpu) +{ + pimpl_cpu_ = cpu; + return this; +} + +#ifndef DOXYGEN Host* Host::set_netpoint(kernel::routing::NetPoint* netpoint) { pimpl_netpoint_ = netpoint; @@ -42,8 +49,9 @@ Host::~Host() { if (pimpl_netpoint_ != nullptr) // not removed yet by a children class Engine::get_instance()->netpoint_unregister(pimpl_netpoint_); - delete pimpl_cpu; + delete pimpl_cpu_; } +#endif /** @brief Fire the required callbacks and destroy the object * @@ -87,7 +95,7 @@ void Host::turn_on() { if (not is_on()) { kernel::actor::simcall([this] { - this->pimpl_cpu->turn_on(); + this->pimpl_cpu_->turn_on(); this->pimpl_->turn_on(); on_state_change(*this); }); @@ -105,7 +113,7 @@ void Host::turn_off() vm->shutdown(); vm->turn_off(); } - this->pimpl_cpu->turn_off(); + this->pimpl_cpu_->turn_off(); this->pimpl_->turn_off(self); on_state_change(*this); @@ -115,12 +123,12 @@ void Host::turn_off() bool Host::is_on() const { - return this->pimpl_cpu->is_on(); + return this->pimpl_cpu_->is_on(); } -int Host::get_pstate_count() const +unsigned long Host::get_pstate_count() const { - return this->pimpl_cpu->get_pstate_count(); + return this->pimpl_cpu_->get_pstate_count(); } /** @@ -146,7 +154,6 @@ size_t Host::get_actor_count() const * @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 * * walk through the routing components tree and find a route between hosts * by calling each "get_route" function in each routing component. @@ -177,20 +184,17 @@ NetZone* Host::get_englobing_zone() const return pimpl_netpoint_->get_englobing_zone()->get_iface(); } -void Host::sendto(Host* dest, double byte_amount) // deprecated 331 +#ifndef DOXYGEN +void Host::sendto(Host* dest, double byte_amount) // XBT_ATTRIB_DEPRECATED_v331 { Comm::sendto_async(this, dest, byte_amount)->wait(); } -CommPtr Host::sendto_async(Host* dest, double byte_amount) // deprecated 331 +CommPtr Host::sendto_async(Host* dest, double byte_amount) // XBT_ATTRIB_DEPRECATED_v331 { return Comm::sendto_async(this, dest, byte_amount); } - -void Host::send_to(Host* dest, double byte_amount) // deprecated 330 -{ - Comm::sendto(this, dest, byte_amount); -} +#endif /** Get the properties assigned to a host */ const std::unordered_map* Host::get_properties() const @@ -220,7 +224,7 @@ Host* Host::set_properties(const std::unordered_map& p * The profile must contain boolean values. */ Host* Host::set_state_profile(kernel::profile::Profile* p) { - kernel::actor::simcall([this, p] { pimpl_cpu->set_state_profile(p); }); + kernel::actor::simcall([this, p] { pimpl_cpu_->set_state_profile(p); }); return this; } /** Specify a profile modeling the external load according to an exhaustive list or a stochastic law. @@ -231,43 +235,54 @@ Host* Host::set_state_profile(kernel::profile::Profile* p) */ Host* Host::set_speed_profile(kernel::profile::Profile* p) { - kernel::actor::simcall([this, p] { pimpl_cpu->set_speed_profile(p); }); + kernel::actor::simcall([this, p] { pimpl_cpu_->set_speed_profile(p); }); return this; } /** @brief Get the peak processor speed (in flops/s), at the specified pstate */ -double Host::get_pstate_speed(int pstate_index) const +double Host::get_pstate_speed(unsigned long pstate_index) const { - return this->pimpl_cpu->get_pstate_peak_speed(pstate_index); + return this->pimpl_cpu_->get_pstate_peak_speed(pstate_index); } double Host::get_speed() const { - return this->pimpl_cpu->get_speed(1.0); + return this->pimpl_cpu_->get_speed(1.0); } double Host::get_load() const { - return this->pimpl_cpu->get_load(); + return this->pimpl_cpu_->get_load(); } double Host::get_available_speed() const { - return this->pimpl_cpu->get_speed_ratio(); + return this->pimpl_cpu_->get_speed_ratio(); +} + +Host* Host::set_sharing_policy(SharingPolicy policy, const s4u::NonLinearResourceCb& cb) +{ + kernel::actor::simcall([this, policy, &cb] { pimpl_cpu_->set_sharing_policy(policy, cb); }); + return this; +} + +Host::SharingPolicy Host::get_sharing_policy() const +{ + return this->pimpl_cpu_->get_sharing_policy(); } int Host::get_core_count() const { - return this->pimpl_cpu->get_core_count(); + return this->pimpl_cpu_->get_core_count(); } Host* Host::set_core_count(int core_count) { - kernel::actor::simcall([this, core_count] { this->pimpl_cpu->set_core_count(core_count); }); + kernel::actor::simcall([this, core_count] { this->pimpl_cpu_->set_core_count(core_count); }); return this; } Host* Host::set_pstate_speed(const std::vector& speed_per_state) { - kernel::actor::simcall([this, &speed_per_state] { pimpl_cpu->set_pstate_speed(speed_per_state); }); + kernel::actor::simcall([this, &speed_per_state] { pimpl_cpu_->set_pstate_speed(speed_per_state); }); return this; } @@ -293,16 +308,22 @@ Host* Host::set_pstate_speed(const std::vector& speed_per_state) } /** @brief Set the pstate at which the host should run */ -Host* Host::set_pstate(int pstate_index) +Host* Host::set_pstate(unsigned long pstate_index) { - kernel::actor::simcall([this, pstate_index] { this->pimpl_cpu->set_pstate(pstate_index); }); + kernel::actor::simcall([this, pstate_index] { this->pimpl_cpu_->set_pstate(pstate_index); }); return this; } /** @brief Retrieve the pstate at which the host is currently running */ -int Host::get_pstate() const +unsigned long Host::get_pstate() const { - return this->pimpl_cpu->get_pstate(); + return this->pimpl_cpu_->get_pstate(); +} + +Host* Host::set_factor_cb(const std::function& cb) +{ + kernel::actor::simcall([this, &cb] { pimpl_cpu_->set_factor_cb(cb); }); + return this; } Host* Host::set_coordinates(const std::string& coords) @@ -354,6 +375,16 @@ void Host::remove_disk(const std::string& disk_name) kernel::actor::simcall([this, disk_name] { this->pimpl_->remove_disk(disk_name); }); } +VirtualMachine* Host::create_vm(const std::string& name, int core_amount) +{ + return new VirtualMachine(name, this, core_amount); +} + +VirtualMachine* Host::create_vm(const std::string& name, int core_amount, size_t ramsize) +{ + return new VirtualMachine(name, this, core_amount, ramsize); +} + ExecPtr Host::exec_init(double flops) const { return this_actor::exec_init(flops); @@ -423,21 +454,6 @@ sg_host_t sg_host_by_name(const char* name) return simgrid::s4u::Host::by_name_or_null(name); } -xbt_dynar_t sg_hosts_as_dynar() // XBT_ATTRIB_DEPRECATED_v330 -{ - std::vector list = simgrid::s4u::Engine::get_instance()->get_all_hosts(); - - auto last = std::remove_if(begin(list), end(list), [](const simgrid::s4u::Host* host) { - return not host || not host->get_netpoint() || not host->get_netpoint()->is_host(); - }); - std::sort(begin(list), last, - [](const simgrid::s4u::Host* a, const simgrid::s4u::Host* b) { return a->get_name() < b->get_name(); }); - - xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr); - std::for_each(begin(list), last, [res](sg_host_t host) { xbt_dynar_push_as(res, sg_host_t, host); }); - return res; -} - // ========= Layering madness ==============* // ========== User data Layer ========== @@ -449,14 +465,6 @@ void sg_host_set_data(sg_host_t host, void* userdata) { host->set_data(userdata); } -void* sg_host_data(const_sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330 -{ - return sg_host_get_data(host); -} -void sg_host_data_set(sg_host_t host, void* userdata) // XBT_ATTRIB_DEPRECATED_v330 -{ - sg_host_set_data(host, userdata); -} // ========= Disk related functions ============ void sg_host_get_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** disks) @@ -475,18 +483,13 @@ double sg_host_get_speed(const_sg_host_t host) return host->get_speed(); } -double sg_host_speed(const_sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330 -{ - return sg_host_get_speed(host); -} - -/** @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_host_energy. * * @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(const_sg_host_t host, int pstate_index) +double sg_host_get_pstate_speed(const_sg_host_t host, unsigned long pstate_index) { return host->get_pstate_speed(pstate_index); } @@ -509,26 +512,26 @@ double sg_host_get_available_speed(const_sg_host_t host) /** @brief Returns the number of power states for a host. * - * See also @ref plugin_energy. + * See also @ref plugin_host_energy. */ -int sg_host_get_nb_pstates(const_sg_host_t host) +unsigned long sg_host_get_nb_pstates(const_sg_host_t host) { return host->get_pstate_count(); } /** @brief Gets the pstate at which that host currently runs. * - * See also @ref plugin_energy. + * See also @ref plugin_host_energy. */ -int sg_host_get_pstate(const_sg_host_t host) +unsigned long sg_host_get_pstate(const_sg_host_t host) { return host->get_pstate(); } /** @brief Sets the pstate at which that host should run. * - * See also @ref plugin_energy. + * See also @ref plugin_host_energy. */ -void sg_host_set_pstate(sg_host_t host, int pstate) +void sg_host_set_pstate(sg_host_t host, unsigned long pstate) { host->set_pstate(pstate); } @@ -537,7 +540,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() 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_host_energy * for more info on DVFS. */ void sg_host_turn_on(sg_host_t host) @@ -549,7 +552,7 @@ void sg_host_turn_on(sg_host_t host) * * @brief Stop the host if it is on * - * See also #MSG_host_is_on() 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_host_energy * for more info on DVFS. */ void sg_host_turn_off(sg_host_t host) @@ -560,8 +563,8 @@ void sg_host_turn_off(sg_host_t host) /** @ingroup m_host_management * @brief Determine if a host is up and running. * - * 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. + * See also #sg_host_turn_on() and #sg_host_turn_off() to switch the host ON and OFF and @ref plugin_host_energy for + * more info on DVFS. * * @param host host to test * @return Returns true if the host is up and running, and false if it's currently down @@ -649,21 +652,6 @@ double sg_host_get_route_bandwidth(const_sg_host_t from, const_sg_host_t to) return min_bandwidth; } -void sg_host_route(const_sg_host_t from, const_sg_host_t to, xbt_dynar_t links) // XBT_ATTRIB_DEPRECATED_v330 -{ - sg_host_get_route(from, to, links); -} - -double sg_host_route_latency(const_sg_host_t from, const_sg_host_t to) // XBT_ATTRIB_DEPRECATED_v330 -{ - return sg_host_get_route_latency(from, to); -} - -double sg_host_route_bandwidth(const_sg_host_t from, const_sg_host_t to) // XBT_ATTRIB_DEPRECATED_v330 -{ - return sg_host_get_route_bandwidth(from, to); -} - void sg_host_sendto(sg_host_t from, sg_host_t to, double byte_amount) { simgrid::s4u::Comm::sendto(from, to, byte_amount); @@ -699,14 +687,14 @@ void sg_host_get_actor_list(const_sg_host_t host, xbt_dynar_t whereto) sg_host_t sg_host_self() { - return SIMIX_is_maestro() ? nullptr : simgrid::kernel::actor::ActorImpl::self()->get_host(); + return simgrid::s4u::Actor::is_maestro() ? nullptr : simgrid::kernel::actor::ActorImpl::self()->get_host(); } /* needs to be public and without simcall for exceptions and logging events */ const char* sg_host_self_get_name() { const char* res = ""; - if (not SIMIX_is_maestro()) { + if (not simgrid::s4u::Actor::is_maestro()) { const simgrid::s4u::Host* host = simgrid::kernel::actor::ActorImpl::self()->get_host(); if (host != nullptr) res = host->get_cname(); @@ -718,8 +706,3 @@ double sg_host_get_load(const_sg_host_t host) { return host->get_load(); } - -double sg_host_load(const_sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330 -{ - return sg_host_get_load(host); -}