X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/53300623ffc4a530dedcc517d559926ea0891edf..31375d046dcee5f7d77165f11a705ab8ff2184bc:/src/s4u/s4u_Netzone.cpp diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp index a01bd946c5..0a18e0cefd 100644 --- a/src/s4u/s4u_Netzone.cpp +++ b/src/s4u/s4u_Netzone.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -7,68 +7,55 @@ #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"); - 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(NetZone* father, std::string name) : father_(father), name_(name) -{ - children_ = new std::vector(); -} +xbt::signal NetZone::on_creation; +xbt::signal NetZone::on_seal; -void NetZone::seal() +const std::unordered_map* NetZone::get_properties() const { - sealed_ = true; + return pimpl_->get_properties(); } -NetZone::~NetZone() +/** Retrieve the property value (or nullptr if not set) */ +const char* NetZone::get_property(const std::string& key) const { - for (auto const& nz : *children_) - delete nz; - delete children_; + return pimpl_->get_property(key); } -std::unordered_map* NetZone::get_properties() +void NetZone::set_property(const std::string& key, const std::string& value) { - return simgrid::simix::simcall([this] { return &properties_; }); + kernel::actor::simcall([this, &key, &value] { pimpl_->set_property(key, value); }); } -/** Retrieve the property value (or nullptr if not set) */ -const char* NetZone::get_property(const char* key) +/** @brief Returns the list of direct children (no grand-children) */ +std::vector NetZone::get_children() const { - return properties_.at(key).c_str(); -} -void NetZone::set_property(const char* key, const char* value) -{ - simgrid::simix::simcall([this, key, value] { properties_[key] = value; }); + std::vector res; + for (auto child : *(pimpl_->get_children())) + res.push_back(child->get_iface()); + return res; } -/** @brief Returns the list of direct children (no grand-children) - * - * This function returns the internal copy of the children, not a copy. Don't mess with it! - */ -std::vector* NetZone::getChildren() +const std::string& NetZone::get_name() const { - return children_; + return pimpl_->get_name(); } - const char* NetZone::get_cname() const { - return name_.c_str(); + return pimpl_->get_cname(); } NetZone* NetZone::get_father() { - return father_; + return pimpl_->get_father()->get_iface(); } /** @brief Returns the list of the hosts found in this NetZone (not recursively) @@ -76,50 +63,42 @@ 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 { - std::vector res; - for (auto const& card : vertices_) { - s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->get_name()); - if (host != nullptr) - res.push_back(host); - } - return res; + return pimpl_->get_all_hosts(); } -void NetZone::getHosts(std::vector* whereto) +int NetZone::get_host_count() const { - 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); - } + return pimpl_->get_host_count(); } -int NetZone::getHostCount() +int NetZone::add_component(kernel::routing::NetPoint* elm) { - 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; + return pimpl_->add_component(elm); } -int NetZone::add_component(kernel::routing::NetPoint* elm) +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) { - vertices_.push_back(elm); - return vertices_.size() - 1; // The rank of the newly created object + pimpl_->add_route(src, dst, gw_src, gw_dst, 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*/) +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) { - xbt_die("NetZone '%s' does not accept new routes (wrong class).", name_.c_str()); + pimpl_->add_bypass_route(src, dst, gw_src, gw_dst, link_list, symmetrical); } +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); +} } // namespace s4u } // namespace simgrid @@ -130,7 +109,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(); } @@ -140,24 +119,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->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->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();