X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c6bbb40c161610ef1a8096ec469e8b9a703de0a..1365d67fed75eed3bc33aaed77aac4481039f27a:/src/s4u/s4u_Netzone.cpp diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp index 5eb5139489..fa6f0c2d26 100644 --- a/src/s4u/s4u_Netzone.cpp +++ b/src/s4u/s4u_Netzone.cpp @@ -1,107 +1,180 @@ -/* Copyright (c) 2006-2018. 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. */ +#include "simgrid/Exception.hpp" #include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/NetZone.hpp" +#include "simgrid/simix.hpp" #include "simgrid/zone.h" - -XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_netzone, "S4U Networking Zones"); +#include "xbt/parse_units.hpp" namespace simgrid { namespace s4u { -simgrid::xbt::signal& link_list)> +xbt::signal const& link_list)> NetZone::on_route_creation; -simgrid::xbt::signal NetZone::on_creation; -simgrid::xbt::signal NetZone::on_seal; +xbt::signal NetZone::on_creation; +xbt::signal NetZone::on_seal; -NetZone::NetZone(NetZone* father, std::string name) : father_(father), name_(name) +const std::unordered_map* NetZone::get_properties() const { - children_ = new std::vector(); + return pimpl_->get_properties(); } -void NetZone::seal() +/** Retrieve the property value (or nullptr if not set) */ +const char* NetZone::get_property(const std::string& key) const { - sealed_ = true; + return pimpl_->get_property(key); } -NetZone::~NetZone() +void NetZone::set_property(const std::string& key, const std::string& value) { - for (auto const& nz : *children_) - delete nz; - delete children_; + kernel::actor::simcall([this, &key, &value] { pimpl_->set_property(key, value); }); } -std::unordered_map* NetZone::getProperties() +/** @brief Returns the list of direct children (no grand-children) */ +std::vector NetZone::get_children() const { - return simgrid::simix::simcall([this] { return &properties_; }); + std::vector res; + for (auto child : *(pimpl_->get_children())) + res.push_back(child->get_iface()); + return res; } -/** Retrieve the property value (or nullptr if not set) */ -const char* NetZone::getProperty(const char* key) +NetZone* NetZone::add_child(const NetZone* new_zone) +{ + pimpl_->add_child(new_zone->get_impl()); + return this; +} + +const std::string& NetZone::get_name() const +{ + return pimpl_->get_name(); +} + +const char* NetZone::get_cname() const { - return properties_.at(key).c_str(); + return pimpl_->get_cname(); } -void NetZone::setProperty(const char* key, const char* value) + +NetZone* NetZone::get_father() +{ + return pimpl_->get_parent()->get_iface(); +} + +NetZone* NetZone::get_parent() const { - simgrid::simix::simcall([this, key, value] { properties_[key] = value; }); + return pimpl_->get_parent()->get_iface(); } -/** @brief Returns the list of direct children (no grand-children) +NetZone* NetZone::set_parent(const NetZone* parent) +{ + pimpl_->set_parent(parent->get_impl()); + return this; +} + +/** @brief Returns the list of the hosts found in this NetZone (not recursively) * - * This function returns the internal copy of the children, not a copy. Don't mess with it! + * Only the hosts that are directly contained in this NetZone are retrieved, + * not the ones contained in sub-netzones. */ -std::vector* NetZone::getChildren() +std::vector NetZone::get_all_hosts() const { - return children_; + return pimpl_->get_all_hosts(); } -const char* NetZone::get_cname() const +int NetZone::get_host_count() const { - return name_.c_str(); + return pimpl_->get_host_count(); } -NetZone* NetZone::get_father() + +int NetZone::add_component(kernel::routing::NetPoint* elm) { - return father_; + return pimpl_->add_component(elm); } -void NetZone::getHosts(std::vector* whereto) +std::vector NetZone::get_link_list_impl(const std::vector link_list) { - for (auto const& card : vertices_) { - s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->get_name()); - if (host != nullptr) - whereto->push_back(host); + std::vector links; + for (const auto& link : link_list) { + links.push_back(link->get_impl()); } + return links; } -int NetZone::getHostCount() +void NetZone::add_regular_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, + const std::vector& link_list, bool symmetrical) { - int count = 0; - for (auto const& card : vertices_) { - s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->get_name()); - if (host != nullptr) - count++; - } - return count; + add_route(src, dst, nullptr, nullptr, NetZone::get_link_list_impl(link_list), symmetrical); +} + +void NetZone::add_netzone_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, + kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, + const std::vector& link_list, bool symmetrical) +{ + add_route(src, dst, gw_src, gw_dst, NetZone::get_link_list_impl(link_list), symmetrical); +} + +void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, + kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, + const std::vector& link_list, bool symmetrical) +{ + pimpl_->add_route(src, dst, gw_src, gw_dst, link_list, symmetrical); +} +void NetZone::add_bypass_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) +{ + pimpl_->add_bypass_route(src, dst, gw_src, gw_dst, link_list, symmetrical); } -int NetZone::addComponent(kernel::routing::NetPoint* elm) +void NetZone::extract_xbt_graph(const s_xbt_graph_t* graph, std::map>* nodes, + std::map>* edges) { - vertices_.push_back(elm); - return vertices_.size() - 1; // The rank of the newly created object + for (auto const& child : get_children()) + child->extract_xbt_graph(graph, nodes, edges); + + pimpl_->get_graph(graph, nodes, edges); +} + +s4u::Host* NetZone::create_host(const std::string& name, const std::vector& speed_per_pstate) +{ + return kernel::actor::simcall( + [this, &name, &speed_per_pstate] { return pimpl_->create_host(name, speed_per_pstate); }); +} +s4u::Host* NetZone::create_host(const std::string& name, const std::vector& speed_per_pstate) +{ + return create_host(name, Host::convert_pstate_speed_vector(speed_per_pstate)); } -void NetZone::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*/) +s4u::Link* NetZone::create_link(const std::string& name, const std::vector& bandwidths, + s4u::Link::SharingPolicy policy) { - xbt_die("NetZone '%s' does not accept new routes (wrong class).", name_.c_str()); + return kernel::actor::simcall( + [this, &name, &bandwidths, &policy] { return pimpl_->create_link(name, bandwidths, policy); }); +} + +s4u::Link* NetZone::create_link(const std::string& name, const std::vector& bandwidths, + s4u::Link::SharingPolicy policy) +{ + std::vector bw; + bw.reserve(bandwidths.size()); + for (const auto& speed_str : bandwidths) { + try { + double speed = xbt_parse_get_bandwidth("", 0, speed_str.c_str(), nullptr, ""); + bw.push_back(speed); + } catch (const simgrid::ParseError&) { + throw std::invalid_argument(std::string("Impossible to create link: ") + name + + std::string(". Invalid bandwidth: ") + speed_str); + } + } + return create_link(name, bw, policy); } } // namespace s4u @@ -114,7 +187,7 @@ sg_netzone_t sg_zone_get_root() return simgrid::s4u::Engine::get_instance()->get_netzone_root(); } -const char* sg_zone_get_name(sg_netzone_t netzone) +const char* sg_zone_get_name(const_sg_netzone_t netzone) { return netzone->get_cname(); } @@ -124,28 +197,27 @@ sg_netzone_t sg_zone_get_by_name(const char* name) return simgrid::s4u::Engine::get_instance()->netzone_by_name_or_null(name); } -void sg_zone_get_sons(sg_netzone_t netzone, xbt_dict_t whereto) +void sg_zone_get_sons(const_sg_netzone_t netzone, xbt_dict_t whereto) { - for (auto const& elem : *netzone->getChildren()) { - xbt_dict_set(whereto, elem->get_cname(), static_cast(elem), nullptr); + for (auto const& elem : netzone->get_children()) { + xbt_dict_set(whereto, elem->get_cname(), elem); } } -const char* sg_zone_get_property_value(sg_netzone_t netzone, const char* name) +const char* sg_zone_get_property_value(const_sg_netzone_t netzone, const char* name) { - return netzone->getProperty(name); + return netzone->get_property(name); } -void sg_zone_set_property_value(sg_netzone_t netzone, const char* name, char* value) +void sg_zone_set_property_value(sg_netzone_t netzone, const char* name, const char* value) { - netzone->setProperty(name, value); + netzone->set_property(name, value); } -void sg_zone_get_hosts(sg_netzone_t netzone, xbt_dynar_t whereto) +void sg_zone_get_hosts(const_sg_netzone_t netzone, xbt_dynar_t whereto) { /* converts vector to dynar */ - std::vector hosts; - netzone->getHosts(&hosts); + std::vector hosts = netzone->get_all_hosts(); for (auto const& host : hosts) xbt_dynar_push(whereto, &host); }