X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea08504776a7b5b76f57bfee434b43ed572ca9f1..f23b0fb864cb60978c1fcfd48d50f62dd054fe31:/include/simgrid/s4u/NetZone.hpp

diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp
index 4fea672f9c..e4d56e0f77 100644
--- a/include/simgrid/s4u/NetZone.hpp
+++ b/include/simgrid/s4u/NetZone.hpp
@@ -27,18 +27,55 @@ class XBT_PUBLIC NetZone {
 protected:
   friend simgrid::kernel::routing::NetZoneImpl;
 
-  explicit NetZone(NetZone * father, std::string name);
-  virtual ~NetZone();
+  explicit NetZone(kernel::routing::NetZoneImpl* impl);
+  ~NetZone();
 
 public:
-  /** @brief Seal your netzone once you're done adding content, and before routing stuff through it */
-  virtual void seal();
   /** @brief Retrieves the name of that netzone as a C++ string */
-  const std::string& get_name() const { return name_; }
+  const std::string& get_name() const;
   /** @brief Retrieves the name of that netzone as a C string */
   const char* get_cname() const;
-  NetZone* getFather();
 
+  NetZone* get_father();
+
+  std::vector<Host*> get_all_hosts();
+  int get_host_count();
+
+  kernel::routing::NetZoneImpl* get_impl() { return pimpl_; }
+
+private:
+  kernel::routing::NetZoneImpl* pimpl_;
+  std::unordered_map<std::string, std::string> properties_;
+
+public:
+  /** Get the properties assigned to a netzone */
+  std::unordered_map<std::string, std::string>* get_properties();
+
+  std::vector<NetZone*> get_children();
+
+  /** Retrieve the property value (or nullptr if not set) */
+  const char* get_property(const char* key);
+  void set_property(const char* key, const char* value);
+
+  /* Add content to the netzone, at parsing time. It should be sealed afterward. */
+  int add_component(kernel::routing::NetPoint* elm); /* A host, a router or a netzone, whatever */
+  void 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 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);
+
+  /*** Called on each newly created regular route (not on bypass routes) */
+  static simgrid::xbt::signal<void(bool symmetrical, 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)>
+      on_route_creation;
+  static simgrid::xbt::signal<void(NetZone&)> on_creation;
+  static simgrid::xbt::signal<void(NetZone&)> on_seal;
+
+  // Deprecation wrappers
+  XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_father()") NetZone* getFather() { return get_father(); }
   XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_name()") const std::string& getName() const { return get_name(); }
   XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_cname()") const char* getCname() const { return get_cname(); }
   XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::add_route()") void addRoute(
@@ -53,50 +90,33 @@ public:
   {
     add_bypass_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
   }
-
-  std::vector<NetZone*>* getChildren();             // Sub netzones
-  void getHosts(std::vector<s4u::Host*> * whereto); // retrieve my content as a vector of hosts
-  int getHostCount();
-
-  /** Get the properties assigned to a host */
-  std::unordered_map<std::string, std::string>* getProperties();
-
-  /** Retrieve the property value (or nullptr if not set) */
-  const char* getProperty(const char* key);
-  void setProperty(const char* key, const char* value);
-
-  /* Add content to the netzone, at parsing time. It should be sealed afterward. */
-  virtual int addComponent(kernel::routing::NetPoint * elm); /* A host, a router or a netzone, whatever */
-  virtual void 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);
-  virtual void 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) = 0;
-
-  /*** Called on each newly created regular route (not on bypass routes) */
-  static simgrid::xbt::signal<void(bool symmetrical, 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)>
-      onRouteCreation;
-  static simgrid::xbt::signal<void(NetZone&)> onCreation;
-  static simgrid::xbt::signal<void(NetZone&)> onSeal;
-
-protected:
-  unsigned int getTableSize() { return vertices_.size(); }
-  std::vector<kernel::routing::NetPoint*> getVertices() { return vertices_; }
-
-private:
-  // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
-  std::vector<kernel::routing::NetPoint*> vertices_;
-
-  std::unordered_map<std::string, std::string> properties_;
-  NetZone* father_ = nullptr;
-  std::string name_;
-
-  bool sealed_ = false; // We cannot add more content when sealed
-
-  std::vector<NetZone*>* children_ = nullptr; // sub-netzones
+  XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_properties()") std::unordered_map<std::string, std::string>* getProperties()
+  {
+    return get_properties();
+  }
+  XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_property()") const char* getProperty(const char* key)
+  {
+    return get_property(key);
+  }
+  XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::set_property()") void setProperty(const char* key, const char* value)
+  {
+    set_property(key, value);
+  }
+  XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::add_component()") int addComponent(kernel::routing::NetPoint* elm)
+  {
+    return add_component(elm);
+  }
+  XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_vertices()") std::vector<kernel::routing::NetPoint*> getVertices();
+  XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_host_count()") int getHostCount() { return get_host_count(); }
+  XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_all_hosts()") void getHosts(
+      std::vector<s4u::Host*>* whereto); // retrieve my content as a vector of hosts
+  XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::get_children()") std::vector<NetZone*>* getChildren()
+  {
+    std::vector<NetZone*>* res = new std::vector<NetZone*>();
+    for (auto child : get_children())
+      res->push_back(child);
+    return res;
+  }
 };
 }
 }; // Namespace simgrid::s4u