X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/63058c5fb60ffe03865084a930f25229d5a5163a..12ff962f066e304dbaa22cafcd6d5c7adb67c33c:/src/kernel/routing/NetZoneImpl.cpp diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index a5996aa07b..b9efafc840 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -13,7 +13,6 @@ #include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" -#include "src/surf/xml/platf_private.hpp" #include "surf/surf.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_route); @@ -71,11 +70,9 @@ NetZoneImpl::NetZoneImpl(const std::string& name) : piface_(this), name_(name) * 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()) + 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) { + /* root netzone set, initialize models */ 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. @@ -85,7 +82,6 @@ NetZoneImpl::NetZoneImpl(const std::string& name) : piface_(this), name_(name) * (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(); } @@ -93,6 +89,9 @@ NetZoneImpl::NetZoneImpl(const std::string& name) : piface_(this), name_(name) "Refusing to create a second NetZone called '%s'.", get_cname()); netpoint_ = new NetPoint(name_, NetPoint::Type::NetZone); XBT_DEBUG("NetZone '%s' created with the id '%u'", get_cname(), netpoint_->id()); + _sg_cfg_init_status = 2; /* HACK: direct access to the global controlling the level of configuration to prevent + * any further config now that we created some real content */ + simgrid::s4u::NetZone::on_creation(piface_); // notify the signal } NetZoneImpl::~NetZoneImpl() @@ -109,6 +108,8 @@ NetZoneImpl::~NetZoneImpl() void NetZoneImpl::add_child(NetZoneImpl* new_zone) { xbt_assert(not sealed_, "Cannot add a new child to the sealed zone %s", get_cname()); + /* set the father behavior */ + hierarchy_ = RoutingMode::recursive; children_.push_back(new_zone); } @@ -138,34 +139,35 @@ int NetZoneImpl::get_host_count() const return count; } -s4u::Disk* NetZoneImpl::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) +s4u::Host* NetZoneImpl::create_host(const std::string& name, const std::vector& speed_per_pstate) { - auto* l = disk_model_->create_disk(name, read_bandwidth, write_bandwidth); + auto* res = (new surf::HostImpl(name))->get_iface(); + res->set_netpoint((new NetPoint(name, NetPoint::Type::Host))->set_englobing_zone(this)); - return l->get_iface(); + cpu_model_pm_->create_cpu(res, speed_per_pstate); + + return res; } -s4u::Link* NetZoneImpl::create_link(const std::string& name, const std::vector& bandwidths, - s4u::Link::SharingPolicy policy) +s4u::Link* NetZoneImpl::create_link(const std::string& name, const std::vector& bandwidths) { - auto* l = network_model_->create_link(name, bandwidths, policy); - - return l->get_iface(); + return network_model_->create_link(name, bandwidths)->get_iface(); } -s4u::Host* NetZoneImpl::create_host(const std::string& name, const std::vector& speed_per_pstate) +s4u::Disk* NetZoneImpl::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) { - if (hierarchy_ == RoutingMode::unset) - hierarchy_ = RoutingMode::base; + auto* l = disk_model_->create_disk(name, read_bandwidth, write_bandwidth); - auto* res = (new surf::HostImpl(name))->get_iface(); - res->set_netpoint((new NetPoint(name, NetPoint::Type::Host))->set_englobing_zone(this)); + return l->get_iface(); +} - cpu_model_pm_->create_cpu(res, speed_per_pstate); +NetPoint* NetZoneImpl::create_router(const std::string& name) +{ + xbt_assert(nullptr == s4u::Engine::get_instance()->netpoint_by_name_or_null(name), + "Refusing to create a router named '%s': this name already describes a node.", name.c_str()); - return res; + return (new NetPoint(name, NetPoint::Type::Router))->set_englobing_zone(this); } - int NetZoneImpl::add_component(NetPoint* elm) { vertices_.push_back(elm); @@ -173,26 +175,26 @@ 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()); } void NetZoneImpl::add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, - std::vector& link_list, bool /* symmetrical */) + std::vector& link_list_, bool /* symmetrical */) { /* Argument validity checks */ if (gw_dst) { XBT_DEBUG("Load bypassNetzoneRoute from %s@%s to %s@%s", src->get_cname(), gw_src->get_cname(), dst->get_cname(), gw_dst->get_cname()); - xbt_assert(not link_list.empty(), "Bypass route between %s@%s and %s@%s cannot be empty.", src->get_cname(), + xbt_assert(not link_list_.empty(), "Bypass route between %s@%s and %s@%s cannot be empty.", src->get_cname(), gw_src->get_cname(), dst->get_cname(), gw_dst->get_cname()); xbt_assert(bypass_routes_.find({src, dst}) == bypass_routes_.end(), "The bypass route between %s@%s and %s@%s already exists.", src->get_cname(), gw_src->get_cname(), dst->get_cname(), gw_dst->get_cname()); } else { XBT_DEBUG("Load bypassRoute from %s to %s", src->get_cname(), dst->get_cname()); - xbt_assert(not link_list.empty(), "Bypass route between %s and %s cannot be empty.", src->get_cname(), + xbt_assert(not link_list_.empty(), "Bypass route between %s and %s cannot be empty.", src->get_cname(), dst->get_cname()); xbt_assert(bypass_routes_.find({src, dst}) == bypass_routes_.end(), "The bypass route between %s and %s already exists.", src->get_cname(), dst->get_cname()); @@ -200,7 +202,7 @@ void NetZoneImpl::add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_sr /* Build a copy that will be stored in the dict */ auto* newRoute = new BypassRoute(gw_src, gw_dst); - for (auto const& link : link_list) + for (auto const& link : link_list_) newRoute->links.push_back(link); /* Store it */ @@ -364,39 +366,29 @@ bool NetZoneImpl::get_bypass_route(NetPoint* src, NetPoint* dst, path_dst.pop_back(); } - int max_index_src = path_src.size() - 1; - int max_index_dst = path_dst.size() - 1; - - int max_index = std::max(max_index_src, max_index_dst); - /* (3) Search for a bypass making the path up to the ancestor useless */ const BypassRoute* bypassedRoute = nullptr; std::pair key; - 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_}; - 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_}; - auto bpr = bypass_routes_.find(key); - if (bpr != bypass_routes_.end()) { - bypassedRoute = bpr->second; - } - } - } - - if (not bypassedRoute && max <= max_index_src && max <= max_index_dst) { - key = {path_src.at(max)->netpoint_, path_dst.at(max)->netpoint_}; + // Search for a bypass with the given indices. Returns true if found. Initialize variables `bypassedRoute' and `key'. + auto lookup = [&bypassedRoute, &key, &path_src, &path_dst, this](unsigned src_index, unsigned dst_index) { + if (src_index < path_src.size() && dst_index < path_dst.size()) { + key = {path_src[src_index]->netpoint_, path_dst[dst_index]->netpoint_}; auto bpr = bypass_routes_.find(key); if (bpr != bypass_routes_.end()) { bypassedRoute = bpr->second; + return true; } } + return false; + }; + + for (unsigned max = 0, max_index = std::max(path_src.size(), path_dst.size()); max < max_index; max++) { + for (unsigned i = 0; i < max; i++) { + if (lookup(i, max) || lookup(max, i)) + break; + } + if (bypassedRoute || lookup(max, max)) + break; } /* (4) If we have the bypass, use it. If not, caller will do the Right Thing. */ @@ -422,7 +414,7 @@ bool NetZoneImpl::get_bypass_route(NetPoint* src, NetPoint* dst, void NetZoneImpl::get_global_route(NetPoint* src, NetPoint* dst, /* OUT */ std::vector& links, double* latency) { - RouteCreationArgs route; + Route route; XBT_DEBUG("Resolve route from '%s' to '%s'", src->get_cname(), dst->get_cname()); @@ -440,69 +432,90 @@ void NetZoneImpl::get_global_route(NetPoint* src, NetPoint* dst, /* If src and dst are in the same netzone, life is good */ if (src_ancestor == dst_ancestor) { /* SURF_ROUTING_BASE */ - route.link_list = std::move(links); + route.link_list_ = std::move(links); common_ancestor->get_local_route(src, dst, &route, latency); - links = std::move(route.link_list); + links = std::move(route.link_list_); return; } /* Not in the same netzone, no bypass. We'll have to find our path between the netzones recursively */ common_ancestor->get_local_route(src_ancestor->netpoint_, dst_ancestor->netpoint_, &route, latency); - xbt_assert((route.gw_src != nullptr) && (route.gw_dst != nullptr), "Bad gateways for route from '%s' to '%s'.", + xbt_assert((route.gw_src_ != nullptr) && (route.gw_dst_ != nullptr), "Bad gateways for route from '%s' to '%s'.", src->get_cname(), dst->get_cname()); /* If source gateway is not our source, we have to recursively find our way up to this point */ - if (src != route.gw_src) - get_global_route(src, route.gw_src, links, latency); - for (auto const& link : route.link_list) - links.push_back(link); + if (src != route.gw_src_) + get_global_route(src, route.gw_src_, links, latency); + links.insert(links.end(), begin(route.link_list_), end(route.link_list_)); /* If dest gateway is not our destination, we have to recursively find our way from this point */ - if (route.gw_dst != dst) - get_global_route(route.gw_dst, dst, links, latency); + 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; + s4u::NetZone::on_seal(piface_); } void NetZoneImpl::set_parent(NetZoneImpl* parent) { - xbt_assert(sealed_ == false, "Impossible to set parent to an already sealed NetZone(%s)", this->get_cname()); + xbt_assert(not sealed_, "Impossible to set parent to an already sealed NetZone(%s)", this->get_cname()); parent_ = parent; netpoint_->set_englobing_zone(parent_); + if (parent) { + /* adding this class as child */ + parent->add_child(this); + /* copying models from parent host, to be reviewed when we allow multi-models */ + set_network_model(parent->get_network_model()); + set_cpu_pm_model(parent->get_cpu_pm_model()); + set_cpu_vm_model(parent->get_cpu_vm_model()); + set_disk_model(parent->get_disk_model()); + set_host_model(parent->get_host_model()); + } } void NetZoneImpl::set_network_model(std::shared_ptr netmodel) { - xbt_assert(sealed_ == false, "Impossible to set network model to an already sealed NetZone(%s)", this->get_cname()); + 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(sealed_ == false, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname()); + 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(sealed_ == false, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname()); + 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(sealed_ == false, "Impossible to set disk model to an already sealed NetZone(%s)", this->get_cname()); + 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(sealed_ == false, "Impossible to set host model to an already sealed NetZone(%s)", this->get_cname()); + xbt_assert(not sealed_, "Impossible to set host model to an already sealed NetZone(%s)", this->get_cname()); host_model_ = std::move(host_model); }