extend the example with another type of Zone

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

diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp
index fc8c8fa..778d179 100644 (file)
--- a/include/simgrid/s4u/NetZone.hpp
+++ b/include/simgrid/s4u/NetZone.hpp
@@ -13,17 +13,12 @@
 
 #include <xbt/base.h>
 #include <xbt/graph.h>
+#include <xbt/signal.hpp>
 
+#include <simgrid/forward.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 {
 
@@ -52,6 +47,7 @@ public:
 
   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();
@@ -62,13 +58,17 @@ public:
 
   /* 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 addRoute(sg_platf_route_cbarg_t route);
-  virtual void addBypassRoute(sg_platf_route_cbarg_t e_route) = 0;
+  virtual void addRoute(kernel::routing::NetPoint * src, kernel::routing::NetPoint * dst,
+                        kernel::routing::NetPoint * gw_src, kernel::routing::NetPoint * gw_dst,
+                        std::vector<simgrid::surf::LinkImpl*> & link_list, bool symmetrical);
+  virtual void addBypassRoute(kernel::routing::NetPoint * src, kernel::routing::NetPoint * dst,
+                              kernel::routing::NetPoint * gw_src, kernel::routing::NetPoint * gw_dst,
+                              std::vector<simgrid::surf::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<surf::LinkImpl*>* link_list)>
+                                   std::vector<surf::LinkImpl*>& link_list)>
       onRouteCreation;
   static simgrid::xbt::signal<void(NetZone&)> onCreation;
   static simgrid::xbt::signal<void(NetZone&)> onSeal;