X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/76d4849864c227687e17bdd93c5b1338e9b4cb50..209b2c14ca411bd87d8c1eb856cb7bf5013d76ef:/src/s4u/s4u_Host.cpp?ds=sidebyside diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index a2bd5f290c..67936f54da 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2023. 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. */ @@ -13,6 +13,7 @@ #include #include +#include "simgrid/simix.hpp" #include "src/kernel/resource/StandardLinkImpl.hpp" #include "src/kernel/resource/VirtualMachineImpl.hpp" #include "src/surf/HostImpl.hpp" @@ -20,7 +21,7 @@ #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 { @@ -28,10 +29,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) { @@ -63,7 +66,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) @@ -77,12 +80,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(); } @@ -95,7 +98,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); @@ -108,12 +111,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 : kernel::resource::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); @@ -171,11 +169,11 @@ void Host::route_to(const Host* dest, std::vector& links, double* latency 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,18 +183,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); -} -#endif - /** Get the properties assigned to a host */ const std::unordered_map* Host::get_properties() const { @@ -211,13 +197,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_object_access(pimpl_, [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_object_access(pimpl_, [this, &properties] { this->pimpl_->set_properties(properties); }); return this; } @@ -225,7 +211,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_object_access(pimpl_, [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. @@ -236,7 +222,7 @@ 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_object_access(pimpl_, [this, p] { pimpl_cpu_->set_speed_profile(p); }); return this; } @@ -261,7 +247,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_object_access(pimpl_, [this, policy, &cb] { pimpl_cpu_->set_sharing_policy(policy, cb); }); return this; } @@ -277,13 +263,14 @@ 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_object_access(pimpl_, [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_object_access(pimpl_, + [this, &speed_per_state] { pimpl_cpu_->set_pstate_speed(speed_per_state); }); return this; } @@ -296,7 +283,7 @@ std::vector Host::convert_pstate_speed_vector(const std::vector& speed_per_state) /** @brief Set the pstate at which the host should run */ Host* Host::set_pstate(unsigned long pstate_index) { - kernel::actor::simcall([this, pstate_index] { this->pimpl_cpu_->set_pstate(pstate_index); }); + kernel::actor::simcall_object_access(pimpl_, [this, pstate_index] { this->pimpl_cpu_->set_pstate(pstate_index); }); return this; } @@ -323,14 +310,14 @@ unsigned long Host::get_pstate() const Host* Host::set_factor_cb(const std::function& cb) { - kernel::actor::simcall([this, &cb] { pimpl_cpu_->set_factor_cb(cb); }); + kernel::actor::simcall_object_access(pimpl_, [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_object_access(pimpl_, [this, coords] { this->pimpl_netpoint_->set_coordinates(coords); }); return this; } std::vector Host::get_disks() const @@ -340,7 +327,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; @@ -353,37 +340,43 @@ Disk* Host::create_disk(const std::string& name, const std::string& read_bandwid try { d_read = xbt_parse_get_bandwidth("", 0, read_bandwidth, ""); } catch (const simgrid::ParseError&) { - throw std::invalid_argument(std::string("Impossible to create disk: ") + name + - std::string(". Invalid read bandwidth: ") + read_bandwidth); + throw std::invalid_argument("Impossible to create disk: " + name + ". Invalid read bandwidth: " + read_bandwidth); } double d_write; try { d_write = xbt_parse_get_bandwidth("", 0, write_bandwidth, ""); } catch (const simgrid::ParseError&) { - throw std::invalid_argument(std::string("Impossible to create disk: ") + name + - std::string(". Invalid write bandwidth: ") + write_bandwidth); + throw std::invalid_argument("Impossible to create disk: " + name + ". Invalid write bandwidth: " + write_bandwidth); } return create_disk(name, d_read, d_write); } 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 new VirtualMachine(name, this, 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 new VirtualMachine(name, this, core_amount, 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 @@ -408,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; } @@ -455,12 +448,18 @@ sg_host_t sg_host_by_name(const char* name) return simgrid::s4u::Host::by_name_or_null(name); } +/** @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) +{ + return host->vm_by_name_or_null(name); +} + // ========= Layering madness ==============* // ========== 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) { @@ -553,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_host_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_off(sg_host_t host) @@ -583,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; } @@ -659,7 +658,7 @@ void sg_host_sendto(sg_host_t from, sg_host_t to, double 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()); @@ -668,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()); } } }