X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/67fe7b9d6c00b390a8598bc1e72d42d8343cb218..1365d67fed75eed3bc33aaed77aac4481039f27a:/src/s4u/s4u_Netzone.cpp diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp index cc6071c322..fa6f0c2d26 100644 --- a/src/s4u/s4u_Netzone.cpp +++ b/src/s4u/s4u_Netzone.cpp @@ -1,49 +1,45 @@ -/* 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; - -NetZone::NetZone(kernel::routing::NetZoneImpl* impl) : pimpl_(impl) {} - -NetZone::~NetZone() -{ -} +xbt::signal NetZone::on_creation; +xbt::signal NetZone::on_seal; -std::unordered_map* NetZone::get_properties() +const std::unordered_map* NetZone::get_properties() const { - return simgrid::simix::simcall([this] { return &properties_; }); + return pimpl_->get_properties(); } /** Retrieve the property value (or nullptr if not set) */ -const char* NetZone::get_property(std::string key) +const char* NetZone::get_property(const std::string& key) const { - return properties_.at(key).c_str(); + return pimpl_->get_property(key); } -void NetZone::set_property(std::string key, std::string value) + +void NetZone::set_property(const std::string& key, const std::string& value) { - simgrid::simix::simcall([this, key, value] { properties_[key] = value; }); + kernel::actor::simcall([this, &key, &value] { pimpl_->set_property(key, value); }); } /** @brief Returns the list of direct children (no grand-children) */ -std::vector NetZone::get_children() +std::vector NetZone::get_children() const { std::vector res; for (auto child : *(pimpl_->get_children())) @@ -51,17 +47,36 @@ std::vector NetZone::get_children() return res; } +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 pimpl_->get_cname(); } + NetZone* NetZone::get_father() { - return pimpl_->get_father()->get_iface(); + return pimpl_->get_parent()->get_iface(); +} + +NetZone* NetZone::get_parent() const +{ + return pimpl_->get_parent()->get_iface(); +} + +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) @@ -69,33 +84,46 @@ NetZone* NetZone::get_father() * Only the hosts that are directly contained in this NetZone are retrieved, * not the ones contained in sub-netzones. */ -std::vector NetZone::get_all_hosts() +std::vector NetZone::get_all_hosts() const { return pimpl_->get_all_hosts(); } -void NetZone::getHosts(std::vector* whereto) +int NetZone::get_host_count() const +{ + return pimpl_->get_host_count(); +} + +int NetZone::add_component(kernel::routing::NetPoint* elm) +{ + return pimpl_->add_component(elm); +} + +std::vector NetZone::get_link_list_impl(const std::vector link_list) { - for (auto const& card : pimpl_->get_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::get_host_count() +void NetZone::add_regular_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, + const std::vector& link_list, bool symmetrical) { - return pimpl_->get_host_count(); + add_route(src, dst, nullptr, nullptr, NetZone::get_link_list_impl(link_list), symmetrical); } -int NetZone::add_component(kernel::routing::NetPoint* elm) +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) { - return pimpl_->add_component(elm); + 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, - std::vector& link_list, bool symmetrical) + const std::vector& link_list, bool symmetrical) { pimpl_->add_route(src, dst, gw_src, gw_dst, link_list, symmetrical); } @@ -105,10 +133,50 @@ void NetZone::add_bypass_route(kernel::routing::NetPoint* src, kernel::routing:: { pimpl_->add_bypass_route(src, dst, gw_src, gw_dst, link_list, symmetrical); } -std::vector NetZone::getVertices() + +void NetZone::extract_xbt_graph(const s_xbt_graph_t* graph, std::map>* nodes, + std::map>* edges) +{ + 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)); +} + +s4u::Link* NetZone::create_link(const std::string& name, const std::vector& bandwidths, + s4u::Link::SharingPolicy policy) { - return pimpl_->get_vertices(); + 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 } // namespace simgrid @@ -119,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(); } @@ -129,24 +197,24 @@ 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->get_children()) { - xbt_dict_set(whereto, elem->get_cname(), static_cast(elem), nullptr); + 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->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->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->get_all_hosts();