X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c6bbb40c161610ef1a8096ec469e8b9a703de0a..1b94b2100679d5b4355fccb6d22927efc12ca5bc:/src/s4u/s4u_Netzone.cpp

diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp
index 5eb5139489..f31917b57e 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. */
@@ -21,89 +21,94 @@ simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kern
 simgrid::xbt::signal<void(NetZone&)> NetZone::on_creation;
 simgrid::xbt::signal<void(NetZone&)> NetZone::on_seal;
 
-NetZone::NetZone(NetZone* father, std::string name) : father_(father), name_(name)
-{
-  children_ = new std::vector<NetZone*>();
-}
-
-void NetZone::seal()
-{
-  sealed_ = true;
-}
+NetZone::NetZone(kernel::routing::NetZoneImpl* impl) : pimpl_(impl) {}
 
 NetZone::~NetZone()
 {
-  for (auto const& nz : *children_)
-    delete nz;
-  delete children_;
 }
 
-std::unordered_map<std::string, std::string>* NetZone::getProperties()
+std::unordered_map<std::string, std::string>* NetZone::get_properties()
 {
   return simgrid::simix::simcall([this] { return &properties_; });
 }
 
 /** Retrieve the property value (or nullptr if not set) */
-const char* NetZone::getProperty(const char* key)
+const char* NetZone::get_property(const std::string& key)
 {
   return properties_.at(key).c_str();
 }
-void NetZone::setProperty(const char* key, const char* value)
+void NetZone::set_property(const std::string& key, std::string value)
 {
-  simgrid::simix::simcall([this, key, value] { properties_[key] = value; });
+  simgrid::simix::simcall([this, key, value] { properties_[key] = std::move(value); });
 }
 
-/** @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*>* NetZone::getChildren()
+/** @brief Returns the list of direct children (no grand-children) */
+std::vector<NetZone*> NetZone::get_children()
 {
-  return children_;
+  std::vector<NetZone*> res;
+  for (auto child : *(pimpl_->get_children()))
+    res.push_back(child->get_iface());
+  return res;
 }
 
+const std::string& NetZone::get_name() const
+{
+  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)
+ *
+ * Only the hosts that are directly contained in this NetZone are retrieved,
+ * not the ones contained in sub-netzones.
+ */
+std::vector<Host*> NetZone::get_all_hosts()
+{
+  return pimpl_->get_all_hosts();
 }
 
 void NetZone::getHosts(std::vector<s4u::Host*>* whereto)
 {
-  for (auto const& card : vertices_) {
+  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);
   }
 }
 
-int NetZone::getHostCount()
+int NetZone::get_host_count()
 {
-  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_->get_host_count();
 }
 
-int NetZone::addComponent(kernel::routing::NetPoint* elm)
+int NetZone::add_component(kernel::routing::NetPoint* elm)
 {
-  vertices_.push_back(elm);
-  return vertices_.size() - 1; // The rank of the newly created object
+  return pimpl_->add_component(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<kernel::resource::LinkImpl*>& /*link_list*/, bool /*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<kernel::resource::LinkImpl*>& link_list, bool symmetrical)
 {
-  xbt_die("NetZone '%s' does not accept new routes (wrong class).", name_.c_str());
+  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<kernel::resource::LinkImpl*>& link_list, bool symmetrical)
+{
+  pimpl_->add_bypass_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
+}
+std::vector<kernel::routing::NetPoint*> NetZone::getVertices()
+{
+  return pimpl_->get_vertices();
 }
-
 } // namespace s4u
 } // namespace simgrid
 
@@ -126,26 +131,25 @@ sg_netzone_t sg_zone_get_by_name(const char* 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<void*>(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<simgrid::s4u::Host*> hosts;
-  netzone->getHosts(&hosts);
+  std::vector<simgrid::s4u::Host*> hosts = netzone->get_all_hosts();
   for (auto const& host : hosts)
     xbt_dynar_push(whereto, &host);
 }