X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/485fa582bda7c51fb184bf0f82d0eb250be9f805..0a6556cf9aa3e733965b6a18574efd63b54caa0d:/src/s4u/s4u_Host.cpp diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index fba8ef40ed..4266d80987 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -1,25 +1,26 @@ -/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2022. 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/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 "src/plugins/vm/VirtualMachineImpl.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "src/kernel/resource/StandardLinkImpl.hpp" +#include "src/kernel/resource/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"); -XBT_LOG_EXTERNAL_CATEGORY(surf_route); +XBT_LOG_EXTERNAL_CATEGORY(ker_routing); namespace simgrid { @@ -27,10 +28,12 @@ template class xbt::Extendable; namespace s4u { +#ifndef DOXYGEN xbt::signal Host::on_creation; xbt::signal Host::on_destruction; xbt::signal Host::on_state_change; xbt::signal Host::on_speed_change; +#endif Host* Host::set_cpu(kernel::resource::CpuImpl* cpu) { @@ -62,7 +65,7 @@ Host::~Host() */ void Host::destroy() { - kernel::actor::simcall([this] { this->pimpl_->destroy(); }); + kernel::actor::simcall_answered([this] { this->pimpl_->destroy(); }); } Host* Host::by_name(const std::string& name) @@ -76,12 +79,12 @@ Host* Host::by_name_or_null(const std::string& name) Host* Host::current() { - kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self(); + const kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self(); xbt_assert(self != nullptr, "Cannot call Host::current() from the maestro context"); return self->get_host(); } -xbt::string const& Host::get_name() const +std::string const& Host::get_name() const { return this->pimpl_->get_name(); } @@ -94,7 +97,7 @@ const char* Host::get_cname() const void Host::turn_on() { if (not is_on()) { - kernel::actor::simcall([this] { + kernel::actor::simcall_answered([this] { this->pimpl_cpu_->turn_on(); this->pimpl_->turn_on(); on_state_change(*this); @@ -107,12 +110,7 @@ void Host::turn_off() { if (is_on()) { const kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self(); - kernel::actor::simcall([this, self] { - for (VirtualMachine* const& vm : vm::VirtualMachineImpl::allVms_) - if (vm->get_pm() == this) { - vm->shutdown(); - vm->turn_off(); - } + kernel::actor::simcall_answered([this, self] { this->pimpl_cpu_->turn_off(); this->pimpl_->turn_off(self); @@ -154,28 +152,27 @@ 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. */ void Host::route_to(const Host* dest, std::vector& links, double* latency) const { - std::vector linkImpls; + std::vector linkImpls; this->route_to(dest, linkImpls, latency); for (auto* l : linkImpls) links.push_back(l->get_iface()); } /** @brief Just like Host::routeTo, but filling an array of link implementations */ -void Host::route_to(const Host* dest, std::vector& links, double* latency) const +void Host::route_to(const Host* dest, std::vector& links, double* latency) const { kernel::routing::NetZoneImpl::get_global_route(pimpl_netpoint_, dest->get_netpoint(), links, latency); - if (XBT_LOG_ISENABLED(surf_route, xbt_log_priority_debug)) { - XBT_CDEBUG(surf_route, "Route from '%s' to '%s' (latency: %f):", get_cname(), dest->get_cname(), + if (XBT_LOG_ISENABLED(ker_routing, xbt_log_priority_debug)) { + XBT_CDEBUG(ker_routing, "Route from '%s' to '%s' (latency: %f):", get_cname(), dest->get_cname(), (latency == nullptr ? -1 : *latency)); for (auto const* link : links) - XBT_CDEBUG(surf_route, " Link '%s'", link->get_cname()); + XBT_CDEBUG(ker_routing, " Link '%s'", link->get_cname()); } } @@ -185,23 +182,6 @@ NetZone* Host::get_englobing_zone() const return pimpl_netpoint_->get_englobing_zone()->get_iface(); } -#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) // XBT_ATTRIB_DEPRECATED_v331 -{ - return Comm::sendto_async(this, dest, byte_amount); -} - -void Host::send_to(Host* dest, double byte_amount) // XBT_ATTRIB_DEPRECATED_v330 -{ - Comm::sendto(this, dest, byte_amount); -} -#endif - /** Get the properties assigned to a host */ const std::unordered_map* Host::get_properties() const { @@ -216,13 +196,13 @@ const char* Host::get_property(const std::string& key) const Host* Host::set_property(const std::string& key, const std::string& value) { - kernel::actor::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); }); + kernel::actor::simcall_answered([this, &key, &value] { this->pimpl_->set_property(key, value); }); return this; } Host* Host::set_properties(const std::unordered_map& properties) { - kernel::actor::simcall([this, &properties] { this->pimpl_->set_properties(properties); }); + kernel::actor::simcall_answered([this, &properties] { this->pimpl_->set_properties(properties); }); return this; } @@ -230,7 +210,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_answered([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. @@ -241,12 +221,12 @@ 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_answered([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); } @@ -266,7 +246,7 @@ double Host::get_available_speed() const Host* Host::set_sharing_policy(SharingPolicy policy, const s4u::NonLinearResourceCb& cb) { - kernel::actor::simcall([this, policy, &cb] { pimpl_cpu_->set_sharing_policy(policy, cb); }); + kernel::actor::simcall_answered([this, policy, &cb] { pimpl_cpu_->set_sharing_policy(policy, cb); }); return this; } @@ -282,13 +262,13 @@ int Host::get_core_count() const 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_answered([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_answered([this, &speed_per_state] { pimpl_cpu_->set_pstate_speed(speed_per_state); }); return this; } @@ -314,28 +294,28 @@ 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_answered([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(); } Host* Host::set_factor_cb(const std::function& cb) { - kernel::actor::simcall([this, &cb] { pimpl_cpu_->set_factor_cb(cb); }); + kernel::actor::simcall_answered([this, &cb] { pimpl_cpu_->set_factor_cb(cb); }); return this; } Host* Host::set_coordinates(const std::string& coords) { if (not coords.empty()) - kernel::actor::simcall([this, coords] { this->pimpl_netpoint_->set_coordinates(coords); }); + kernel::actor::simcall_answered([this, coords] { this->pimpl_netpoint_->set_coordinates(coords); }); return this; } std::vector Host::get_disks() const @@ -345,7 +325,7 @@ std::vector Host::get_disks() const Disk* Host::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) { - return kernel::actor::simcall([this, &name, read_bandwidth, write_bandwidth] { + return kernel::actor::simcall_answered([this, &name, read_bandwidth, write_bandwidth] { auto* disk = pimpl_->create_disk(name, read_bandwidth, write_bandwidth); pimpl_->add_disk(disk); return disk; @@ -373,12 +353,30 @@ Disk* Host::create_disk(const std::string& name, const std::string& read_bandwid void Host::add_disk(const Disk* disk) { - kernel::actor::simcall([this, disk] { this->pimpl_->add_disk(disk); }); + kernel::actor::simcall_answered([this, disk] { this->pimpl_->add_disk(disk); }); } void Host::remove_disk(const std::string& disk_name) { - kernel::actor::simcall([this, disk_name] { this->pimpl_->remove_disk(disk_name); }); + kernel::actor::simcall_answered([this, disk_name] { this->pimpl_->remove_disk(disk_name); }); +} + +VirtualMachine* Host::create_vm(const std::string& name, int core_amount) +{ + return kernel::actor::simcall_answered( + [this, &name, core_amount] { return this->pimpl_->create_vm(name, core_amount); }); +} + +VirtualMachine* Host::create_vm(const std::string& name, int core_amount, size_t ramsize) +{ + return kernel::actor::simcall_answered( + [this, &name, core_amount, ramsize] { return this->pimpl_->create_vm(name, core_amount, ramsize); }); +} + +VirtualMachine* Host::vm_by_name_or_null(const std::string& name) +{ + simgrid::kernel::resource::VirtualMachineImpl* vm = this->pimpl_->get_vm_by_name_or_null(name); + return vm ? vm->get_iface() : nullptr; } ExecPtr Host::exec_init(double flops) const @@ -403,7 +401,7 @@ void Host::execute(double flops, double priority) const Host* Host::seal() { - kernel::actor::simcall([this]() { this->pimpl_->seal(); }); + kernel::actor::simcall_answered([this]() { this->pimpl_->seal(); }); simgrid::s4u::Host::on_creation(*this); // notify the signal return this; } @@ -450,19 +448,10 @@ 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 +/** @brief Retrieve a VM running on a given host from its name, or return NULL if no VM matches*/ +sg_vm_t sg_vm_by_name(sg_host_t host, const char* name) { - 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; + return host->vm_by_name_or_null(name); } // ========= Layering madness ==============* @@ -470,20 +459,12 @@ xbt_dynar_t sg_hosts_as_dynar() // XBT_ATTRIB_DEPRECATED_v330 // ========== User data Layer ========== void* sg_host_get_data(const_sg_host_t host) { - return host->get_data(); + return host->get_data(); } 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) @@ -502,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_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); } @@ -547,7 +523,7 @@ unsigned long sg_host_get_nb_pstates(const_sg_host_t host) * * 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(); } @@ -555,7 +531,7 @@ int sg_host_get_pstate(const_sg_host_t host) * * 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); } @@ -606,8 +582,8 @@ xbt_dict_t sg_host_get_properties(const_sg_host_t host) 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())); + for (auto const& [key, value] : *props) { + xbt_dict_set(as_dict, key.c_str(), xbt_strdup(value.c_str())); } return as_dict; } @@ -676,28 +652,13 @@ 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); } /** @brief Displays debugging information about a host */ -void sg_host_dump(const_sg_host_t host) +void sg_host_dump(const_sg_host_t host) // XBT_ATTRIB_DEPRECATED_v335 { XBT_INFO("Displaying host %s", host->get_cname()); XBT_INFO(" - speed: %.0f", host->get_speed()); @@ -706,8 +667,8 @@ void sg_host_dump(const_sg_host_t host) if (not props->empty()) { XBT_INFO(" - properties:"); - for (auto const& elm : *props) { - XBT_INFO(" %s->%s", elm.first.c_str(), elm.second.c_str()); + for (auto const& [key, value] : *props) { + XBT_INFO(" %s->%s", key.c_str(), value.c_str()); } } } @@ -726,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(); @@ -745,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); -}