X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eee21ec5f99218189fc98898a09150294cd0fbf4..228ec0b9d568130e65c10f7e9d25ccb5273abaa8:/src/surf/surf_routing_cluster.cpp diff --git a/src/surf/surf_routing_cluster.cpp b/src/surf/surf_routing_cluster.cpp index 110e685761..7da22e6049 100644 --- a/src/surf/surf_routing_cluster.cpp +++ b/src/surf/surf_routing_cluster.cpp @@ -1,13 +1,12 @@ -/* Copyright (c) 2009, 2010, 2011. The SimGrid Team. +/* Copyright (c) 2009-2011, 2013-2014. 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_cluster.hpp" -extern "C" { XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf"); -} /* This routing is specifically setup to represent clusters, aka homogeneous sets of machines * Note that a router is created, easing the interconnexion with the rest of the world. @@ -24,6 +23,9 @@ AsCluster::AsCluster() : AsNone() p_backbone = 0; p_loopback = 0; p_router = 0; + p_has_limiter = 0; + p_has_loopback = 0; + p_nb_links_per_node = 1; } /* Business methods */ @@ -34,24 +36,28 @@ void AsCluster::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl src->p_name, src->m_id, dst->p_name, dst->m_id); if (src->p_rcType != SURF_NETWORK_ELEMENT_ROUTER) { // No specific link for router - info = xbt_dynar_get_as(p_linkUpDownList, src->m_id, s_surf_parsing_link_up_down_t); - if((src->m_id == dst->m_id) && info.loopback_link ){ - xbt_dynar_push_as(route->link_list, void *, info.loopback_link); + if((src->m_id == dst->m_id) && p_has_loopback ){ + info = xbt_dynar_get_as(p_linkUpDownList, src->m_id * p_nb_links_per_node, s_surf_parsing_link_up_down_t); + xbt_dynar_push_as(route->link_list, void *, info.link_up); if (lat) - *lat += dynamic_cast(static_cast(info.loopback_link))->getLatency(); + *lat += static_cast(info.link_up)->getLatency(); return; } - if (info.limiter_link) // limiter for sender - xbt_dynar_push_as(route->link_list, void *, info.limiter_link); + if (p_has_limiter){ // limiter for sender + info = xbt_dynar_get_as(p_linkUpDownList, src->m_id * p_nb_links_per_node + p_has_loopback, s_surf_parsing_link_up_down_t); + xbt_dynar_push_as(route->link_list, void *, info.link_up); + } + info = xbt_dynar_get_as(p_linkUpDownList, src->m_id * p_nb_links_per_node + p_has_loopback + p_has_limiter, s_surf_parsing_link_up_down_t); if (info.link_up) { // link up xbt_dynar_push_as(route->link_list, void *, info.link_up); if (lat) - *lat += dynamic_cast(static_cast(info.link_up))->getLatency(); + *lat += static_cast(info.link_up)->getLatency(); } + } if (p_backbone) { @@ -61,17 +67,17 @@ void AsCluster::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl } if (dst->p_rcType != SURF_NETWORK_ELEMENT_ROUTER) { // No specific link for router - info = - xbt_dynar_get_as(p_linkUpDownList, dst->m_id, s_surf_parsing_link_up_down_t); + info = xbt_dynar_get_as(p_linkUpDownList, dst->m_id * p_nb_links_per_node + p_has_loopback + p_has_limiter, s_surf_parsing_link_up_down_t); + if (info.link_down) { // link down xbt_dynar_push_as(route->link_list, void *, info.link_down); if (lat) - *lat += dynamic_cast(static_cast(info.link_down))->getLatency(); + *lat += static_cast(info.link_down)->getLatency(); + } + if (p_has_limiter){ // limiter for receiver + info = xbt_dynar_get_as(p_linkUpDownList, dst->m_id * p_nb_links_per_node + p_has_loopback, s_surf_parsing_link_up_down_t); + xbt_dynar_push_as(route->link_list, void *, info.link_up); } - - if (info.limiter_link) // limiter for receiver - xbt_dynar_push_as(route->link_list, void *, info.limiter_link); - } } @@ -91,7 +97,7 @@ void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) routerNode = new_xbt_graph_node(graph, link_name, nodes); if(p_backbone) { - const char *link_nameR = p_backbone->m_name; + const char *link_nameR = p_backbone->getName(); backboneNode = new_xbt_graph_node(graph, link_nameR, nodes); new_xbt_graph_edge(graph, routerNode, backboneNode, edges); @@ -107,7 +113,7 @@ void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) if (info.link_up) { // link up - const char *link_name = ((ResourcePtr) info.link_up)->m_name; + const char *link_name = static_cast(info.link_up)->getName(); current = new_xbt_graph_node(graph, link_name, nodes); new_xbt_graph_edge(graph, previous, current, edges); @@ -120,7 +126,7 @@ void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) } if (info.link_down) { // link down - const char *link_name = ((ResourcePtr) info.link_down)->m_name; + const char *link_name = static_cast(info.link_down)->getName(); current = new_xbt_graph_node(graph, link_name, nodes); new_xbt_graph_edge(graph, previous, current, edges); @@ -135,6 +141,34 @@ void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) } } +void AsCluster::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int , int position){ + s_sg_platf_link_cbarg_t link; + s_surf_parsing_link_up_down_t info; + char* link_id = bprintf("%s_link_%d", cluster->id, id); + + memset(&link, 0, sizeof(link)); + link.id = link_id; + link.bandwidth = cluster->bw; + link.latency = cluster->lat; + link.state = SURF_RESOURCE_ON; + link.policy = cluster->sharing_policy; + sg_platf_new_link(&link); + + if (link.policy == SURF_LINK_FULLDUPLEX) { + char *tmp_link = bprintf("%s_UP", link_id); + info.link_up = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); + xbt_free(tmp_link); + tmp_link = bprintf("%s_DOWN", link_id); + info.link_down = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); + xbt_free(tmp_link); + } else { + info.link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL); + info.link_down = info.link_up; + } + xbt_dynar_set(p_linkUpDownList, position, &info); + xbt_free(link_id); +} + int AsCluster::parsePU(RoutingEdgePtr elm) { XBT_DEBUG("Load process unit \"%s\"", elm->p_name); xbt_dynar_push_as(p_indexNetworkElm, RoutingEdgePtr, elm); @@ -147,4 +181,3 @@ int AsCluster::parseAS(RoutingEdgePtr elm) { return xbt_dynar_length(p_indexNetworkElm)-1; } -