X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/262c0777ed16cb8e15eaadd3785c6fec87039b26..9b5c287fbf93c2ae7c3d18c8584647ef9920fe87:/src/s4u/s4u_Netzone.cpp diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp index d805c8c828..dec17ec8aa 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-2019. 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. */ @@ -14,96 +14,84 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_netzone, "S4U Networking Zones"); namespace simgrid { namespace s4u { -simgrid::xbt::signal& link_list)> - NetZone::onRouteCreation; -simgrid::xbt::signal NetZone::onCreation; -simgrid::xbt::signal NetZone::onSeal; +xbt::signal const& link_list)> + NetZone::on_route_creation; +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 &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; + auto prop = properties_.find(key); + return prop == properties_.end() ? nullptr : prop->second.c_str(); } -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] { properties_[key] = value; }); } -std::unordered_map* NetZone::getProperties() +/** @brief Returns the list of direct children (no grand-children) */ +std::vector NetZone::get_children() { - return simgrid::simix::kernelImmediate([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) +const std::string& NetZone::get_name() const { - return properties_.at(key).c_str(); + return pimpl_->get_name(); } -void NetZone::setProperty(const char* key, const char* value) +const char* NetZone::get_cname() const { - simgrid::simix::kernelImmediate([this, key, value] { properties_[key] = value; }); + return pimpl_->get_cname(); } - -/** @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() +NetZone* NetZone::get_father() { - return children_; + return pimpl_->get_father()->get_iface(); } -const char* NetZone::get_cname() const -{ - return name_.c_str(); -} -NetZone* NetZone::getFather() +/** @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 NetZone::get_all_hosts() { - return father_; + return pimpl_->get_all_hosts(); } -void NetZone::getHosts(std::vector* whereto) +int NetZone::get_host_count() { - 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::addComponent(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); } - } // namespace s4u } // namespace simgrid @@ -111,7 +99,7 @@ void NetZone::add_route(kernel::routing::NetPoint* /*src*/, kernel::routing::Net sg_netzone_t sg_zone_get_root() { - return simgrid::s4u::Engine::get_instance()->getNetRoot(); + return simgrid::s4u::Engine::get_instance()->get_netzone_root(); } const char* sg_zone_get_name(sg_netzone_t netzone) @@ -121,31 +109,30 @@ const char* sg_zone_get_name(sg_netzone_t netzone) sg_netzone_t sg_zone_get_by_name(const char* name) { - return simgrid::s4u::Engine::get_instance()->getNetzoneByNameOrNull(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) { - for (auto const& elem : *netzone->getChildren()) { + for (auto const& elem : netzone->get_children()) { xbt_dict_set(whereto, elem->get_cname(), static_cast(elem), nullptr); } } const char* sg_zone_get_property_value(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) { - netzone->setProperty(name, value); + netzone->set_property(name, value); } void sg_zone_get_hosts(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); }