X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b035f4fba1852d16bb9316bb0b23329b108b605b..7d27e3c81e8c611946aaea9de4edc2714b40be8a:/src/surf/surf_routing.cpp

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index 596ccee010..7904fff958 100644
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -10,26 +10,16 @@
 
 #include <simgrid/s4u/host.hpp>
 
-#include "surf_routing.hpp"
+#include "src/surf/surf_routing.hpp"
 
 #include "simgrid/sg_config.h"
-#include "storage_interface.hpp"
+#include "src/surf/storage_interface.hpp"
 
 #include "src/kernel/routing/AsImpl.hpp"
-#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
+#include "src/surf/network_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
 
-namespace simgrid {
-namespace kernel {
-namespace routing {
-
-  /* Callbacks */
-  simgrid::xbt::signal<void(NetCard*)> netcardCreatedCallbacks;
-  simgrid::xbt::signal<void(s4u::As*)> asCreatedCallbacks;
-
-}}} // namespace simgrid::kernel::routing
-
 /**
  * @ingroup SURF_build_api
  * @brief A library containing all known hosts
@@ -42,26 +32,8 @@ int MSG_STORAGE_LEVEL = -1;          //Msg storage level
 
 xbt_lib_t as_router_lib;
 int ROUTING_ASR_LEVEL = -1;          //Routing level
-int COORD_ASR_LEVEL = -1;            //Coordinates level
-int NS3_ASR_LEVEL = -1;              //host node for ns3
 int ROUTING_PROP_ASR_LEVEL = -1;     //Where the properties are stored
 
-/** @brief Retrieve a netcard from its name
- *
- * Netcards are the thing that connect host or routers to the network
- */
-simgrid::kernel::routing::NetCard *sg_netcard_by_name_or_null(const char *name)
-{
-  sg_host_t h = sg_host_by_name(name);
-  simgrid::kernel::routing::NetCard *netcard = h==nullptr ? nullptr: h->pimpl_netcard;
-  if (!netcard)
-    netcard = (simgrid::kernel::routing::NetCard*) xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL);
-  return netcard;
-}
-
-/* Global vars */
-simgrid::kernel::routing::RoutingPlatf* routing_platf = new simgrid::kernel::routing::RoutingPlatf();
-
 void sg_platf_new_trace(sg_platf_trace_cbarg_t trace)
 {
   tmgr_trace_t tmgr_trace;
@@ -75,53 +47,6 @@ void sg_platf_new_trace(sg_platf_trace_cbarg_t trace)
   xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, nullptr);
 }
 
-namespace simgrid {
-namespace kernel {
-namespace routing {
-
-/**
- * \brief Find a route between hosts
- *
- * \param src the network_element_t for src host
- * \param dst the network_element_t for dst host
- * \param route where to store the list of links.
- *              If *route=nullptr, create a short lived dynar. Else, fill the provided dynar
- * \param latency where to store the latency experienced on the path (or nullptr if not interested)
- *                It is the caller responsibility to initialize latency to 0 (we add to provided route)
- * \pre route!=nullptr
- *
- * walk through the routing components tree and find a route between hosts
- * by calling each "get_route" function in each routing component.
- */
-void RoutingPlatf::getRouteAndLatency(NetCard *src, NetCard *dst, std::vector<Link*> * route, double *latency)
-{
-  XBT_DEBUG("getRouteAndLatency from %s to %s", src->name().c_str(), dst->name().c_str());
-
-  AsImpl::getRouteRecursive(src, dst, route, latency);
-}
-
-static void _recursiveGetOneLinkRoutes(AsImpl* as, xbt_dynar_t accumulator)
-{
-  //adding my one link routes
-  as->getOneLinkRoutes(accumulator);
-
-  //recursing
-  char *key;
-  xbt_dict_cursor_t cursor = nullptr;
-  AsImpl *rc_child;
-  xbt_dict_foreach(as->children(), cursor, key, rc_child) {
-    _recursiveGetOneLinkRoutes(rc_child, accumulator);
-  }
-}
-
-xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){
-  xbt_dynar_t res = xbt_dynar_new(sizeof(Onelink*), xbt_free_f);
-  _recursiveGetOneLinkRoutes(root_, res);
-  return res;
-}
-
-}}}
-
 /* ************************************************************************** */
 /* ************************* GENERIC PARSE FUNCTIONS ************************ */
 
@@ -148,13 +73,3 @@ void routing_register_callbacks()
   instr_routing_define_callbacks();
 }
 
-/** \brief Frees all memory allocated by the routing module */
-void routing_exit() {
-  delete routing_platf;
-}
-
-simgrid::kernel::routing::RoutingPlatf::RoutingPlatf() = default;
-simgrid::kernel::routing::RoutingPlatf::~RoutingPlatf()
-{
-  delete root_;
-}