X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b1e4e803685007394a5a9b63ab87339d3bf35657..f5f64a44c8131c18967615f84b325ba26e880b39:/src/surf/surf_routing_generic.cpp diff --git a/src/surf/surf_routing_generic.cpp b/src/surf/surf_routing_generic.cpp index 01a0e2073c..031f460ae9 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,38 +32,18 @@ void generic_free_route(sg_platf_route_cbarg_t route) } } -void AsGeneric::parseRoute(sg_platf_route_cbarg_t /*route*/){ - THROW_IMPOSSIBLE; -} - -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*/){ - THROW_IMPOSSIBLE; -} - -AsGeneric::AsGeneric() { - p_bypassRoutes = xbt_dict_new_homogeneous((void (*)(void *)) generic_free_route); -} - -AsGeneric::~AsGeneric() { - xbt_dict_free(&p_bypassRoutes); -} - -int AsGeneric::parsePU(RoutingEdgePtr elm) +namespace simgrid { +namespace surf { + +AsGeneric::AsGeneric(const char*name) + : AsNone(name) { - XBT_DEBUG("Load process unit \"%s\"", elm->getName()); - xbt_dynar_push_as(p_indexNetworkElm, RoutingEdgePtr, elm); - return xbt_dynar_length(p_indexNetworkElm)-1; + bypassRoutes_ = xbt_dict_new_homogeneous((void (*)(void *)) routing_route_free); } -int AsGeneric::parseAS(RoutingEdgePtr elm) +AsGeneric::~AsGeneric() { - XBT_DEBUG("Load Autonomous system \"%s\"", elm->getName()); - xbt_dynar_push_as(p_indexNetworkElm, RoutingEdgePtr, elm); - return xbt_dynar_length(p_indexNetworkElm)-1; + xbt_dict_free(&bypassRoutes_); } void AsGeneric::parseBypassroute(sg_platf_route_cbarg_t e_route) @@ -65,7 +55,7 @@ void AsGeneric::parseBypassroute(sg_platf_route_cbarg_t e_route) XBT_DEBUG("Load bypassASroute from \"%s\" to \"%s\"", src, dst); else XBT_DEBUG("Load bypassRoute from \"%s\" to \"%s\"", src, dst); - xbt_dict_t dict_bypassRoutes = p_bypassRoutes; + xbt_dict_t dict_bypassRoutes = bypassRoutes_; char *route_name; route_name = bprintf("%s#%s", src, dst); @@ -74,7 +64,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->getName(), dst, e_route->gw_dst->getName()); + src, e_route->gw_src->name(), dst, e_route->gw_dst->name()); sg_platf_route_cbarg_t new_e_route = NULL; if(e_route->gw_dst) @@ -89,14 +79,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,27 +130,30 @@ 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; - int table_size = xbt_dynar_length(p_indexNetworkElm); + int table_size = xbt_dynar_length(vertices_); 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(vertices_, 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(vertices_, 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); + route->link_list = xbt_dynar_new(sizeof(Link*), NULL); getRouteAndLatency(my_src, my_dst, route, NULL); - XBT_DEBUG ("get_route_and_latency %s -> %s", my_src->getName(), my_dst->getName()); + XBT_DEBUG ("get_route_and_latency %s -> %s", my_src->name(), my_dst->name()); unsigned int cpt; void *link; @@ -171,15 +162,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->getName(), nodes); - previous_name = route->gw_src->getName(); + previous = new_xbt_graph_node(graph, route->gw_src->name(), nodes); + previous_name = route->gw_src->name(); } else { - previous = new_xbt_graph_node(graph, my_src->getName(), nodes); - previous_name = my_src->getName(); + previous = new_xbt_graph_node(graph, my_src->name(), nodes); + previous_name = my_src->name(); } 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); @@ -189,11 +181,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->getName(), nodes); - current_name = route->gw_dst->getName(); + current = new_xbt_graph_node(graph, route->gw_dst->name(), nodes); + current_name = route->gw_dst->name(); } else { - current = new_xbt_graph_node(graph, my_dst->getName(), nodes); - current_name = my_dst->getName(); + current = new_xbt_graph_node(graph, my_dst->name(), nodes); + current_name = my_dst->name(); } new_xbt_graph_edge(graph, previous, current, edges); XBT_DEBUG (" %s -> %s", previous_name, current_name); @@ -204,84 +196,84 @@ 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->getName(), dst->getName()); + XBT_DEBUG("generic_get_bypassroute from %s to %s", src->name(), dst->name()); if (no_bypassroute_declared) return NULL; sg_platf_route_cbarg_t e_route_bypass = NULL; - xbt_dict_t dict_bypassRoutes = p_bypassRoutes; + xbt_dict_t dict_bypassRoutes = bypassRoutes_; - if(dst->getRcComponent() == this && src->getRcComponent() == this ){ - char *route_name = bprintf("%s#%s", src->getName(), dst->getName()); + if(dst->containingAS() == this && src->containingAS() == this ){ + char *route_name = bprintf("%s#%s", src->name(), dst->name()); 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 ? src->getName() : "(null)", - dst ? dst->getName() : "(null)", p_name); + src ? src->name() : "(null)", + dst ? dst->name() : "(null)", name_); - src_as = src->getRcComponent(); - dst_as = dst->getRcComponent(); + src_as = src->containingAS(); + dst_as = dst->containingAS(); /* (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; + current = current->father_; } - 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); - current = current->p_routingFather; + current = current->father_; } /* (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 *) - (xbt_dynar_get_ptr(path_src, i)))->p_name, - (*(AsPtr *) - (xbt_dynar_get_ptr(path_dst, max)))->p_name); + (*(As **) + (xbt_dynar_get_ptr(path_src, i)))->name_, + (*(As **) + (xbt_dynar_get_ptr(path_dst, max)))->name_); e_route_bypass = (sg_platf_route_cbarg_t) xbt_dict_get_or_null(dict_bypassRoutes, route_name); xbt_free(route_name); } @@ -289,10 +281,10 @@ 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 *) - (xbt_dynar_get_ptr(path_src, max)))->p_name, - (*(AsPtr *) - (xbt_dynar_get_ptr(path_dst, i)))->p_name); + (*(As **) + (xbt_dynar_get_ptr(path_src, max)))->name_, + (*(As **) + (xbt_dynar_get_ptr(path_dst, i)))->name_); e_route_bypass = (sg_platf_route_cbarg_t) xbt_dict_get_or_null(dict_bypassRoutes, route_name); xbt_free(route_name); } @@ -305,10 +297,10 @@ 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 *) - (xbt_dynar_get_ptr(path_src, max)))->p_name, - (*(AsPtr *) - (xbt_dynar_get_ptr(path_dst, max)))->p_name); + (*(As **) + (xbt_dynar_get_ptr(path_src, max)))->name_, + (*(As **) + (xbt_dynar_get_ptr(path_dst, max)))->name_); e_route_bypass = (sg_platf_route_cbarg_t) xbt_dict_get_or_null(dict_bypassRoutes, route_name); xbt_free(route_name); } @@ -322,13 +314,13 @@ sg_platf_route_cbarg_t AsGeneric::getBypassRoute(RoutingEdgePtr src, sg_platf_route_cbarg_t new_e_route = NULL; if (e_route_bypass) { - Link* 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; new_e_route->gw_dst = e_route_bypass->gw_dst; new_e_route->link_list = - xbt_dynar_new(sizeof(sg_routing_link_t), NULL); + xbt_dynar_new(sizeof(Link*), NULL); xbt_dynar_foreach(e_route_bypass->link_list, cpt, link) { xbt_dynar_push(new_e_route->link_list, &link); if (lat) @@ -350,7 +342,7 @@ sg_platf_route_cbarg_t AsGeneric::newExtendedRoute(e_surf_routing_hierarchy_t hi unsigned int cpt; result = xbt_new0(s_sg_platf_route_cbarg_t, 1); - result->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL); + result->link_list = xbt_dynar_new(sizeof(Link*), NULL); xbt_assert(hierarchy == SURF_ROUTING_BASE || hierarchy == SURF_ROUTING_RECURSIVE, @@ -358,105 +350,80 @@ sg_platf_route_cbarg_t AsGeneric::newExtendedRoute(e_surf_routing_hierarchy_t hi if (hierarchy == SURF_ROUTING_RECURSIVE) { - xbt_assert(routearg->gw_src && routearg->gw_dst, - "NULL is obviously a bad gateway"); + xbt_assert(routearg->gw_src && routearg->gw_dst, "NULL is obviously a deficient 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; } +void AsGeneric::getRouteCheckParams(NetCard *src, NetCard *dst) +{ + xbt_assert(src,"Cannot find a route from NULL to %s", dst->name()); + xbt_assert(dst,"Cannot find a route from %s to NULL", src->name()); + As *src_as = src->containingAS(); + As *dst_as = dst->containingAS(); -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; -} + xbt_assert(src_as == dst_as, "Internal error: %s@%s and %s@%s are not in the same AS as expected. Please report that bug.", + src->name(), src_as->name_, dst->name(), dst_as->name_); -AsPtr AsGeneric::autonomousSystemExist(char *element) -{ - //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; + xbt_assert(this == dst_as, + "Internal error: route destination %s@%s is not in AS %s as expected (route source: %s@%s). Please report that bug.", + src->name(), dst->name(), src_as->name_, dst_as->name_, name_); +} +void AsGeneric::parseRouteCheckParams(sg_platf_route_cbarg_t route) { + const char *srcName = route->src; + const char *dstName = route->dst; + NetCard *src = sg_netcard_by_name_or_null(srcName); + NetCard *dst = sg_netcard_by_name_or_null(dstName); + + if(!route->gw_dst && !route->gw_src) { + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", srcName, dstName); + xbt_assert(src, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, srcName); + xbt_assert(dst, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, dstName); + xbt_assert(!xbt_dynar_is_empty(route->link_list), "Empty route (between %s and %s) forbidden.", srcName, dstName); + xbt_assert(src->getRcType()==SURF_NETWORK_ELEMENT_HOST || src->getRcType()==SURF_NETWORK_ELEMENT_ROUTER, + "When defining a route, src must be an host or a router but '%s' is not. Did you meant to have an ASroute?", srcName); + xbt_assert(dst->getRcType()==SURF_NETWORK_ELEMENT_HOST || dst->getRcType()==SURF_NETWORK_ELEMENT_ROUTER, + "When defining a route, dst must be an host or a router but '%s' is not. Did you meant to have an ASroute?", dstName); + } else { + XBT_DEBUG("Load ASroute from %s@%s to %s@%s", srcName, route->gw_src->name(), dstName, route->gw_dst->name()); + xbt_assert(src->getRcType()==SURF_NETWORK_ELEMENT_AS, + "When defining an ASroute, src must be an AS but '%s' is not", srcName); + xbt_assert(dst->getRcType()==SURF_NETWORK_ELEMENT_AS, + "When defining an ASroute, dst must be an AS but '%s' is not", dstName); + + xbt_assert(route->gw_src->getRcType()==SURF_NETWORK_ELEMENT_HOST || route->gw_src->getRcType()==SURF_NETWORK_ELEMENT_ROUTER, + "When defining an ASroute, gw_src must be an host or a router but '%s' is not.", srcName); + xbt_assert(route->gw_dst->getRcType()==SURF_NETWORK_ELEMENT_HOST || route->gw_dst->getRcType()==SURF_NETWORK_ELEMENT_ROUTER, + "When defining an ASroute, gw_dst must be an host or a router but '%s' is not.", dstName); + + xbt_assert(route->gw_src != route->gw_dst, "Cannot define an ASroute from '%s' to itself", route->gw_src->name()); + + xbt_assert(src, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", + srcName,route->gw_src->name(), dstName,route->gw_dst->name(), srcName); + xbt_assert(dst, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", + srcName,route->gw_src->name(), dstName,route->gw_dst->name(), dstName); + xbt_assert(!xbt_dynar_is_empty(route->link_list), "Empty route (between %s@%s and %s@%s) forbidden.", + srcName,route->gw_src->name(), dstName,route->gw_dst->name()); } - return NULL; } -AsPtr AsGeneric::processingUnitsExist(char *element) -{ - AsPtr element_as = sg_host_edge(sg_host_by_name(element)) ->getRcComponent(); - if (element_as == this) - return element_as; - return asExist(element_as); } - -void AsGeneric::srcDstCheck(RoutingEdgePtr src, RoutingEdgePtr dst) -{ - if (src == NULL || dst == NULL) - xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"", - src ? src->getName() : "(null)", - dst ? dst->getName() : "(null)", - p_name); - - AsPtr src_as = src->getRcComponent(); - AsPtr 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->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->getName(), - dst->getName(), - src_as->p_name, - dst_as->p_name, - p_name); }