Routing: kill some dupplicated code

[simgrid.git] / src / surf / surf_routing_vivaldi.hpp

diff --git a/src/surf/surf_routing_vivaldi.hpp b/src/surf/surf_routing_vivaldi.hpp
index a85bb93..9e607ba 100644 (file)
--- a/src/surf/surf_routing_vivaldi.hpp
+++ b/src/surf/surf_routing_vivaldi.hpp
@@ -1,9 +1,11 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. 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. */
 
+#include "xbt/swag.h"
+
 #include "surf_routing_generic.hpp"
 
 #ifndef SURF_ROUTING_VIVALDI_HPP_
@@ -11,36 +13,26 @@
 
 /* ************************************************** */
 /* **************  Vivaldi ROUTING   **************** */
-AS_t model_vivaldi_create(void);      /* create structures for vivaldi routing model */
-#define HOST_PEER(peername) bprintf("peer_%s", peername)
-#define ROUTER_PEER(peername) bprintf("router_%s", peername)
-#define LINK_PEER(peername) bprintf("link_%s", peername)
+XBT_PRIVATE AS_t model_vivaldi_create(void);      /* create structures for vivaldi routing model */
+
+namespace simgrid {
+namespace surf {
 
 /***********
  * Classes *
  ***********/
-class AsVivaldi;
+class XBT_PRIVATE AsVivaldi;
 
 class AsVivaldi: public AsGeneric {
 public:
-  sg_platf_route_cbarg_t *p_routingTable;
-
-  AsVivaldi() : AsGeneric() {};
+  AsVivaldi(const char *name);
+  void Seal() override {}; // nothing to do
   ~AsVivaldi() {};
 
-  void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t into, double *latency);
-  //void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges);
-  //sg_platf_route_cbarg_t getBypassRoute(RoutingEdge *src, RoutingEdge *dst, double *lat);
-
-  /* The parser calls the following functions to inform the routing models
-   * that a new element is added to the AS currently built.
-   *
-   * Of course, only the routing model of this AS is informed, not every ones */
-  int parsePU(RoutingEdge *elm); /* A host or a router, whatever */
-  //virtual int parseAS( RoutingEdge *elm)=0;
-
-  //virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0;
+  void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
 };
 
+}
+}
 
 #endif /* SURF_ROUTING_VIVALDI_HPP_ */