X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/554f67929e499dfdcc3a4e2cb2a644ce066d0e68..040d8fa855d2b6ac9884f68108a09b935570be21:/src/s4u/s4u_Host.cpp diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index 702b1c8867..17b7f43941 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -1,21 +1,26 @@ -/* Copyright (c) 2006-2020. 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/kernel/routing/NetPoint.hpp" -#include "simgrid/s4u/Actor.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 #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,23 +33,26 @@ xbt::signal Host::on_destruction; xbt::signal Host::on_state_change; xbt::signal Host::on_speed_change; -Host::Host(const std::string& name) : name_(name) +Host* Host::set_cpu(kernel::resource::CpuImpl* cpu) { - xbt_assert(Host::by_name_or_null(name_) == nullptr, "Refusing to create a second host named '%s'.", get_cname()); - Engine::get_instance()->host_register(name_, this); - new surf::HostImpl(this); + pimpl_cpu_ = cpu; + return this; } -Host::~Host() +#ifndef DOXYGEN +Host* Host::set_netpoint(kernel::routing::NetPoint* netpoint) { - xbt_assert(currently_destroying_, "Please call h->destroy() instead of manually deleting it."); + pimpl_netpoint_ = netpoint; + return this; +} - delete pimpl_; +Host::~Host() +{ if (pimpl_netpoint_ != nullptr) // not removed yet by a children class Engine::get_instance()->netpoint_unregister(pimpl_netpoint_); - delete pimpl_cpu; - delete mounts_; + delete pimpl_cpu_; } +#endif /** @brief Fire the required callbacks and destroy the object * @@ -55,12 +63,7 @@ Host::~Host() */ void Host::destroy() { - if (not currently_destroying_) { - currently_destroying_ = true; - on_destruction(*this); - Engine::get_instance()->host_unregister(std::string(name_)); - delete this; - } + kernel::actor::simcall([this] { this->pimpl_->destroy(); }); } Host* Host::by_name(const std::string& name) @@ -75,16 +78,25 @@ Host* Host::by_name_or_null(const std::string& name) Host* Host::current() { kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self(); - if (self == nullptr) - xbt_die("Cannot call Host::current() from the maestro context"); + xbt_assert(self != nullptr, "Cannot call Host::current() from the maestro context"); return self->get_host(); } +xbt::string const& Host::get_name() const +{ + return this->pimpl_->get_name(); +} + +const char* Host::get_cname() const +{ + return this->pimpl_->get_cname(); +} + 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); }); @@ -95,14 +107,14 @@ void Host::turn_on() void Host::turn_off() { if (is_on()) { - kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self(); + const kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self(); kernel::actor::simcall([this, self] { - for (VirtualMachine* const& vm : vm::VirtualMachineImpl::allVms_) + for (VirtualMachine* const& vm : kernel::resource::VirtualMachineImpl::allVms_) if (vm->get_pm() == this) { vm->shutdown(); vm->turn_off(); } - this->pimpl_cpu->turn_off(); + this->pimpl_cpu_->turn_off(); this->pimpl_->turn_off(self); on_state_change(*this); @@ -112,12 +124,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(); } /** @@ -131,7 +143,7 @@ std::vector Host::get_all_actors() const } /** @brief Returns how many actors (daemonized or not) have been launched on this host */ -int Host::get_actor_count() const +size_t Host::get_actor_count() const { return pimpl_->get_actor_count(); } @@ -143,49 +155,47 @@ int 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 (kernel::resource::LinkImpl* const& l : linkImpls) + 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()); + for (auto const* link : links) + XBT_CDEBUG(ker_routing, " Link '%s'", link->get_cname()); } } /** @brief Returns the networking zone englobing that host */ -NetZone* Host::get_englobing_zone() +NetZone* Host::get_englobing_zone() const { return pimpl_netpoint_->get_englobing_zone()->get_iface(); } -void Host::sendto(Host* dest, double byte_amount) +#ifndef DOXYGEN +void Host::sendto(Host* dest, double byte_amount) // XBT_ATTRIB_DEPRECATED_v331 { - sendto_async(dest, byte_amount)->wait(); + Comm::sendto_async(this, dest, byte_amount)->wait(); } -ActivityPtr Host::sendto_async(Host* dest, double byte_amount) +CommPtr Host::sendto_async(Host* dest, double byte_amount) // XBT_ATTRIB_DEPRECATED_v331 { - std::vector m_host_list = {this, dest}; - std::vector flops_amount = {0, 0}; - std::vector bytes_amount = {0, byte_amount, 0, 0}; - return this_actor::exec_init(m_host_list, flops_amount, bytes_amount)->start(); + return Comm::sendto_async(this, dest, byte_amount); } +#endif /** Get the properties assigned to a host */ const std::unordered_map* Host::get_properties() const @@ -199,74 +209,164 @@ const char* Host::get_property(const std::string& key) const return this->pimpl_->get_property(key); } -void Host::set_property(const std::string& key, const std::string& value) +Host* Host::set_property(const std::string& key, const std::string& value) { kernel::actor::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); }); + return this; } -void Host::set_properties(const std::unordered_map& properties) +Host* Host::set_properties(const std::unordered_map& properties) { kernel::actor::simcall([this, &properties] { this->pimpl_->set_properties(properties); }); + return this; } -/** Specify a profile turning the host on and off according to a exhaustive list or a stochastic law. +/** Specify a profile turning the host on and off according to an exhaustive list or a stochastic law. * The profile must contain boolean values. */ -void Host::set_state_profile(kernel::profile::Profile* p) +Host* Host::set_state_profile(kernel::profile::Profile* p) { - return 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 a exhaustive list or a stochastic law. +/** Specify a profile modeling the external load according to an 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) +Host* Host::set_speed_profile(kernel::profile::Profile* p) { - return 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); }); + 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); }); + return this; +} + +std::vector Host::convert_pstate_speed_vector(const std::vector& speed_per_state) +{ + std::vector speed_list; + speed_list.reserve(speed_per_state.size()); + for (const auto& speed_str : speed_per_state) { + try { + double speed = xbt_parse_get_speed("", 0, speed_str, ""); + speed_list.push_back(speed); + } catch (const simgrid::ParseError&) { + throw std::invalid_argument(std::string("Invalid speed value: ") + speed_str); + } + } + return speed_list; +} + +Host* Host::set_pstate_speed(const std::vector& speed_per_state) +{ + set_pstate_speed(Host::convert_pstate_speed_vector(speed_per_state)); + return this; } /** @brief Set the pstate at which the host should run */ -void 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) +{ + if (not coords.empty()) + kernel::actor::simcall([this, coords] { this->pimpl_netpoint_->set_coordinates(coords); }); + return this; +} std::vector Host::get_disks() const { - return kernel::actor::simcall([this] { return this->pimpl_->get_disks(); }); + return this->pimpl_->get_disks(); +} + +Disk* Host::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) +{ + return kernel::actor::simcall([this, &name, read_bandwidth, write_bandwidth] { + auto* disk = pimpl_->create_disk(name, read_bandwidth, write_bandwidth); + pimpl_->add_disk(disk); + return disk; + }); +} + +Disk* Host::create_disk(const std::string& name, const std::string& read_bandwidth, const std::string& write_bandwidth) +{ + double d_read; + 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); + } + 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); + } + return create_disk(name, d_read, d_write); } -void Host::add_disk(Disk* disk) +void Host::add_disk(const Disk* disk) { kernel::actor::simcall([this, disk] { this->pimpl_->add_disk(disk); }); } @@ -275,30 +375,27 @@ void Host::remove_disk(const std::string& disk_name) { kernel::actor::simcall([this, disk_name] { this->pimpl_->remove_disk(disk_name); }); } -/** - * @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() const + +VirtualMachine* Host::create_vm(const std::string& name, int core_amount) { - return kernel::actor::simcall([this] { return this->pimpl_->get_attached_storages(); }); + return new VirtualMachine(name, this, core_amount); } -std::unordered_map const& Host::get_mounted_storages() +VirtualMachine* Host::create_vm(const std::string& name, int core_amount, size_t ramsize) { - kernel::actor::simcall([this] { - if (mounts_ == nullptr) - mounts_ = pimpl_->get_mounted_storages(); - }); - return *mounts_; + return new VirtualMachine(name, this, core_amount, ramsize); } -ExecPtr Host::exec_async(double flops) const +ExecPtr Host::exec_init(double flops) const { return this_actor::exec_init(flops); } +ExecPtr Host::exec_async(double flops) const +{ + return this_actor::exec_async(flops); +} + void Host::execute(double flops) const { execute(flops, 1.0 /* priority */); @@ -306,7 +403,14 @@ void Host::execute(double flops) const void Host::execute(double flops, double priority) const { - this_actor::exec_init(flops)->set_priority(1 / priority)->start()->wait(); + this_actor::exec_init(flops)->set_priority(1 / priority)->vetoable_start()->wait(); +} + +Host* Host::seal() +{ + kernel::actor::simcall([this]() { this->pimpl_->seal(); }); + simgrid::s4u::Host::on_creation(*this); // notify the signal + return this; } } // namespace s4u @@ -320,12 +424,13 @@ size_t sg_host_count() sg_host_t* sg_host_list() { const simgrid::s4u::Engine* e = simgrid::s4u::Engine::get_instance(); - size_t host_count = e->get_host_count(); + size_t host_count = e->get_host_count(); + xbt_assert(host_count > 0, "There is no host!"); std::vector hosts = e->get_all_hosts(); - sg_host_t* res = xbt_new(sg_host_t, hosts.size()); - memcpy(res, hosts.data(), sizeof(sg_host_t) * hosts.size()); + auto* res = xbt_new(sg_host_t, hosts.size()); + std::copy(begin(hosts), end(hosts), res); return res; } @@ -350,92 +455,42 @@ 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 ========== -void* sg_host_data(const_sg_host_t host) +void* sg_host_get_data(const_sg_host_t host) { return host->get_data(); } -void sg_host_data_set(sg_host_t host, void* userdata) +void sg_host_set_data(sg_host_t host, void* userdata) { host->set_data(userdata); } -void* sg_host_user(sg_host_t host) // deprecated -{ - return host->get_data(); -} -void sg_host_user_set(sg_host_t host, void* userdata) // deprecated -{ - host->set_data(userdata); -} -void sg_host_user_destroy(sg_host_t host) // deprecated -{ - host->set_data(nullptr); -} -// ========= storage related functions ============ -void sg_host_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** disks) +// ========= Disk related functions ============ +void sg_host_get_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** disks) { std::vector list = host->get_disks(); *disk_count = list.size(); - *disks = static_cast(xbt_malloc(sizeof(sg_disk_t) * (*disk_count))); - for (size_t i = 0; i < *disk_count; i++) - (*disks)[i] = list[i]; -} - -xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330 -{ - xbt_assert((host != nullptr), "Invalid parameters"); - xbt_dict_t res = xbt_dict_new_homogeneous(nullptr); - for (auto const& elm : host->get_mounted_storages()) { - const char* mount_name = elm.first.c_str(); - const simgrid::s4u::Storage* storage = elm.second; - xbt_dict_set(res, mount_name, (void*)storage->get_cname()); - } - - return res; -} - -xbt_dynar_t sg_host_get_attached_storage_list(const_sg_host_t host) -{ - xbt_dynar_t storage_dynar = xbt_dynar_new(sizeof(const char*), nullptr); - std::vector storage_vector = host->get_attached_storages(); - for (auto const& name : storage_vector) - xbt_dynar_push(storage_dynar, &name); - return storage_dynar; + *disks = xbt_new(sg_disk_t, list.size()); + std::copy(begin(list), end(list), *disks); } // =========== user-level functions =============== // ================================================ /** @brief Returns the total speed of a host */ -double sg_host_speed(const_sg_host_t host) +double sg_host_get_speed(const_sg_host_t host) { 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_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); } @@ -458,26 +513,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); } @@ -486,7 +541,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) @@ -498,7 +553,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) @@ -509,8 +564,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 @@ -523,8 +578,9 @@ int sg_host_is_on(const_sg_host_t host) /** @brief Get the properties of a host */ xbt_dict_t sg_host_get_properties(const_sg_host_t host) { - xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f); const std::unordered_map* props = host->get_properties(); + xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f); + if (props == nullptr) return nullptr; for (auto const& elm : *props) { @@ -557,7 +613,7 @@ void sg_host_set_property_value(sg_host_t host, const char* name, const char* va * @param to where to * @param links [OUT] where to store the list of links (must exist, cannot be nullptr). */ -void sg_host_route(const_sg_host_t from, const_sg_host_t to, xbt_dynar_t links) +void sg_host_get_route(const_sg_host_t from, const_sg_host_t to, xbt_dynar_t links) { std::vector vlinks; from->route_to(to, vlinks, nullptr); @@ -570,7 +626,7 @@ void sg_host_route(const_sg_host_t from, const_sg_host_t to, xbt_dynar_t links) * @param from where from * @param to where to */ -double sg_host_route_latency(const_sg_host_t from, const_sg_host_t to) +double sg_host_get_route_latency(const_sg_host_t from, const_sg_host_t to) { std::vector vlinks; double res = 0; @@ -583,7 +639,7 @@ double sg_host_route_latency(const_sg_host_t from, const_sg_host_t to) * @param from where from * @param to where to */ -double sg_host_route_bandwidth(const_sg_host_t from, const_sg_host_t to) +double sg_host_get_route_bandwidth(const_sg_host_t from, const_sg_host_t to) { double min_bandwidth = -1.0; @@ -599,7 +655,7 @@ double sg_host_route_bandwidth(const_sg_host_t from, const_sg_host_t to) void sg_host_sendto(sg_host_t from, sg_host_t to, double byte_amount) { - from->sendto(to, byte_amount); + simgrid::s4u::Comm::sendto(from, to, byte_amount); } /** @brief Displays debugging information about a host */ @@ -632,14 +688,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(); @@ -647,7 +703,7 @@ const char* sg_host_self_get_name() return res; } -double sg_host_load(const_sg_host_t host) +double sg_host_get_load(const_sg_host_t host) { return host->get_load(); }