X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ed511a15702f5a82f740888d43348bc1c7e07205..b646a2e66bc3ff9183235ab20870815dd89f7ea7:/src/surf/surf_routing.hpp

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index e48ee7b001..bbe4e165b1 100644
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -12,7 +12,7 @@
 
 #include "surf_interface.hpp"
 #include "src/surf/xml/platf_private.hpp" // FIXME: including this here is pure madness. KILKILKIL XML.
-#include "src/surf/AsImpl.hpp"
+#include "src/kernel/routing/AsImpl.hpp"
 
 #include <float.h>
 #include <vector>
@@ -24,7 +24,8 @@ XBT_PRIVATE xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_
 SG_END_DECL()
 
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace routing {
 
   XBT_PUBLIC_DATA(simgrid::xbt::signal<void(s4u::As*)>) asCreatedCallbacks;
   XBT_PUBLIC_DATA(simgrid::xbt::signal<void(NetCard*)>) netcardCreatedCallbacks;
@@ -44,7 +45,7 @@ class RoutingPlatf;
 class NetCard {
 public:
   virtual ~NetCard(){};
-  virtual int id()=0; // Our rank in the vertices_ array of our containing AS.
+  virtual unsigned int id()=0; // Our rank in the vertices_ array of our containing AS.
   virtual char *name()=0;
   virtual AsImpl *containingAS()=0; // This is the AS in which I am
   virtual bool isAS()=0;
@@ -64,11 +65,11 @@ public:
   {
     if (containingAS != nullptr)
       id_ = containingAS->addComponent(this);
-    simgrid::surf::netcardCreatedCallbacks(this);
+    simgrid::kernel::routing::netcardCreatedCallbacks(this);
   }
   ~NetCardImpl() { xbt_free(name_);};
 
-  int id()           override {return id_;}
+  unsigned int id()  override {return id_;}
   char *name()       override {return name_;}
   AsImpl *containingAS() override {return containingAS_;}
 
@@ -77,7 +78,7 @@ public:
   bool isRouter()    override {return componentType_ == Type::Router;}
 
 private:
-  int id_ = -1;
+  unsigned int id_;
   char *name_;
   NetCard::Type componentType_;
   AsImpl *containingAS_;
@@ -92,7 +93,7 @@ public:
     : src_(src), dst_(dst), link_(link) {};
   NetCard *src_;
   NetCard *dst_;
-  void *link_;
+  void *link_; // FIXME: void* should die just like the death*
 };
 
 /** @ingroup SURF_routing_interface
@@ -100,15 +101,14 @@ public:
  */
 XBT_PUBLIC_CLASS RoutingPlatf {
 public:
-  RoutingPlatf(Link *loopback);
+  explicit RoutingPlatf(Link *loopback);
   ~RoutingPlatf();
   AsImpl *root_ = nullptr;
   Link *loopback_;
-  xbt_dynar_t getOneLinkRoutes(void);
+  xbt_dynar_t getOneLinkRoutes();
   void getRouteAndLatency(NetCard *src, NetCard *dst, std::vector<Link*> * links, double *latency);
 };
 
-}
-}
+}}}
 
 #endif /* NETWORK_ROUTING_HPP_ */