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

diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp
index bf96c02933..e4d56e0f77 100644
--- a/include/simgrid/s4u/NetZone.hpp
+++ b/include/simgrid/s4u/NetZone.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2016-2018. 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. */
@@ -6,25 +6,15 @@
 #ifndef SIMGRID_S4U_NETZONE_HPP
 #define SIMGRID_S4U_NETZONE_HPP
 
+#include <simgrid/forward.h>
+#include <xbt/signal.hpp>
+
 #include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include <xbt/base.h>
-#include <xbt/graph.h>
-
-#include <simgrid/s4u/forward.hpp>
-
-#include "src/surf/xml/platf_private.hpp" // FIXME: kill sg_platf_route_cbarg_t to remove that UGLY include
-
 namespace simgrid {
-namespace kernel {
-namespace routing {
-class NetZoneImpl;
-}
-}
-
 namespace s4u {
 
 /** @brief Networking Zones
@@ -33,53 +23,100 @@ namespace s4u {
  * netzones. In SimGrid, there is a hierarchy of netzones, with a unique root zone (that you can retrieve from the
  * s4u::Engine).
  */
-XBT_PUBLIC_CLASS NetZone
-{
+class XBT_PUBLIC NetZone {
 protected:
   friend simgrid::kernel::routing::NetZoneImpl;
 
-  explicit NetZone(NetZone * father, const char* 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();
-  char* name();
-  NetZone* father();
+  /** @brief Retrieves the name of that netzone as a C++ string */
+  const std::string& get_name() const;
+  /** @brief Retrieves the name of that netzone as a C string */
+  const char* get_cname() const;
 
-  xbt_dict_t children(); // Sub netzones
-  xbt_dynar_t hosts();   // my content as a dynar
+  NetZone* get_father();
 
-  /** Get the properties assigned to a host */
-  std::unordered_map<std::string, std::string>* properties();
+  std::vector<Host*> get_all_hosts();
+  int get_host_count();
 
-  /** Retrieve the property value (or nullptr if not set) */
-  const char* property(const char* key);
-  void setProperty(const char* key, const char* value);
+  kernel::routing::NetZoneImpl* get_impl() { return pimpl_; }
 
-  /* Add content to the netzone, at parsing time. It should be sealed afterward. */
-  virtual int addComponent(kernel::routing::NetCard * elm); /* A host, a router or a netzone, whatever */
-  virtual void addRoute(sg_platf_route_cbarg_t route);
-  virtual void addBypassRoute(sg_platf_route_cbarg_t e_route) = 0;
+private:
+  kernel::routing::NetZoneImpl* pimpl_;
+  std::unordered_map<std::string, std::string> properties_;
 
-  /*** Called on each newly created regular route (not on bypass routes) */
-  static simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetCard* src, kernel::routing::NetCard* dst,
-                                   kernel::routing::NetCard* gw_src, kernel::routing::NetCard* gw_dst,
-                                   std::vector<Link*>* link_list)>
-      onRouteCreation;
+public:
+  /** Get the properties assigned to a netzone */
+  std::unordered_map<std::string, std::string>* get_properties();
 
-protected:
-  std::vector<kernel::routing::NetCard*>
-      vertices_; // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
+  std::vector<NetZone*> get_children();
 
-private:
-  std::unordered_map<std::string, std::string> properties_;
-  NetZone* father_ = nullptr;
-  char* name_      = nullptr;
+  /** 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);
 
-  bool sealed_ = false; // We cannot add more content when sealed
+  /* 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);
 
-  xbt_dict_t children_ = xbt_dict_new_homogeneous(nullptr); // sub-netzones
+  /*** 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(
+      kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src,
+      kernel::routing::NetPoint* gw_dst, std::vector<simgrid::kernel::resource::LinkImpl*>& link_list, bool symmetrical)
+  {
+    add_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
+  }
+  XBT_ATTRIB_DEPRECATED_v323("Please use NetZone::add_bypass_route()") void addBypassRoute(
+      kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src,
+      kernel::routing::NetPoint* gw_dst, std::vector<simgrid::kernel::resource::LinkImpl*>& link_list, bool symmetrical)
+  {
+    add_bypass_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
+  }
+  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