Use boost instead of xbt in Vivaldi

[simgrid.git] / src / kernel / routing / AsVivaldi.hpp

diff --git a/src/kernel/routing/AsVivaldi.hpp b/src/kernel/routing/AsVivaldi.hpp
index adf5ba1..7e702d8 100644 (file)
--- a/src/kernel/routing/AsVivaldi.hpp
+++ b/src/kernel/routing/AsVivaldi.hpp
@@ -9,19 +9,29 @@
 #include "src/kernel/routing/AsCluster.hpp"
 
 namespace simgrid {
 #include "src/kernel/routing/AsCluster.hpp"
 
 namespace simgrid {

+namespace kernel {

 namespace routing {
 
 namespace routing {
 

-/* This derivates from cluster because each host has a private link */
+/* This extends cluster because each host has a private link */

 class XBT_PRIVATE AsVivaldi: public AsCluster {
 public:
 class XBT_PRIVATE AsVivaldi: public AsCluster {
 public:

-  explicit AsVivaldi(const char *name);
-  ~AsVivaldi() override;
+  explicit AsVivaldi(As* father, const char* name);

 
 

-  xbt_dynar_t getOneLinkRoutes() override {return nullptr;};
-  void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
+  void getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t into, double* latency) override;

 };
 
 };
 

+namespace vivaldi {
+class XBT_PRIVATE Coords {
+public:
+  static simgrid::xbt::Extension<NetCard, Coords> EXTENSION_ID;
+  explicit Coords(NetCard* host, const char* str);
+  virtual ~Coords();
+
+  std::vector<double> coords;
+};
+}

 }
 }
 }
 }

+} // namespace

 
 #endif /* SURF_ROUTING_VIVALDI_HPP_ */
 
 #endif /* SURF_ROUTING_VIVALDI_HPP_ */