X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/50102ec1c30562e20d450afa7015374387bf1904..590318407e836806e085a6083479cb940668e5f9:/src/kernel/routing/NetZoneImpl.cpp diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index 59a239fa0d..6caa24615a 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2021. 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. */ @@ -7,6 +7,10 @@ #include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" +#include "src/include/simgrid/sg_config.hpp" +#include "src/kernel/EngineImpl.hpp" +#include "src/kernel/resource/DiskImpl.hpp" +#include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" #include "src/surf/xml/platf_private.hpp" @@ -18,13 +22,76 @@ namespace simgrid { namespace kernel { namespace routing { -NetZoneImpl::NetZoneImpl(NetZoneImpl* father, const std::string& name, resource::NetworkModel* network_model) - : piface_(this), father_(father), name_(name), network_model_(network_model) +/* Pick the right models for CPU, net and host, and call their model_init_preparse */ +static void surf_config_models_setup() { + std::string host_model_name = simgrid::config::get_value("host/model"); + std::string network_model_name = simgrid::config::get_value("network/model"); + std::string cpu_model_name = simgrid::config::get_value("cpu/model"); + std::string disk_model_name = simgrid::config::get_value("disk/model"); + + /* The compound host model is needed when using non-default net/cpu models */ + if ((not simgrid::config::is_default("network/model") || not simgrid::config::is_default("cpu/model")) && + simgrid::config::is_default("host/model")) { + host_model_name = "compound"; + simgrid::config::set_value("host/model", host_model_name); + } + + XBT_DEBUG("host model: %s", host_model_name.c_str()); + if (host_model_name == "compound") { + xbt_assert(not cpu_model_name.empty(), "Set a cpu model to use with the 'compound' host model"); + xbt_assert(not network_model_name.empty(), "Set a network model to use with the 'compound' host model"); + + int cpu_id = find_model_description(surf_cpu_model_description, cpu_model_name); + surf_cpu_model_description[cpu_id].model_init_preparse(); + + int network_id = find_model_description(surf_network_model_description, network_model_name); + surf_network_model_description[network_id].model_init_preparse(); + } + + XBT_DEBUG("Call host_model_init"); + int host_id = find_model_description(surf_host_model_description, host_model_name); + surf_host_model_description[host_id].model_init_preparse(); + + XBT_DEBUG("Call vm_model_init"); + /* ideally we should get back the pointer to CpuModel from model_init_preparse(), but this + * requires changing the declaration of surf_cpu_model_description. + * To be reviewed in the future */ + surf_vm_model_init_HL13( + simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->get_cpu_pm_model().get()); + + XBT_DEBUG("Call disk_model_init"); + int disk_id = find_model_description(surf_disk_model_description, disk_model_name); + surf_disk_model_description[disk_id].model_init_preparse(); +} + +NetZoneImpl::NetZoneImpl(const std::string& name) : piface_(this), name_(name) +{ + /* workaroud: first netzoneImpl will be the root netzone. + * Without globals and with current surf_*_model_description init functions, we need + * the root netzone to exist when creating the models. + * This was usually done at sg_platf.cpp, during XML parsing */ + if (not s4u::Engine::get_instance()->get_netzone_root()) + s4u::Engine::get_instance()->set_netzone_root(&piface_); + + static bool surf_parse_models_setup_already_called = false; + if (not surf_parse_models_setup_already_called) { + simgrid::s4u::Engine::on_platform_creation(); + + /* Initialize the surf models. That must be done after we got all config, and before we need the models. + * That is, after the last tag, if any, and before the first of cluster|peer|zone|trace|trace_connect + * + * I'm not sure for and , there may be a bug here + * (FIXME: check it out by creating a file beginning with one of these tags) + * but cluster and peer come down to zone creations, so putting this verification here is correct. + */ + surf_parse_models_setup_already_called = true; + surf_config_models_setup(); + } + xbt_assert(nullptr == s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name()), "Refusing to create a second NetZone called '%s'.", get_cname()); - - netpoint_ = new NetPoint(name_, NetPoint::Type::NetZone, father_); + netpoint_ = new NetPoint(name_, NetPoint::Type::NetZone); XBT_DEBUG("NetZone '%s' created with the id '%u'", get_cname(), netpoint_->id()); } @@ -39,6 +106,12 @@ NetZoneImpl::~NetZoneImpl() s4u::Engine::get_instance()->netpoint_unregister(netpoint_); } +void NetZoneImpl::add_child(NetZoneImpl* new_zone) +{ + xbt_assert(not sealed_, "Cannot add a new child to the sealed zone %s", get_cname()); + children_.push_back(new_zone); +} + /** @brief Returns the list of the hosts found in this NetZone (not recursively) * * Only the hosts that are directly contained in this NetZone are retrieved, @@ -65,41 +138,32 @@ int NetZoneImpl::get_host_count() const return count; } -s4u::Link* NetZoneImpl::create_link(const std::string& name, const std::vector& bandwidths, double latency, - s4u::Link::SharingPolicy policy, - const std::unordered_map* props) +s4u::Disk* NetZoneImpl::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) { - static double last_warned_latency = sg_surf_precision; - if (latency != 0.0 && latency < last_warned_latency) { - XBT_WARN("Latency for link %s is smaller than surf/precision (%g < %g)." - " For more accuracy, consider setting \"--cfg=surf/precision:%g\".", - name.c_str(), latency, sg_surf_precision, latency); - last_warned_latency = latency; - } - - auto* l = surf_network_model->create_link(name, bandwidths, latency, policy); - - if (props) - l->set_properties(*props); + auto* l = disk_model_->create_disk(name, read_bandwidth, write_bandwidth); return l->get_iface(); } -s4u::Host* NetZoneImpl::create_host(const std::string& name, const std::vector& speed_per_pstate, - int coreAmount, const std::unordered_map* props) + +s4u::Link* NetZoneImpl::create_link(const std::string& name, const std::vector& bandwidths) { - auto* res = new s4u::Host(name); + return network_model_->create_link(name, bandwidths)->get_iface(); +} + +s4u::Link* NetZoneImpl::create_wifi_link(const std::string& name, const std::vector& bandwidths) +{ + return network_model_->create_wifi_link(name, bandwidths)->get_iface(); +} +s4u::Host* NetZoneImpl::create_host(const std::string& name, const std::vector& speed_per_pstate) +{ if (hierarchy_ == RoutingMode::unset) hierarchy_ = RoutingMode::base; - res->set_netpoint(new NetPoint(name, NetPoint::Type::Host, this)); - - surf_cpu_model_pm->create_cpu(res, speed_per_pstate, coreAmount); + auto* res = (new surf::HostImpl(name))->get_iface(); + res->set_netpoint((new NetPoint(name, NetPoint::Type::Host))->set_englobing_zone(this)); - if (props != nullptr) - res->set_properties(*props); - - s4u::Host::on_creation(*res); // notify the signal + cpu_model_pm_->create_cpu(res, speed_per_pstate); return res; } @@ -111,7 +175,7 @@ int NetZoneImpl::add_component(NetPoint* elm) } void NetZoneImpl::add_route(NetPoint* /*src*/, NetPoint* /*dst*/, NetPoint* /*gw_src*/, NetPoint* /*gw_dst*/, - std::vector& /*link_list*/, bool /*symmetrical*/) + const std::vector& /*link_list*/, bool /*symmetrical*/) { xbt_die("NetZone '%s' does not accept new routes (wrong class).", get_cname()); } @@ -221,13 +285,13 @@ static void find_common_ancestors(NetPoint* src, NetPoint* dst, NetZoneImpl* current = src->get_englobing_zone(); while (current != nullptr) { path_src.push_back(current); - current = current->get_father(); + current = current->get_parent(); } std::vector path_dst; current = dst->get_englobing_zone(); while (current != nullptr) { path_dst.push_back(current); - current = current->get_father(); + current = current->get_parent(); } /* (3) find the common father. @@ -285,14 +349,14 @@ bool NetZoneImpl::get_bypass_route(NetPoint* src, NetPoint* dst, NetZoneImpl* current = src->get_englobing_zone(); while (current != nullptr) { path_src.push_back(current); - current = current->father_; + current = current->parent_; } std::vector path_dst; current = dst->get_englobing_zone(); while (current != nullptr) { path_dst.push_back(current); - current = current->father_; + current = current->parent_; } /* (2) find the common father */ @@ -313,14 +377,14 @@ bool NetZoneImpl::get_bypass_route(NetPoint* src, NetPoint* dst, for (int max = 0; max <= max_index && not bypassedRoute; max++) { for (int i = 0; i < max && not bypassedRoute; i++) { if (i <= max_index_src && max <= max_index_dst) { - key = {path_src.at(i)->netpoint_, path_dst.at(max)->netpoint_}; + key = {path_src.at(i)->netpoint_, path_dst.at(max)->netpoint_}; auto bpr = bypass_routes_.find(key); if (bpr != bypass_routes_.end()) { bypassedRoute = bpr->second; } } if (not bypassedRoute && max <= max_index_src && i <= max_index_dst) { - key = {path_src.at(max)->netpoint_, path_dst.at(i)->netpoint_}; + key = {path_src.at(max)->netpoint_, path_dst.at(i)->netpoint_}; auto bpr = bypass_routes_.find(key); if (bpr != bypass_routes_.end()) { bypassedRoute = bpr->second; @@ -329,7 +393,7 @@ bool NetZoneImpl::get_bypass_route(NetPoint* src, NetPoint* dst, } if (not bypassedRoute && max <= max_index_src && max <= max_index_dst) { - key = {path_src.at(max)->netpoint_, path_dst.at(max)->netpoint_}; + key = {path_src.at(max)->netpoint_, path_dst.at(max)->netpoint_}; auto bpr = bypass_routes_.find(key); if (bpr != bypass_routes_.end()) { bypassedRoute = bpr->second; @@ -365,9 +429,9 @@ void NetZoneImpl::get_global_route(NetPoint* src, NetPoint* dst, XBT_DEBUG("Resolve route from '%s' to '%s'", src->get_cname(), dst->get_cname()); /* Find how src and dst are interconnected */ - NetZoneImpl *common_ancestor; - NetZoneImpl *src_ancestor; - NetZoneImpl *dst_ancestor; + NetZoneImpl* common_ancestor; + NetZoneImpl* src_ancestor; + NetZoneImpl* dst_ancestor; find_common_ancestors(src, dst, &common_ancestor, &src_ancestor, &dst_ancestor); XBT_DEBUG("elements_father: common ancestor '%s' src ancestor '%s' dst ancestor '%s'", common_ancestor->get_cname(), src_ancestor->get_cname(), dst_ancestor->get_cname()); @@ -400,6 +464,61 @@ void NetZoneImpl::get_global_route(NetPoint* src, NetPoint* dst, if (route.gw_dst != dst) get_global_route(route.gw_dst, dst, links, latency); } + +void NetZoneImpl::seal() +{ + /* already sealed netzone */ + if (sealed_) + return; + do_seal(); // derived class' specific sealing procedure + + /* seals sub-netzones and hosts */ + for (auto* host : get_all_hosts()) { + host->seal(); + } + for (auto* sub_net : *get_children()) { + sub_net->seal(); + } + sealed_ = true; +} + +void NetZoneImpl::set_parent(NetZoneImpl* parent) +{ + xbt_assert(not sealed_, "Impossible to set parent to an already sealed NetZone(%s)", this->get_cname()); + parent_ = parent; + netpoint_->set_englobing_zone(parent_); +} + +void NetZoneImpl::set_network_model(std::shared_ptr netmodel) +{ + xbt_assert(not sealed_, "Impossible to set network model to an already sealed NetZone(%s)", this->get_cname()); + network_model_ = std::move(netmodel); +} + +void NetZoneImpl::set_cpu_vm_model(std::shared_ptr cpu_model) +{ + xbt_assert(not sealed_, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname()); + cpu_model_vm_ = std::move(cpu_model); +} + +void NetZoneImpl::set_cpu_pm_model(std::shared_ptr cpu_model) +{ + xbt_assert(not sealed_, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname()); + cpu_model_pm_ = std::move(cpu_model); +} + +void NetZoneImpl::set_disk_model(std::shared_ptr disk_model) +{ + xbt_assert(not sealed_, "Impossible to set disk model to an already sealed NetZone(%s)", this->get_cname()); + disk_model_ = std::move(disk_model); +} + +void NetZoneImpl::set_host_model(std::shared_ptr host_model) +{ + xbt_assert(not sealed_, "Impossible to set host model to an already sealed NetZone(%s)", this->get_cname()); + host_model_ = std::move(host_model); +} + } // namespace routing } // namespace kernel } // namespace simgrid