X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..537f0041df19bdb51cbfa9694a21952c784f7a73:/src/surf/surf_routing_dijkstra.cpp diff --git a/src/surf/surf_routing_dijkstra.cpp b/src/surf/surf_routing_dijkstra.cpp index 48a3ae2a29..be44ced9af 100644 --- a/src/surf/surf_routing_dijkstra.cpp +++ b/src/surf/surf_routing_dijkstra.cpp @@ -1,14 +1,12 @@ -/* Copyright (c) 2009-2014. The SimGrid Team. +/* Copyright (c) 2009-2015. 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. */ -#include "surf_routing_dijkstra.hpp" -#include "network_interface.hpp" - -/* Global vars */ -extern routing_platf_t routing_platf; +#include "src/surf/surf_routing_private.hpp" +#include "src/surf/surf_routing_dijkstra.hpp" +#include "src/surf/network_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic"); @@ -39,16 +37,17 @@ static void graph_edge_data_free(void *e) // FIXME: useless code duplication } AS_t model_dijkstra_create(void){ - return new AsDijkstra(0); + return new simgrid::surf::AsDijkstra(0); } AS_t model_dijkstracache_create(void){ - return new AsDijkstra(1); + return new simgrid::surf::AsDijkstra(1); } void model_dijkstra_both_end(AS_t as) { - AsDijkstraPtr THIS_AS = static_cast(as); + simgrid::surf::AsDijkstra *THIS_AS + = static_cast(as); xbt_node_t node = NULL; unsigned int cursor2; xbt_dynar_t nodes = NULL; @@ -77,6 +76,9 @@ void model_dijkstra_both_end(AS_t as) /* Utility functions */ +namespace simgrid { +namespace surf { + xbt_node_t AsDijkstra::routeGraphNewNode(int id, int graph_id) { xbt_node_t node = NULL; @@ -91,7 +93,7 @@ xbt_node_t AsDijkstra::routeGraphNewNode(int id, int graph_id) elm = xbt_new0(struct graph_node_map_element, 1); elm->node = node; xbt_dict_set_ext(p_graphNodeMap, (char *) (&id), sizeof(int), - (xbt_set_elm_t) elm, NULL); + (xbt_dictelm_t) elm, NULL); return node; } @@ -174,25 +176,25 @@ void AsDijkstra::addLoopback() { } } -xbt_dynar_t AsDijkstra::getOnelinkRoutes() +xbt_dynar_t AsDijkstra::getOneLinkRoutes() { - xbt_dynar_t ret = xbt_dynar_new(sizeof(OnelinkPtr), xbt_free); + xbt_dynar_t ret = xbt_dynar_new(sizeof(Onelink*), xbt_free_f); sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t,1); route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t),NULL); int src,dst; - RoutingEdgePtr src_elm, dst_elm; + NetCard *src_elm, *dst_elm; int table_size = (int)xbt_dynar_length(p_indexNetworkElm); for(src=0; src < table_size; src++) { for(dst=0; dst< table_size; dst++) { xbt_dynar_reset(route->link_list); - src_elm = xbt_dynar_get_as(p_indexNetworkElm, src, RoutingEdgePtr); - dst_elm = xbt_dynar_get_as(p_indexNetworkElm, dst, RoutingEdgePtr); + src_elm = xbt_dynar_get_as(p_indexNetworkElm, src, NetCard*); + dst_elm = xbt_dynar_get_as(p_indexNetworkElm, dst, NetCard*); this->getRouteAndLatency(src_elm, dst_elm,route, NULL); if (xbt_dynar_length(route->link_list) == 1) { void *link = *(void **) xbt_dynar_get_ptr(route->link_list, 0); - OnelinkPtr onelink; + Onelink *onelink; if (p_hierarchy == SURF_ROUTING_BASE) onelink = new Onelink(link, src_elm, dst_elm); else if (p_hierarchy == SURF_ROUTING_RECURSIVE) @@ -206,7 +208,7 @@ xbt_dynar_t AsDijkstra::getOnelinkRoutes() return ret; } -void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t route, double *lat) +void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat) { /* set utils vars */ @@ -256,7 +258,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p xbt_dynar_foreach(links, cpt, link) { xbt_dynar_unshift(route->link_list, &link); if (lat) - *lat += static_cast(link)->getLatency(); + *lat += static_cast(link)->getLatency(); } } @@ -278,7 +280,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p int nr_nodes = xbt_dynar_length(nodes); cost_arr = xbt_new0(double, nr_nodes); /* link cost from src to other hosts */ pred_arr = xbt_new0(int, nr_nodes); /* predecessors in path from src */ - pqueue = xbt_heap_new(nr_nodes, xbt_free); + pqueue = xbt_heap_new(nr_nodes, xbt_free_f); /* initialize */ cost_arr[src_node_id] = 0.0; @@ -330,8 +332,8 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p } /* compose route path with links */ - RoutingEdgePtr gw_src = NULL, gw_dst, prev_gw_src, first_gw = NULL; - RoutingEdgePtr gw_dst_net_elm = NULL, prev_gw_src_net_elm = NULL; + NetCard *gw_src = NULL, *gw_dst, *prev_gw_src, *first_gw = NULL; + NetCard *gw_dst_net_elm = NULL, *prev_gw_src_net_elm = NULL; for (v = dst_node_id; v != src_node_id; v = pred_arr[v]) { xbt_node_t node_pred_v = @@ -364,7 +366,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p xbt_dynar_foreach(links, cpt, link) { xbt_dynar_insert_at(route->link_list, pos, &link); if (lat) - *lat += static_cast(link)->getLatency(); + *lat += static_cast(link)->getLatency(); pos++; } } @@ -373,7 +375,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p xbt_dynar_foreach(links, cpt, link) { xbt_dynar_unshift(route->link_list, &link); if (lat) - *lat += static_cast(link)->getLatency(); + *lat += static_cast(link)->getLatency(); } size++; } @@ -389,7 +391,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p elm->pred_arr = pred_arr; elm->size = size; xbt_dict_set_ext(p_routeCache, (char *) (&src_id), sizeof(int), - (xbt_set_elm_t) elm, NULL); + (xbt_dictelm_t) elm, NULL); } if (!m_cached) @@ -398,8 +400,8 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p AsDijkstra::~AsDijkstra() { - xbt_graph_free_graph(p_routeGraph, &xbt_free, - &graph_edge_data_free, &xbt_free); + xbt_graph_free_graph(p_routeGraph, &xbt_free_f, + &graph_edge_data_free, &xbt_free_f); xbt_dict_free(&p_graphNodeMap); if (m_cached) xbt_dict_free(&p_routeCache); @@ -407,13 +409,10 @@ AsDijkstra::~AsDijkstra() /* Creation routing model functions */ -AsDijkstra::AsDijkstra() : AsGeneric(), m_cached(0) { - p_routeGraph = NULL; - p_graphNodeMap = NULL; - p_routeCache = NULL; +AsDijkstra::AsDijkstra() : AsGeneric() { } -AsDijkstra::AsDijkstra(int cached) : AsGeneric(), m_cached(cached) +AsDijkstra::AsDijkstra(bool cached) : AsGeneric(), m_cached(cached) { p_routeGraph = NULL; p_graphNodeMap = NULL; @@ -475,15 +474,15 @@ void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route) route->gw_src->getName(), dst, route->gw_dst->getName()); as_route = 1; if(route->gw_dst->getRcType() == SURF_NETWORK_ELEMENT_NULL) - xbt_die("The gw_dst '%s' does not exist!",route->gw_dst->getName()); + surf_parse_error("The gw_dst '%s' does not exist!",route->gw_dst->getName()); if(route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL) - xbt_die("The gw_src '%s' does not exist!",route->gw_src->getName()); + surf_parse_error("The gw_src '%s' does not exist!",route->gw_src->getName()); } - RoutingEdgePtr src_net_elm, dst_net_elm; + NetCard *src_net_elm, *dst_net_elm; - src_net_elm = sg_routing_edge_by_name_or_null(src); - dst_net_elm = sg_routing_edge_by_name_or_null(dst); + src_net_elm = sg_netcard_by_name_or_null(src); + dst_net_elm = sg_netcard_by_name_or_null(dst); xbt_assert(src_net_elm, "Network elements %s not found", src); xbt_assert(dst_net_elm, "Network elements %s not found", dst); @@ -521,7 +520,7 @@ void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route) THROWF(arg_error,0,"(AS)Route from '%s' to '%s' already exists",src,dst); if (route->gw_dst && route->gw_src) { - RoutingEdgePtr gw_tmp; + NetCard *gw_tmp; gw_tmp = route->gw_src; route->gw_src = route->gw_dst; route->gw_dst = gw_tmp; @@ -531,3 +530,6 @@ void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route) } xbt_dynar_free(&route->link_list); } + +} +}