X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0ffc37686edcc803601f76ab51fdfed5fc2f241..23a00833ef66ff4383394e3cac558a5232d4bd62:/src/surf/surf_routing_generic.cpp diff --git a/src/surf/surf_routing_generic.cpp b/src/surf/surf_routing_generic.cpp index d78421cb4e..1dc0d18201 100644 --- a/src/surf/surf_routing_generic.cpp +++ b/src/surf/surf_routing_generic.cpp @@ -1,18 +1,26 @@ -/* Copyright (c) 2009-2013. 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 + +#include + +#include +#include +#include +#include +#include + #include "simgrid/platf_interface.h" // platform creation API internal interface #include "surf_routing_generic.hpp" -#include "network.hpp" -#include "xbt/graph.h" +#include "surf_routing_private.hpp" +#include "network_interface.hpp" -extern "C" { XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing"); -} static int no_bypassroute_declared = 1; @@ -24,15 +32,18 @@ void generic_free_route(sg_platf_route_cbarg_t route) } } -void AsGeneric::parseRoute(sg_platf_route_cbarg_t route){ +namespace simgrid { +namespace surf { + +void AsGeneric::parseRoute(sg_platf_route_cbarg_t /*route*/){ THROW_IMPOSSIBLE; } -void AsGeneric::parseASroute(sg_platf_route_cbarg_t route){ +void AsGeneric::parseASroute(sg_platf_route_cbarg_t /*route*/){ THROW_IMPOSSIBLE; } -void AsGeneric::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t into, double *latency){ +void AsGeneric::getRouteAndLatency(NetCard */*src*/, NetCard */*dst*/, sg_platf_route_cbarg_t /*into*/, double */*latency*/){ THROW_IMPOSSIBLE; } @@ -44,17 +55,17 @@ AsGeneric::~AsGeneric() { xbt_dict_free(&p_bypassRoutes); } -int AsGeneric::parsePU(RoutingEdgePtr elm) +int AsGeneric::parsePU(NetCard *elm) { - XBT_DEBUG("Load process unit \"%s\"", elm->p_name); - xbt_dynar_push_as(p_indexNetworkElm, RoutingEdgePtr, elm); + XBT_DEBUG("Load process unit \"%s\"", elm->getName()); + xbt_dynar_push_as(p_indexNetworkElm, NetCard*, elm); return xbt_dynar_length(p_indexNetworkElm)-1; } -int AsGeneric::parseAS(RoutingEdgePtr elm) +int AsGeneric::parseAS(NetCard *elm) { - XBT_DEBUG("Load Autonomous system \"%s\"", elm->p_name); - xbt_dynar_push_as(p_indexNetworkElm, RoutingEdgePtr, elm); + XBT_DEBUG("Load Autonomous system \"%s\"", elm->getName()); + xbt_dynar_push_as(p_indexNetworkElm, NetCard*, elm); return xbt_dynar_length(p_indexNetworkElm)-1; } @@ -76,7 +87,7 @@ void AsGeneric::parseBypassroute(sg_platf_route_cbarg_t e_route) src, dst); xbt_assert(!xbt_dict_get_or_null(dict_bypassRoutes, route_name), "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists", - src, e_route->gw_src->p_name, dst, e_route->gw_dst->p_name); + src, e_route->gw_src->getName(), dst, e_route->gw_dst->getName()); sg_platf_route_cbarg_t new_e_route = NULL; if(e_route->gw_dst) @@ -91,14 +102,12 @@ void AsGeneric::parseBypassroute(sg_platf_route_cbarg_t e_route) xbt_free(route_name); } +} +} + /* ************************************************************************** */ /* *********************** GENERIC BUSINESS METHODS ************************* */ -xbt_dynar_t AsGeneric::getOneLinkRoutes() { // FIXME: kill that stub - xbt_die("\"generic_get_onelink_routes\" not implemented yet"); - return NULL; -} - static const char *instr_node_name(xbt_node_t node) { void *data = xbt_graph_node_get_data(node); @@ -144,6 +153,14 @@ xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d, return ret; } +namespace simgrid { +namespace surf { + +xbt_dynar_t AsGeneric::getOneLinkRoutes() { // FIXME: kill that stub + xbt_die("\"generic_get_onelink_routes\" not implemented yet"); + return NULL; +} + void AsGeneric::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) { int src, dst; @@ -151,20 +168,20 @@ void AsGeneric::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) for (src = 0; src < table_size; src++) { - RoutingEdgePtr my_src = - xbt_dynar_get_as(p_indexNetworkElm, src, RoutingEdgePtr); + NetCard *my_src = + xbt_dynar_get_as(p_indexNetworkElm, src, NetCard*); for (dst = 0; dst < table_size; dst++) { if (src == dst) continue; - RoutingEdgePtr my_dst = - xbt_dynar_get_as(p_indexNetworkElm, dst, RoutingEdgePtr); + NetCard *my_dst = + xbt_dynar_get_as(p_indexNetworkElm, dst, NetCard*); 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); getRouteAndLatency(my_src, my_dst, route, NULL); - XBT_DEBUG ("get_route_and_latency %s -> %s", my_src->p_name, my_dst->p_name); + XBT_DEBUG ("get_route_and_latency %s -> %s", my_src->getName(), my_dst->getName()); unsigned int cpt; void *link; @@ -173,15 +190,16 @@ void AsGeneric::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) const char *previous_name, *current_name; if (route->gw_src) { - previous = new_xbt_graph_node(graph, route->gw_src->p_name, nodes); - previous_name = route->gw_src->p_name; + previous = new_xbt_graph_node(graph, route->gw_src->getName(), nodes); + previous_name = route->gw_src->getName(); } else { - previous = new_xbt_graph_node(graph, my_src->p_name, nodes); - previous_name = my_src->p_name; + previous = new_xbt_graph_node(graph, my_src->getName(), nodes); + previous_name = my_src->getName(); } xbt_dynar_foreach(route->link_list, cpt, link) { - const char *link_name = ((ResourcePtr) link)->m_name; + const char *link_name = static_cast( + link)->getName(); current = new_xbt_graph_node(graph, link_name, nodes); current_name = link_name; new_xbt_graph_edge(graph, previous, current, edges); @@ -191,11 +209,11 @@ void AsGeneric::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) } if (route->gw_dst) { - current = new_xbt_graph_node(graph, route->gw_dst->p_name, nodes); - current_name = route->gw_dst->p_name; + current = new_xbt_graph_node(graph, route->gw_dst->getName(), nodes); + current_name = route->gw_dst->getName(); } else { - current = new_xbt_graph_node(graph, my_dst->p_name, nodes); - current_name = my_dst->p_name; + current = new_xbt_graph_node(graph, my_dst->getName(), nodes); + current_name = my_dst->getName(); } new_xbt_graph_edge(graph, previous, current, edges); XBT_DEBUG (" %s -> %s", previous_name, current_name); @@ -206,49 +224,50 @@ void AsGeneric::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) } } -sg_platf_route_cbarg_t AsGeneric::getBypassRoute(RoutingEdgePtr src, - RoutingEdgePtr dst, +sg_platf_route_cbarg_t AsGeneric::getBypassRoute(NetCard *src, + NetCard *dst, double *lat) { // If never set a bypass route return NULL without any further computations - XBT_DEBUG("generic_get_bypassroute from %s to %s", src->p_name, dst->p_name); + XBT_DEBUG("generic_get_bypassroute from %s to %s", src->getName(), dst->getName()); if (no_bypassroute_declared) return NULL; sg_platf_route_cbarg_t e_route_bypass = NULL; xbt_dict_t dict_bypassRoutes = p_bypassRoutes; - if(dst->p_rcComponent == this && src->p_rcComponent == this ){ - char *route_name = bprintf("%s#%s", src->p_name, dst->p_name); + if(dst->getRcComponent() == this && src->getRcComponent() == this ){ + char *route_name = bprintf("%s#%s", src->getName(), dst->getName()); e_route_bypass = (sg_platf_route_cbarg_t) xbt_dict_get_or_null(dict_bypassRoutes, route_name); if(e_route_bypass) XBT_DEBUG("Find bypass route with %ld links",xbt_dynar_length(e_route_bypass->link_list)); free(route_name); } else{ - AsPtr src_as, dst_as; + As *src_as, *dst_as; int index_src, index_dst; xbt_dynar_t path_src = NULL; xbt_dynar_t path_dst = NULL; - AsPtr current = NULL; - AsPtr *current_src = NULL; - AsPtr *current_dst = NULL; + As *current = NULL; + As **current_src = NULL; + As **current_dst = NULL; if (src == NULL || dst == NULL) xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"", - src->p_name, dst->p_name, p_name); + src ? src->getName() : "(null)", + dst ? dst->getName() : "(null)", p_name); - src_as = src->p_rcComponent; - dst_as = dst->p_rcComponent; + src_as = src->getRcComponent(); + dst_as = dst->getRcComponent(); /* (2) find the path to the root routing component */ - path_src = xbt_dynar_new(sizeof(AsPtr), NULL); + path_src = xbt_dynar_new(sizeof(As*), NULL); current = src_as; while (current != NULL) { xbt_dynar_push(path_src, ¤t); current = current->p_routingFather; } - path_dst = xbt_dynar_new(sizeof(AsPtr), NULL); + path_dst = xbt_dynar_new(sizeof(As*), NULL); current = dst_as; while (current != NULL) { xbt_dynar_push(path_dst, ¤t); @@ -258,30 +277,30 @@ sg_platf_route_cbarg_t AsGeneric::getBypassRoute(RoutingEdgePtr src, /* (3) find the common father */ index_src = path_src->used - 1; index_dst = path_dst->used - 1; - current_src = (AsPtr *) xbt_dynar_get_ptr(path_src, index_src); - current_dst = (AsPtr *) xbt_dynar_get_ptr(path_dst, index_dst); + current_src = (As **) xbt_dynar_get_ptr(path_src, index_src); + current_dst = (As **) xbt_dynar_get_ptr(path_dst, index_dst); while (index_src >= 0 && index_dst >= 0 && *current_src == *current_dst) { xbt_dynar_pop_ptr(path_src); xbt_dynar_pop_ptr(path_dst); index_src--; index_dst--; - current_src = (AsPtr *) xbt_dynar_get_ptr(path_src, index_src); - current_dst = (AsPtr *) xbt_dynar_get_ptr(path_dst, index_dst); + current_src = (As **) xbt_dynar_get_ptr(path_src, index_src); + current_dst = (As **) xbt_dynar_get_ptr(path_dst, index_dst); } int max_index_src = path_src->used - 1; int max_index_dst = path_dst->used - 1; - int max_index = max(max_index_src, max_index_dst); + int max_index = std::max(max_index_src, max_index_dst); int i, max; for (max = 0; max <= max_index; max++) { for (i = 0; i < max; i++) { if (i <= max_index_src && max <= max_index_dst) { char *route_name = bprintf("%s#%s", - (*(AsPtr *) + (*(As **) (xbt_dynar_get_ptr(path_src, i)))->p_name, - (*(AsPtr *) + (*(As **) (xbt_dynar_get_ptr(path_dst, max)))->p_name); e_route_bypass = (sg_platf_route_cbarg_t) xbt_dict_get_or_null(dict_bypassRoutes, route_name); xbt_free(route_name); @@ -290,9 +309,9 @@ sg_platf_route_cbarg_t AsGeneric::getBypassRoute(RoutingEdgePtr src, break; if (max <= max_index_src && i <= max_index_dst) { char *route_name = bprintf("%s#%s", - (*(AsPtr *) + (*(As **) (xbt_dynar_get_ptr(path_src, max)))->p_name, - (*(AsPtr *) + (*(As **) (xbt_dynar_get_ptr(path_dst, i)))->p_name); e_route_bypass = (sg_platf_route_cbarg_t) xbt_dict_get_or_null(dict_bypassRoutes, route_name); xbt_free(route_name); @@ -306,9 +325,9 @@ sg_platf_route_cbarg_t AsGeneric::getBypassRoute(RoutingEdgePtr src, if (max <= max_index_src && max <= max_index_dst) { char *route_name = bprintf("%s#%s", - (*(AsPtr *) + (*(As **) (xbt_dynar_get_ptr(path_src, max)))->p_name, - (*(AsPtr *) + (*(As **) (xbt_dynar_get_ptr(path_dst, max)))->p_name); e_route_bypass = (sg_platf_route_cbarg_t) xbt_dict_get_or_null(dict_bypassRoutes, route_name); xbt_free(route_name); @@ -323,7 +342,7 @@ sg_platf_route_cbarg_t AsGeneric::getBypassRoute(RoutingEdgePtr src, sg_platf_route_cbarg_t new_e_route = NULL; if (e_route_bypass) { - NetworkCm02LinkPtr link; + Link* link; unsigned int cpt = 0; new_e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1); new_e_route->gw_src = e_route_bypass->gw_src; @@ -362,21 +381,21 @@ sg_platf_route_cbarg_t AsGeneric::newExtendedRoute(e_surf_routing_hierarchy_t hi xbt_assert(routearg->gw_src && routearg->gw_dst, "NULL is obviously a bad gateway"); - /* remeber not erase the gateway names */ + /* remember not erase the gateway names */ result->gw_src = routearg->gw_src; result->gw_dst = routearg->gw_dst; } xbt_dynar_foreach(routearg->link_list, cpt, link_name) { - void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); + Link *link = Link::byName(link_name); if (link) { if (change_order) xbt_dynar_push(result->link_list, &link); else xbt_dynar_unshift(result->link_list, &link); } else - THROWF(mismatch_error, 0, "Link %s not found", link_name); + THROWF(mismatch_error, 0, "Link '%s' not found", link_name); } return result; @@ -384,13 +403,13 @@ sg_platf_route_cbarg_t AsGeneric::newExtendedRoute(e_surf_routing_hierarchy_t hi -AsPtr AsGeneric::asExist(AsPtr to_find) +As *AsGeneric::asExist(As *to_find) { //return to_find; // FIXME: BYPASSERROR OF FOREACH WITH BREAK xbt_dict_cursor_t cursor = NULL; char *key; int found = 0; - AsGenericPtr elem; + AsGeneric *elem; xbt_dict_foreach(p_routingSons, cursor, key, elem) { if (to_find == elem || elem->asExist(to_find)) { found = 1; @@ -402,16 +421,16 @@ AsPtr AsGeneric::asExist(AsPtr to_find) return NULL; } -AsPtr AsGeneric::autonomousSystemExist(char *element) +As *AsGeneric::autonomousSystemExist(char *element) { //return rc; // FIXME: BYPASSERROR OF FOREACH WITH BREAK - AsPtr element_as, result, elem; + As *element_as, *result, *elem; xbt_dict_cursor_t cursor = NULL; char *key; - element_as = ((RoutingEdgePtr) + element_as = ((NetCard*) xbt_lib_get_or_null(as_router_lib, element, - ROUTING_ASR_LEVEL))->p_rcComponent; - result = ((AsPtr) - 1); + ROUTING_ASR_LEVEL))->getRcComponent(); + result = ((As*) - 1); if (element_as != this) result = asExist(element_as); @@ -428,45 +447,39 @@ AsPtr AsGeneric::autonomousSystemExist(char *element) return NULL; } -AsPtr AsGeneric::processingUnitsExist(char *element) +As *AsGeneric::processingUnitsExist(char *element) { - AsPtr element_as; - element_as = ((RoutingEdgePtr) - xbt_lib_get_or_null(host_lib, - element, ROUTING_HOST_LEVEL))->p_rcComponent; + As *element_as = sg_host_by_name(element)->p_netcard ->getRcComponent(); if (element_as == this) return element_as; return asExist(element_as); } -void AsGeneric::srcDstCheck(RoutingEdgePtr src, RoutingEdgePtr dst) +void AsGeneric::srcDstCheck(NetCard *src, NetCard *dst) { - - RoutingEdgePtr src_data = src; - RoutingEdgePtr dst_data = dst; - - if (src_data == NULL || dst_data == NULL) + if (src == NULL || dst == NULL) xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"", - src->p_name, - dst->p_name, - p_name); + src ? src->getName() : "(null)", + dst ? dst->getName() : "(null)", + p_name); - AsPtr src_as = - (src_data)->p_rcComponent; - AsPtr dst_as = - (dst_data)->p_rcComponent; + As *src_as = src->getRcComponent(); + As *dst_as = dst->getRcComponent(); if (src_as != dst_as) xbt_die("The src(%s in %s) and dst(%s in %s) are in differents AS", - src->p_name, src_as->p_name, - dst->p_name, dst_as->p_name); + src->getName(), src_as->p_name, + dst->getName(), dst_as->p_name); if (this != dst_as) xbt_die ("The routing component of src'%s' and dst'%s' is not the same as the network elements belong (%s?=%s?=%s)", - src->p_name, - dst->p_name, + src->getName(), + dst->getName(), src_as->p_name, dst_as->p_name, p_name); } + +} +}