X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3c3e6f4613478826b4563256814b791101b92bb3..3713b932e060daf13fa9d7cac8c46db82a167d92:/src/surf/surf_routing_generic.cpp diff --git a/src/surf/surf_routing_generic.cpp b/src/surf/surf_routing_generic.cpp index 92133dd209..c455405087 100644 --- a/src/surf/surf_routing_generic.cpp +++ b/src/surf/surf_routing_generic.cpp @@ -1,20 +1,30 @@ -/* 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 + +#include + +#include +#include +#include +#include +#include + #include "simgrid/platf_interface.h" // platform creation API internal interface #include "surf_routing_generic.hpp" +#include "surf_routing_private.hpp" #include "network_interface.hpp" -#include "xbt/graph.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing"); static int no_bypassroute_declared = 1; -void generic_free_route(sg_platf_route_cbarg_t route) +void routing_route_free(sg_platf_route_cbarg_t route) { if (route) { xbt_dynar_free(&route->link_list); @@ -22,6 +32,9 @@ void generic_free_route(sg_platf_route_cbarg_t route) } } +namespace simgrid { +namespace surf { + void AsGeneric::parseRoute(sg_platf_route_cbarg_t /*route*/){ THROW_IMPOSSIBLE; } @@ -30,29 +43,29 @@ 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; } AsGeneric::AsGeneric() { - p_bypassRoutes = xbt_dict_new_homogeneous((void (*)(void *)) generic_free_route); + p_bypassRoutes = xbt_dict_new_homogeneous((void (*)(void *)) routing_route_free); } AsGeneric::~AsGeneric() { xbt_dict_free(&p_bypassRoutes); } -int AsGeneric::parsePU(RoutingEdgePtr elm) +int AsGeneric::parsePU(NetCard *elm) { XBT_DEBUG("Load process unit \"%s\"", elm->getName()); - xbt_dynar_push_as(p_indexNetworkElm, RoutingEdgePtr, elm); + 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->getName()); - xbt_dynar_push_as(p_indexNetworkElm, RoutingEdgePtr, elm); + xbt_dynar_push_as(p_indexNetworkElm, NetCard*, elm); return xbt_dynar_length(p_indexNetworkElm)-1; } @@ -89,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); @@ -142,6 +153,9 @@ 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 { + void AsGeneric::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) { int src, dst; @@ -149,13 +163,13 @@ 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); @@ -179,7 +193,8 @@ void AsGeneric::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) } xbt_dynar_foreach(route->link_list, cpt, link) { - const char *link_name = ((ResourcePtr) link)->getName(); + 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); @@ -204,8 +219,8 @@ 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 @@ -224,13 +239,13 @@ sg_platf_route_cbarg_t AsGeneric::getBypassRoute(RoutingEdgePtr src, 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\"", @@ -241,13 +256,13 @@ sg_platf_route_cbarg_t AsGeneric::getBypassRoute(RoutingEdgePtr src, 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); @@ -257,30 +272,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); @@ -289,9 +304,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); @@ -305,9 +320,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); @@ -322,7 +337,7 @@ sg_platf_route_cbarg_t AsGeneric::getBypassRoute(RoutingEdgePtr src, sg_platf_route_cbarg_t new_e_route = NULL; if (e_route_bypass) { - NetworkLinkPtr 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; @@ -361,99 +376,36 @@ 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; } - - -AsPtr AsGeneric::asExist(AsPtr to_find) -{ - //return to_find; // FIXME: BYPASSERROR OF FOREACH WITH BREAK - xbt_dict_cursor_t cursor = NULL; - char *key; - int found = 0; - AsGenericPtr elem; - xbt_dict_foreach(p_routingSons, cursor, key, elem) { - if (to_find == elem || elem->asExist(to_find)) { - found = 1; - break; - } - } - if (found) - return to_find; - return NULL; -} - -AsPtr AsGeneric::autonomousSystemExist(char *element) +void AsGeneric::srcDstCheck(NetCard *src, NetCard *dst) { - //return rc; // FIXME: BYPASSERROR OF FOREACH WITH BREAK - AsPtr element_as, result, elem; - xbt_dict_cursor_t cursor = NULL; - char *key; - element_as = ((RoutingEdgePtr) - xbt_lib_get_or_null(as_router_lib, element, - ROUTING_ASR_LEVEL))->getRcComponent(); - result = ((AsPtr) - 1); - if (element_as != this) - result = asExist(element_as); - - int found = 0; - if (result) { - xbt_dict_foreach(element_as->p_routingSons, cursor, key, elem) { - found = !strcmp(elem->p_name, element); - if (found) - break; - } - if (found) - return element_as; - } - return NULL; -} - -AsPtr AsGeneric::processingUnitsExist(char *element) -{ - AsPtr element_as; - element_as = ((RoutingEdgePtr) - xbt_lib_get_or_null(host_lib, - element, ROUTING_HOST_LEVEL))->getRcComponent(); - if (element_as == this) - return element_as; - return asExist(element_as); -} - -void AsGeneric::srcDstCheck(RoutingEdgePtr src, RoutingEdgePtr 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->getName(), - dst->getName(), - p_name); + src ? src->getName() : "(null)", + dst ? dst->getName() : "(null)", + p_name); - AsPtr src_as = - (src_data)->getRcComponent(); - AsPtr dst_as = - (dst_data)->getRcComponent(); + 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", @@ -469,3 +421,6 @@ void AsGeneric::srcDstCheck(RoutingEdgePtr src, RoutingEdgePtr dst) dst_as->p_name, p_name); } + +} +}