X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/67fe7b9d6c00b390a8598bc1e72d42d8343cb218..55491279cdea3f01da22d1b51874e2e168ac5116:/src/kernel/routing/NetZoneImpl.cpp diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index bdc9a7e2a4..5085d81410 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2018. 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. */ @@ -18,22 +18,14 @@ namespace simgrid { namespace kernel { namespace routing { -class BypassRoute { -public: - explicit BypassRoute(NetPoint* gwSrc, NetPoint* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {} - NetPoint* gw_src; - NetPoint* gw_dst; - std::vector links; -}; - -NetZoneImpl::NetZoneImpl(NetZoneImpl* father, std::string name, resource::NetworkModel* network_model) - : network_model_(network_model), piface_(this), father_(father), name_(name) +NetZoneImpl::NetZoneImpl(NetZoneImpl* father, const std::string& name, resource::NetworkModel* network_model) + : piface_(this), father_(father), name_(name), network_model_(network_model) { - xbt_assert(nullptr == simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name.c_str()), - "Refusing to create a second NetZone called '%s'.", name.c_str()); + 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); - XBT_DEBUG("NetZone '%s' created with the id '%u'", name.c_str(), netpoint_->id()); + netpoint_ = new NetPoint(name_, NetPoint::Type::NetZone, father); + XBT_DEBUG("NetZone '%s' created with the id '%u'", get_cname(), netpoint_->id()); } NetZoneImpl::~NetZoneImpl() @@ -44,89 +36,69 @@ NetZoneImpl::~NetZoneImpl() for (auto const& kv : bypass_routes_) delete kv.second; - simgrid::s4u::Engine::get_instance()->netpoint_unregister(netpoint_); -} -const char* NetZoneImpl::get_cname() const -{ - return name_.c_str(); -} -NetZoneImpl* NetZoneImpl::get_father() -{ - return father_; -} -void NetZoneImpl::seal() -{ - sealed_ = true; -} -/** @brief Returns the list of direct children (no grand-children) - * - * This returns the internal data, no copy. Don't mess with it. - */ -std::vector* NetZoneImpl::get_children() -{ - return &children_; + s4u::Engine::get_instance()->netpoint_unregister(netpoint_); } + /** @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, * not the ones contained in sub-netzones. */ -std::vector NetZoneImpl::get_all_hosts() +std::vector NetZoneImpl::get_all_hosts() const { std::vector res; for (auto const& card : get_vertices()) { - s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->get_name()); + s4u::Host* host = s4u::Host::by_name_or_null(card->get_name()); if (host != nullptr) res.push_back(host); } return res; } -int NetZoneImpl::get_host_count() +int NetZoneImpl::get_host_count() const { int count = 0; for (auto const& card : get_vertices()) { - s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->get_name()); + const s4u::Host* host = s4u::Host::by_name_or_null(card->get_name()); if (host != nullptr) count++; } return count; } -simgrid::s4u::Host* NetZoneImpl::create_host(const char* name, std::vector* speedPerPstate, int coreAmount, - std::map* props) +s4u::Host* NetZoneImpl::create_host(const std::string& name, const std::vector& speed_per_pstate, + int coreAmount, const std::map* props) { - simgrid::s4u::Host* res = new simgrid::s4u::Host(name); + s4u::Host* res = new s4u::Host(name); if (hierarchy_ == RoutingMode::unset) hierarchy_ = RoutingMode::base; - res->pimpl_netpoint = new NetPoint(name, NetPoint::Type::Host, this); + res->set_netpoint(new NetPoint(name, NetPoint::Type::Host, this)); - surf_cpu_model_pm->create_cpu(res, speedPerPstate, coreAmount); + surf_cpu_model_pm->create_cpu(res, speed_per_pstate, coreAmount); if (props != nullptr) - for (auto const& kv : *props) - res->set_property(kv.first, kv.second); + res->set_properties(*props); - simgrid::s4u::Host::on_creation(*res); // notify the signal + s4u::Host::on_creation(*res); // notify the signal return res; } -int NetZoneImpl::add_component(kernel::routing::NetPoint* elm) +int NetZoneImpl::add_component(NetPoint* elm) { vertices_.push_back(elm); return vertices_.size() - 1; // The rank of the newly created object } -void NetZoneImpl::add_route(kernel::routing::NetPoint* /*src*/, kernel::routing::NetPoint* /*dst*/, - kernel::routing::NetPoint* /*gw_src*/, kernel::routing::NetPoint* /*gw_dst*/, - std::vector& /*link_list*/, bool /*symmetrical*/) + +void NetZoneImpl::add_route(NetPoint* /*src*/, NetPoint* /*dst*/, NetPoint* /*gw_src*/, NetPoint* /*gw_dst*/, + std::vector& /*link_list*/, bool /*symmetrical*/) { - xbt_die("NetZone '%s' does not accept new routes (wrong class).", name_.c_str()); + 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) { @@ -146,7 +118,7 @@ void NetZoneImpl::add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_sr } /* Build a copy that will be stored in the dict */ - kernel::routing::BypassRoute* newRoute = new kernel::routing::BypassRoute(gw_src, gw_dst); + BypassRoute* newRoute = new BypassRoute(gw_src, gw_dst); for (auto const& link : link_list) newRoute->links.push_back(link); @@ -219,8 +191,8 @@ static void find_common_ancestors(NetPoint* src, NetPoint* dst, /* engage the full recursive search */ /* (1) find the path to root of src and dst*/ - NetZoneImpl* src_as = src->get_englobing_zone(); - NetZoneImpl* dst_as = dst->get_englobing_zone(); + const NetZoneImpl* src_as = src->get_englobing_zone(); + const NetZoneImpl* dst_as = dst->get_englobing_zone(); xbt_assert(src_as, "Host %s must be in a netzone", src->get_cname()); xbt_assert(dst_as, "Host %s must be in a netzone", dst->get_cname()); @@ -264,7 +236,7 @@ static void find_common_ancestors(NetPoint* src, NetPoint* dst, } /* PRECONDITION: this is the common ancestor of src and dst */ -bool NetZoneImpl::get_bypass_route(routing::NetPoint* src, routing::NetPoint* dst, +bool NetZoneImpl::get_bypass_route(NetPoint* src, NetPoint* dst, /* OUT */ std::vector& links, double* latency) { // If never set a bypass route return nullptr without any further computations @@ -274,7 +246,7 @@ bool NetZoneImpl::get_bypass_route(routing::NetPoint* src, routing::NetPoint* ds /* Base case, no recursion is needed */ if (dst->get_englobing_zone() == this && src->get_englobing_zone() == this) { if (bypass_routes_.find({src, dst}) != bypass_routes_.end()) { - BypassRoute* bypassedRoute = bypass_routes_.at({src, dst}); + const BypassRoute* bypassedRoute = bypass_routes_.at({src, dst}); for (resource::LinkImpl* const& link : bypassedRoute->links) { links.push_back(link); if (latency) @@ -317,7 +289,7 @@ bool NetZoneImpl::get_bypass_route(routing::NetPoint* src, routing::NetPoint* ds int max_index = std::max(max_index_src, max_index_dst); /* (3) Search for a bypass making the path up to the ancestor useless */ - BypassRoute* bypassedRoute = nullptr; + const BypassRoute* bypassedRoute = nullptr; std::pair key; for (int max = 0; max <= max_index; max++) { for (int i = 0; i < max; i++) { @@ -415,6 +387,6 @@ void NetZoneImpl::get_global_route(NetPoint* src, NetPoint* dst, if (route.gw_dst != dst) get_global_route(route.gw_dst, dst, links, latency); } -} -} -} // namespace +} // namespace routing +} // namespace kernel +} // namespace simgrid