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

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index d11b9ca37c..a0c2e3ba24 100644
--- 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,14 +10,12 @@
 #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>
 #include <vector>
 
 SG_BEGIN_DECL()
-XBT_PUBLIC(void) routing_model_create(Link *loopback);
 XBT_PRIVATE xbt_node_t new_xbt_graph_node (xbt_graph_t graph, const char *name, xbt_dict_t nodes);
 XBT_PRIVATE xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges);
 SG_END_DECL()
@@ -28,7 +25,6 @@ namespace kernel {
 namespace routing {
 
   XBT_PUBLIC_DATA(simgrid::xbt::signal<void(s4u::As*)>) asCreatedCallbacks;
-  XBT_PUBLIC_DATA(simgrid::xbt::signal<void(NetCard*)>) netcardCreatedCallbacks;
 
 /***********
  * Classes *
@@ -37,51 +33,6 @@ namespace routing {
 class XBT_PRIVATE Onelink;
 class RoutingPlatf;
 
-/** @ingroup SURF_routing_interface
- * @brief Network cards are the vertices in the graph representing the network, used to compute paths between nodes.
- *
- * @details This represents a position in the network. One can route information between two netcards
- */
-class NetCard {
-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 bool isAS()=0;
-  virtual bool isHost()=0;
-  virtual bool isRouter()=0;
-  enum class Type {
-    Host, Router, As
-  };
-};
-
-struct XBT_PRIVATE NetCardImpl : public NetCard {
-public:
-  NetCardImpl(std::string name, NetCard::Type componentType, AsImpl* containingAS)
-      : name_(name), componentType_(componentType), containingAS_(containingAS)
-  {
-    if (containingAS != nullptr)
-      id_ = containingAS->addComponent(this);
-    simgrid::kernel::routing::netcardCreatedCallbacks(this);
-  }
-  ~NetCardImpl() = default;
-
-  unsigned int id()  override {return id_;}
-  std::string name() override { return name_; }
-  AsImpl *containingAS() override {return containingAS_;}
-
-  bool isAS()        override {return componentType_ == Type::As;}
-  bool isHost()      override {return componentType_ == Type::Host;}
-  bool isRouter()    override {return componentType_ == Type::Router;}
-
-private:
-  unsigned int id_;
-  std::string name_;
-  NetCard::Type componentType_;
-  AsImpl *containingAS_;
-};
-
 class AsRoute {
 public:
   explicit AsRoute(NetCard* gwSrc, NetCard* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {}
@@ -95,24 +46,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*
-};
-
-/** @ingroup SURF_routing_interface
- * @brief The class representing a whole routing platform
- */
-XBT_PUBLIC_CLASS RoutingPlatf {
-public:
-  explicit RoutingPlatf(Link *loopback);
-  ~RoutingPlatf();
-  AsImpl *root_ = nullptr;
-  Link *loopback_;
-  xbt_dynar_t getOneLinkRoutes();
-  void getRouteAndLatency(NetCard *src, NetCard *dst, std::vector<Link*> * links, double *latency);
+  Onelink(Link* link, NetCard* src, NetCard* dst) : src_(src), dst_(dst), link_(link) {}
+  NetCard* src_;
+  NetCard* dst_;
+  Link* link_;
 };
 
 }}}