X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/98902509dba21a4817edab8fb2a8f69506a461a3..f602ee5e834cf7bf6d1e1be849daae79a54e7274:/src/surf/surf_routing.cpp
diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index 7f18490ead..d4cd3d5273 100644
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -60,8 +60,7 @@ simgrid::kernel::routing::NetCard *sg_netcard_by_name_or_null(const char *name)
}
/* Global vars */
-simgrid::kernel::routing::RoutingPlatf *routing_platf = nullptr;
-
+simgrid::kernel::routing::RoutingPlatf* routing_platf = new simgrid::kernel::routing::RoutingPlatf();
void sg_platf_new_trace(sg_platf_trace_cbarg_t trace)
{
@@ -101,39 +100,15 @@ void RoutingPlatf::getRouteAndLatency(NetCard *src, NetCard *dst, std::vector
* RoutingPlatf::getOneLinkRoutes()
{
- xbt_dynar_t ret = xbt_dynar_new(sizeof(Onelink*), xbt_free_f);
-
- //adding my one link routes
- xbt_dynar_t onelink_mine = as->getOneLinkRoutes();
- if (onelink_mine)
- xbt_dynar_merge(&ret,&onelink_mine);
-
- //recursing
- char *key;
- xbt_dict_cursor_t cursor = nullptr;
- AsImpl *rc_child;
- xbt_dict_foreach(as->children(), cursor, key, rc_child) {
- xbt_dynar_t onelink_child = _recursiveGetOneLinkRoutes(rc_child);
- if (onelink_child)
- xbt_dynar_merge(&ret,&onelink_child);
- }
- return ret;
-}
-
-xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){
- return _recursiveGetOneLinkRoutes(root_);
+ std::vector* res = new std::vector();
+ root_->getOneLinkRoutes(res);
+ return res;
}
}}}
-/** @brief create the root AS */
-void routing_model_create()
-{
- routing_platf = new simgrid::kernel::routing::RoutingPlatf();
-}
-
/* ************************************************************************** */
/* ************************* GENERIC PARSE FUNCTIONS ************************ */