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

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index cb29f193e5..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,69 +10,35 @@
 #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 <float.h>
+#include "src/kernel/routing/AsImpl.hpp"
 
+#include <float.h>
 #include <vector>
-#include <map>
 
 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()
 
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace routing {
+
+  XBT_PUBLIC_DATA(simgrid::xbt::signal<void(s4u::As*)>) asCreatedCallbacks;
 
 /***********
  * Classes *
  ***********/
 
-class XBT_PRIVATE RoutingModelDescription;
 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 {
+class AsRoute {
 public:
-  virtual ~NetCard(){};
-  virtual int id()=0; // Our rank in the vertices_ array of our containing AS.
-  virtual void setId(int id)=0;
-  virtual char *name()=0;
-  virtual s4u::As *containingAS()=0; // This is the AS in which I am
-  virtual bool isAS()=0;
-  virtual bool isHost()=0;
-  virtual bool isRouter()=0;
-};
-
-struct XBT_PRIVATE NetCardImpl : public NetCard {
-public:
-  NetCardImpl(const char *name, e_surf_network_element_type_t componentType, s4u::As *as)
-  : name_(xbt_strdup(name)),
-    componentType_(componentType),
-    containingAS_(as)
-  {}
-  ~NetCardImpl() { xbt_free(name_);};
-
-  int id()           override {return id_;}
-  void setId(int id) override {id_ = id;}
-  char *name()       override {return name_;}
-  s4u::As *containingAS() override {return containingAS_;}
-
-  bool isAS()        override {return componentType_ == SURF_NETWORK_ELEMENT_AS;}
-  bool isHost()      override {return componentType_ == SURF_NETWORK_ELEMENT_HOST;}
-  bool isRouter()    override {return componentType_ == SURF_NETWORK_ELEMENT_ROUTER;}
-
-private:
-  int id_ = -1;
-  char *name_;
-  e_surf_network_element_type_t componentType_;
-  s4u::As *containingAS_;
+  explicit AsRoute(NetCard* gwSrc, NetCard* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {}
+  const NetCard* gw_src;
+  const NetCard* gw_dst;
+  std::vector<Link*> links;
 };
 
 /** @ingroup SURF_routing_interface
@@ -81,34 +46,12 @@ private:
  */
 class Onelink {
 public:
-  Onelink(void *link, NetCard *src, NetCard *dst)
-    : src_(src), dst_(dst), link_(link) {};
-  NetCard *src_;
-  NetCard *dst_;
-  void *link_;
+  Onelink(Link* link, NetCard* src, NetCard* dst) : src_(src), dst_(dst), link_(link) {}
+  NetCard* src_;
+  NetCard* dst_;
+  Link* link_;
 };
 
-/** @ingroup SURF_routing_interface
- * @brief The class representing a whole routing platform
- */
-XBT_PUBLIC_CLASS RoutingPlatf {
-public:
-  RoutingPlatf(Link *loopback);
-  ~RoutingPlatf();
-  s4u::As *root_ = nullptr;
-  Link *loopback_;
-  xbt_dynar_t getOneLinkRoutes(void);
-  void getRouteAndLatency(NetCard *src, NetCard *dst, std::vector<Link*> * links, double *latency);
-};
-
-/*************
- * Callbacks *
- *************/
-
-XBT_PUBLIC_DATA(simgrid::xbt::signal<void(NetCard*)>) netcardCreatedCallbacks;
-XBT_PUBLIC_DATA(simgrid::xbt::signal<void(s4u::As*)>) asCreatedCallbacks;
-
-}
-}
+}}}
 
 #endif /* NETWORK_ROUTING_HPP_ */