X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4dac6adc7601ff45e1bb458032c95fab5c73721d..4bc8b4b0f3d739752d1d7950cc5383b2d5b63bb0:/src/s4u/s4u_Host.cpp diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp index db85aa3ec9..a4aad5cccf 100644 --- a/src/s4u/s4u_Host.cpp +++ b/src/s4u/s4u_Host.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2020. 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. */ @@ -9,7 +9,6 @@ #include "simgrid/s4u/Exec.hpp" #include "simgrid/s4u/VirtualMachine.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" -#include "src/simix/smx_private.hpp" #include "src/surf/HostImpl.hpp" #include @@ -18,12 +17,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_host, s4u, "Logging specific to the S4U hosts"); XBT_LOG_EXTERNAL_CATEGORY(surf_route); -int USER_HOST_LEVEL = -1; - namespace simgrid { -namespace xbt { -template class Extendable; -} // namespace xbt + +template class xbt::Extendable; namespace s4u { @@ -44,8 +40,8 @@ Host::~Host() xbt_assert(currently_destroying_, "Please call h->destroy() instead of manually deleting it."); delete pimpl_; - if (pimpl_netpoint != nullptr) // not removed yet by a children class - Engine::get_instance()->netpoint_unregister(pimpl_netpoint); + if (pimpl_netpoint_ != nullptr) // not removed yet by a children class + Engine::get_instance()->netpoint_unregister(pimpl_netpoint_); delete pimpl_cpu; delete mounts_; } @@ -54,7 +50,7 @@ Host::~Host() * * 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 + * This is cumbersome but this is the simplest solution to ensure that the on_destruction() callback receives a valid * object (because of the destructor order in a class hierarchy). */ void Host::destroy() @@ -78,7 +74,7 @@ Host* Host::by_name_or_null(const std::string& name) Host* Host::current() { - kernel::actor::ActorImpl* self = SIMIX_process_self(); + kernel::actor::ActorImpl* self = kernel::actor::ActorImpl::self(); if (self == nullptr) xbt_die("Cannot call Host::current() from the maestro context"); return self->get_host(); @@ -87,7 +83,7 @@ Host* Host::current() void Host::turn_on() { if (not is_on()) { - simix::simcall([this] { + kernel::actor::simcall([this] { this->pimpl_cpu->turn_on(); this->pimpl_->turn_on(); on_state_change(*this); @@ -99,14 +95,15 @@ void Host::turn_on() void Host::turn_off() { if (is_on()) { - simix::simcall([this] { + 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(); } this->pimpl_cpu->turn_off(); - this->pimpl_->turn_off(); + this->pimpl_->turn_off(self); on_state_change(*this); }); @@ -128,13 +125,13 @@ int Host::get_pstate_count() const * * Daemons and regular actors are all mixed in this list. */ -std::vector Host::get_all_actors() +std::vector Host::get_all_actors() const { return pimpl_->get_all_actors(); } /** @brief Returns how many actors (daemonized or not) have been launched on this host */ -int Host::get_actor_count() +int Host::get_actor_count() const { return pimpl_->get_actor_count(); } @@ -151,18 +148,18 @@ int Host::get_actor_count() * 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(Host* dest, std::vector& links, double* latency) +void Host::route_to(const Host* dest, std::vector& links, double* latency) const { std::vector linkImpls; this->route_to(dest, linkImpls, latency); for (kernel::resource::LinkImpl* const& l : linkImpls) - links.push_back(&l->piface_); + links.push_back(l->get_iface()); } /** @brief Just like Host::routeTo, but filling an array of link implementations */ -void Host::route_to(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->pimpl_netpoint, links, latency); + 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(), (latency == nullptr ? -1 : *latency)); @@ -174,15 +171,20 @@ void Host::route_to(Host* dest, std::vector& links, /** @brief Returns the networking zone englobing that host */ NetZone* Host::get_englobing_zone() { - return pimpl_netpoint->get_englobing_zone()->get_iface(); + return pimpl_netpoint_->get_englobing_zone()->get_iface(); +} + +void Host::sendto(Host* dest, double byte_amount) +{ + sendto_async(dest, byte_amount)->wait(); } -void Host::send_to(Host* dest, double byte_amount) +ActivityPtr Host::sendto_async(Host* dest, double byte_amount) { std::vector m_host_list = {this, dest}; std::vector flops_amount = {0, 0}; std::vector bytes_amount = {0, byte_amount, 0, 0}; - this_actor::parallel_execute(m_host_list, flops_amount, bytes_amount); + return this_actor::exec_init(m_host_list, flops_amount, bytes_amount)->start(); } /** Get the properties assigned to a host */ @@ -199,19 +201,19 @@ const char* Host::get_property(const std::string& key) const void Host::set_property(const std::string& key, const std::string& value) { - simix::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); }); + kernel::actor::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); }); } void Host::set_properties(const std::map& properties) { - simix::simcall([this, &properties] { this->pimpl_->set_properties(properties); }); + kernel::actor::simcall([this, &properties] { this->pimpl_->set_properties(properties); }); } /** 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 simix::simcall([this, p] { pimpl_cpu->set_state_profile(p); }); + return kernel::actor::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. * @@ -221,7 +223,7 @@ void Host::set_state_profile(kernel::profile::Profile* p) */ void Host::set_speed_profile(kernel::profile::Profile* p) { - return simix::simcall([this, p] { pimpl_cpu->set_speed_profile(p); }); + return kernel::actor::simcall([this, p] { pimpl_cpu->set_speed_profile(p); }); } /** @brief Get the peak processor speed (in flops/s), at the specified pstate */ @@ -230,44 +232,19 @@ double Host::get_pstate_speed(int pstate_index) const return this->pimpl_cpu->get_pstate_peak_speed(pstate_index); } -/** @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 (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(). - * - * The host may have multiple cores, and your executions may be able to use more than a single core. - * - * Finally, executions of priority 2 get twice the amount of flops than executions of priority 1. - */ 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 { return this->pimpl_cpu->get_load(); } -/** @brief Get the available speed ratio, between 0 and 1. - * - * This accounts for external load (see @ref simgrid::surf::Cpu::set_speed_profile()). - */ double Host::get_available_speed() const { return this->pimpl_cpu->get_speed_ratio(); } -/** @brief Returns the number of core of the processor. */ int Host::get_core_count() const { return this->pimpl_cpu->get_core_count(); @@ -276,7 +253,7 @@ int Host::get_core_count() const /** @brief Set the pstate at which the host should run */ void Host::set_pstate(int pstate_index) { - simix::simcall([this, pstate_index] { this->pimpl_cpu->set_pstate(pstate_index); }); + kernel::actor::simcall([this, pstate_index] { this->pimpl_cpu->set_pstate(pstate_index); }); } /** @brief Retrieve the pstate at which the host is currently running */ int Host::get_pstate() const @@ -284,6 +261,20 @@ int Host::get_pstate() const return this->pimpl_cpu->get_pstate(); } +std::vector Host::get_disks() const +{ + return kernel::actor::simcall([this] { return this->pimpl_->get_disks(); }); +} + +void Host::add_disk(Disk* disk) +{ + kernel::actor::simcall([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); }); +} /** * @ingroup simix_storage_management * @brief Returns the list of storages attached to a host. @@ -291,17 +282,14 @@ int Host::get_pstate() const */ std::vector Host::get_attached_storages() const { - return simix::simcall([this] { return this->pimpl_->get_attached_storages(); }); + return kernel::actor::simcall([this] { return this->pimpl_->get_attached_storages(); }); } std::unordered_map const& Host::get_mounted_storages() { - if (mounts_ == nullptr) { - mounts_ = new std::unordered_map(); - for (auto const& m : this->pimpl_->storage_) { - mounts_->insert({m.first, &m.second->piface_}); - } - } + if (mounts_ == nullptr) + mounts_ = pimpl_->get_mounted_storages(); + return *mounts_; } @@ -328,20 +316,12 @@ size_t sg_host_count() { return simgrid::s4u::Engine::get_instance()->get_host_count(); } -/** @brief Returns the host list - * - * Uses sg_host_count() to know the array size. - * - * @return an array of @ref sg_host_t containing all the hosts in the platform. - * @remark The host order in this array is generally different from the - * creation/declaration order in the XML platform (we use a hash table - * internally). - * @see sg_host_count() - */ sg_host_t* sg_host_list() { - xbt_assert(sg_host_count() > 0, "There is no host!"); - std::vector hosts = simgrid::s4u::Engine::get_instance()->get_all_hosts(); + simgrid::s4u::Engine* e = simgrid::s4u::Engine::get_instance(); + 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()); @@ -349,12 +329,12 @@ sg_host_t* sg_host_list() return res; } -const char* sg_host_get_name(sg_host_t host) +const char* sg_host_get_name(const_sg_host_t host) { return host->get_cname(); } -void* sg_host_extension_get(sg_host_t host, size_t ext) +void* sg_host_extension_get(const_sg_host_t host, size_t ext) { return host->extension(ext); } @@ -374,7 +354,7 @@ xbt_dynar_t sg_hosts_as_dynar() 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->pimpl_netpoint || not host->pimpl_netpoint->is_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(); }); @@ -387,34 +367,51 @@ xbt_dynar_t sg_hosts_as_dynar() // ========= Layering madness ==============* // ========== User data Layer ========== -void* sg_host_user(sg_host_t host) +void* sg_host_data(const_sg_host_t host) +{ + return host->get_data(); +} +void sg_host_data_set(sg_host_t host, void* userdata) +{ + host->set_data(userdata); +} +void* sg_host_user(sg_host_t host) // deprecated { - return host->extension(USER_HOST_LEVEL); + return host->get_data(); } -void sg_host_user_set(sg_host_t host, void* userdata) +void sg_host_user_set(sg_host_t host, void* userdata) // deprecated { - host->extension_set(USER_HOST_LEVEL, userdata); + host->set_data(userdata); } -void sg_host_user_destroy(sg_host_t host) +void sg_host_user_destroy(sg_host_t host) // deprecated { - host->extension_set(USER_HOST_LEVEL, nullptr); + host->set_data(nullptr); } // ========= storage related functions ============ -xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host) +void sg_host_disks(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(); - sg_storage_t storage = elm.second; - xbt_dict_set(res, mount_name, (void*)storage->get_cname(), nullptr); + 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(sg_host_t host) +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(); @@ -426,7 +423,7 @@ xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host) // =========== user-level functions =============== // ================================================ /** @brief Returns the total speed of a host */ -double sg_host_speed(sg_host_t host) +double sg_host_speed(const_sg_host_t host) { return host->get_speed(); } @@ -437,7 +434,7 @@ double sg_host_speed(sg_host_t host) * @param pstate_index pstate to test * @return Returns the processor speed associated with pstate_index */ -double sg_host_get_pstate_speed(sg_host_t host, int pstate_index) +double sg_host_get_pstate_speed(const_sg_host_t host, int pstate_index) { return host->get_pstate_speed(pstate_index); } @@ -448,12 +445,12 @@ double sg_host_get_pstate_speed(sg_host_t host, int pstate_index) * @param host a host * @return the number of cores */ -int sg_host_core_count(sg_host_t host) +int sg_host_core_count(const_sg_host_t host) { return host->get_core_count(); } -double sg_host_get_available_speed(sg_host_t host) +double sg_host_get_available_speed(const_sg_host_t host) { return host->get_available_speed(); } @@ -462,7 +459,7 @@ double sg_host_get_available_speed(sg_host_t host) * * See also @ref plugin_energy. */ -int sg_host_get_nb_pstates(sg_host_t host) +int sg_host_get_nb_pstates(const_sg_host_t host) { return host->get_pstate_count(); } @@ -471,7 +468,7 @@ int sg_host_get_nb_pstates(sg_host_t host) * * See also @ref plugin_energy. */ -int sg_host_get_pstate(sg_host_t host) +int sg_host_get_pstate(const_sg_host_t host) { return host->get_pstate(); } @@ -517,26 +514,20 @@ void sg_host_turn_off(sg_host_t host) * @param host host to test * @return Returns true if the host is up and running, and false if it's currently down */ -int sg_host_is_on(sg_host_t host) +int sg_host_is_on(const_sg_host_t host) { return host->is_on(); } -/** @deprecated */ -int sg_host_is_off(sg_host_t host) -{ - return not host->is_on(); -} - /** @brief Get the properties of a host */ -xbt_dict_t sg_host_get_properties(sg_host_t 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(); 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()), nullptr); + xbt_dict_set(as_dict, elm.first.c_str(), xbt_strdup(elm.second.c_str())); } return as_dict; } @@ -548,7 +539,7 @@ xbt_dict_t sg_host_get_properties(sg_host_t host) * @param name a property name * @return value of a property (or nullptr if property not set) */ -const char* sg_host_get_property_value(sg_host_t host, const char* name) +const char* sg_host_get_property_value(const_sg_host_t host, const char* name) { return host->get_property(name); } @@ -565,7 +556,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(sg_host_t from, sg_host_t to, xbt_dynar_t links) +void sg_host_route(const_sg_host_t from, const_sg_host_t to, xbt_dynar_t links) { std::vector vlinks; from->route_to(to, vlinks, nullptr); @@ -578,7 +569,7 @@ void sg_host_route(sg_host_t from, sg_host_t to, xbt_dynar_t links) * @param from where from * @param to where to */ -double sg_host_route_latency(sg_host_t from, sg_host_t to) +double sg_host_route_latency(const_sg_host_t from, const_sg_host_t to) { std::vector vlinks; double res = 0; @@ -586,12 +577,12 @@ double sg_host_route_latency(sg_host_t from, sg_host_t to) return res; } /** - * @brief Find the bandwitdh of the route between two hosts + * @brief Find the bandwidth of the route between two hosts * * @param from where from * @param to where to */ -double sg_host_route_bandwidth(sg_host_t from, sg_host_t to) +double sg_host_route_bandwidth(const_sg_host_t from, const_sg_host_t to) { double min_bandwidth = -1.0; @@ -605,13 +596,13 @@ double sg_host_route_bandwidth(sg_host_t from, sg_host_t to) return min_bandwidth; } -void sg_host_send_to(sg_host_t from, sg_host_t to, double byte_amount) +void sg_host_sendto(sg_host_t from, sg_host_t to, double byte_amount) { - from->send_to(to, byte_amount); + from->sendto(to, byte_amount); } /** @brief Displays debugging information about a host */ -void sg_host_dump(sg_host_t host) +void sg_host_dump(const_sg_host_t host) { XBT_INFO("Displaying host %s", host->get_cname()); XBT_INFO(" - speed: %.0f", host->get_speed()); @@ -631,30 +622,31 @@ void sg_host_dump(sg_host_t host) * @param host a host * @param whereto a dynar in which we should push actors living on that host */ -void sg_host_get_actor_list(sg_host_t host, xbt_dynar_t whereto) +void sg_host_get_actor_list(const_sg_host_t host, xbt_dynar_t whereto) { - auto actors = host->get_all_actors(); - for (auto& actor : actors) + auto const actors = host->get_all_actors(); + for (auto const& actor : actors) xbt_dynar_push(whereto, &actor); } sg_host_t sg_host_self() { - smx_actor_t process = SIMIX_process_self(); - return (process == nullptr) ? nullptr : process->get_host(); + return SIMIX_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() { - sg_host_t host = sg_host_self(); - if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process) - return ""; - - return host->get_cname(); + const char* res = ""; + if (not SIMIX_is_maestro()) { + const simgrid::s4u::Host* host = simgrid::kernel::actor::ActorImpl::self()->get_host(); + if (host != nullptr) + res = host->get_cname(); + } + return res; } -double sg_host_load(sg_host_t host) +double sg_host_load(const_sg_host_t host) { return host->get_load(); }