Merge branch 'master' of github.com:simgrid/simgrid

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

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index e15db96..dbedf32 100644 (file)
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2016. 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. */
@@ -11,7 +10,6 @@
 #include <xbt/signal.hpp>
 
 #include "surf_interface.hpp"
-#include "src/surf/xml/platf_private.hpp" // FIXME: including this here is pure madness. KILKILKIL XML.
 #include "src/kernel/routing/AsImpl.hpp"
 
 #include <float.h>
@@ -46,7 +44,8 @@ public:
   virtual ~NetCard()            = default;
   virtual unsigned int id()=0; // Our rank in the vertices_ array of our containing AS.
   virtual std::string name()    = 0;
-  virtual AsImpl *containingAS()=0; // This is the AS in which I am
+  virtual const char* cname()    = 0;
+  virtual AsImpl* containingAS() = 0; // This is the AS in which I am
   virtual bool isAS()=0;
   virtual bool isHost()=0;
   virtual bool isRouter()=0;
@@ -68,6 +67,7 @@ public:
 
   unsigned int id()  override {return id_;}
   std::string name() override { return name_; }
+  const char* cname() override { return name_.c_str(); }
   AsImpl *containingAS() override {return containingAS_;}
 
   bool isAS()        override {return componentType_ == Type::As;}
@@ -94,11 +94,10 @@ public:
  */
 class Onelink {
 public:
-  Onelink(void *link, NetCard *src, NetCard *dst)
-    : src_(src), dst_(dst), link_(link) {};
-  NetCard *src_;
-  NetCard *dst_;
-  void *link_; // FIXME: void* should die just like the death*
+  Onelink(Link* link, NetCard* src, NetCard* dst) : src_(src), dst_(dst), link_(link){};
+  NetCard* src_;
+  NetCard* dst_;
+  Link* link_;
 };
 
 /** @ingroup SURF_routing_interface
@@ -109,7 +108,6 @@ public:
   explicit RoutingPlatf();
   ~RoutingPlatf();
   AsImpl *root_ = nullptr;
-  xbt_dynar_t getOneLinkRoutes();
   void getRouteAndLatency(NetCard *src, NetCard *dst, std::vector<Link*> * links, double *latency);
 };