X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0879f7b24ef5f62121c260ef9d22054e10e0e078..7ef49c428ab0209965a09a36ab28b59789aaa4b5:/include/simgrid/s4u/NetZone.hpp

diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp
index 4ba3ef2a2e..cb9d1ee3c9 100644
--- a/include/simgrid/s4u/NetZone.hpp
+++ b/include/simgrid/s4u/NetZone.hpp
@@ -40,22 +40,21 @@ protected:
 
   explicit NetZone(NetZone * father, const char* name);
   virtual ~NetZone();
-  std::vector<Host*> hosts_;
 
 public:
   /** @brief Seal your netzone once you're done adding content, and before routing stuff through it */
   virtual void seal();
-  char* name();
-  NetZone* father();
+  char* getCname();
+  NetZone* getFather();
 
-  std::vector<NetZone*>* children(); // Sub netzones
-  std::vector<Host*>* hosts(); // my content as a vector of hosts
+  std::vector<NetZone*>* getChildren();             // Sub netzones
+  void getHosts(std::vector<s4u::Host*> * whereto); // retrieve my content as a vector of hosts
 
   /** Get the properties assigned to a host */
-  std::unordered_map<std::string, std::string>* properties();
+  std::unordered_map<std::string, std::string>* getProperties();
 
   /** Retrieve the property value (or nullptr if not set) */
-  const char* property(const char* key);
+  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. */
@@ -68,6 +67,8 @@ public:
                                    kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
                                    std::vector<surf::LinkImpl*>* link_list)>
       onRouteCreation;
+  static simgrid::xbt::signal<void(NetZone&)> onCreation;
+  static simgrid::xbt::signal<void(NetZone&)> onSeal;
 
 protected:
   std::vector<kernel::routing::NetPoint*>
@@ -80,7 +81,7 @@ private:
 
   bool sealed_ = false; // We cannot add more content when sealed
 
-  std::vector<NetZone*>* children_; // sub-netzones
+  std::vector<NetZone*>* children_ = nullptr; // sub-netzones
 };
 }
 }; // Namespace simgrid::s4u