fix jedule and do the right thing for netzone hosts

[simgrid.git] / include / simgrid / s4u / NetZone.hpp

diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp
index bf96c02..38cfab2 100644 (file)
--- a/include/simgrid/s4u/NetZone.hpp
+++ b/include/simgrid/s4u/NetZone.hpp
@@ -40,6 +40,7 @@ protected:
 
   explicit NetZone(NetZone * father, const char* name);
   virtual ~NetZone();
 
   explicit NetZone(NetZone * father, const char* name);
   virtual ~NetZone();

+  std::vector<Host*>* hosts_ = new std::vector<Host*>();

 
 public:
   /** @brief Seal your netzone once you're done adding content, and before routing stuff through it */
 
 public:
   /** @brief Seal your netzone once you're done adding content, and before routing stuff through it */


@@ -48,7 +49,7 @@ public:
   NetZone* father();
 
   xbt_dict_t children(); // Sub netzones
   NetZone* father();
 
   xbt_dict_t children(); // Sub netzones

-  xbt_dynar_t hosts();   // my content as a dynar
+  std::vector<Host*>* hosts(); // my content as a vector of hosts

 
   /** Get the properties assigned to a host */
   std::unordered_map<std::string, std::string>* properties();
 
   /** Get the properties assigned to a host */
   std::unordered_map<std::string, std::string>* properties();


@@ -58,18 +59,18 @@ public:
   void setProperty(const char* key, const char* value);
 
   /* Add content to the netzone, at parsing time. It should be sealed afterward. */
   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::NetCard * elm); /* A host, a router or a netzone, whatever */
+  virtual int addComponent(kernel::routing::NetPoint * 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;
 
   /*** Called on each newly created regular route (not on bypass routes) */
   virtual void addRoute(sg_platf_route_cbarg_t route);
   virtual void addBypassRoute(sg_platf_route_cbarg_t e_route) = 0;
 
   /*** 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)>
+  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<surf::LinkImpl*>* link_list)>

       onRouteCreation;
 
 protected:
       onRouteCreation;
 
 protected:

-  std::vector<kernel::routing::NetCard*>
+  std::vector<kernel::routing::NetPoint*>

       vertices_; // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
 
 private:
       vertices_; // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
 
 private: