X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1a5f89a7c21cf47e6b9603906d32abf0f3b0dd0..390ee57ed79bf7577c2bce6df6a25aba57ff476e:/src/surf/surf_routing.cpp diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 39096a02f5..1d90650b89 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -59,9 +59,6 @@ simgrid::kernel::routing::NetCard *sg_netcard_by_name_or_null(const char *name) 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,37 +72,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 * route, double *latency) -{ - AsImpl::getGlobalRoute(src, dst, route, latency); - if (XBT_LOG_ISENABLED(surf_route, xbt_log_priority_debug)) { - XBT_DEBUG("Route from '%s' to '%s' (latency: %f):", src->cname(), dst->cname(), - (latency == nullptr ? -1 : *latency)); - for (auto link : *route) - XBT_DEBUG("Link %s", link->getName()); - } -} - -}}} - /* ************************************************************************** */ /* ************************* GENERIC PARSE FUNCTIONS ************************ */ @@ -132,13 +98,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_; -}