X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f26d744d3e443d08cb485b543f30513f7da3469..ceedfe1f3f14e6cae48ee7684f98c7e4ab1fd2be:/src/surf/surf_routing_cluster.cpp diff --git a/src/surf/surf_routing_cluster.cpp b/src/surf/surf_routing_cluster.cpp index 20261833ef..4c924192d5 100644 --- a/src/surf/surf_routing_cluster.cpp +++ b/src/surf/surf_routing_cluster.cpp @@ -1,10 +1,11 @@ -/* Copyright (c) 2009, 2010, 2011, 2013. The SimGrid Team. +/* Copyright (c) 2009-2011, 2013-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_cluster.hpp" +#include "surf_routing_private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf"); @@ -14,9 +15,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf" AS_t model_cluster_create(void) { - return new AsCluster(); + return new simgrid::surf::AsCluster(); } +namespace simgrid { +namespace surf { + /* Creation routing model functions */ AsCluster::AsCluster() : AsNone() { @@ -29,53 +33,54 @@ AsCluster::AsCluster() : AsNone() } /* Business methods */ -void AsCluster::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t route, double *lat) +void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat) { s_surf_parsing_link_up_down_t info; XBT_VERB("cluster_get_route_and_latency from '%s'[%d] to '%s'[%d]", - src->p_name, src->m_id, dst->p_name, dst->m_id); + src->getName(), src->getId(), dst->getName(), dst->getId()); - if (src->p_rcType != SURF_NETWORK_ELEMENT_ROUTER) { // No specific link for router + if (src->getRcType() != SURF_NETWORK_ELEMENT_ROUTER) { // No specific link for router - 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); + if((src->getId() == dst->getId()) && p_has_loopback ){ + info = xbt_dynar_get_as(p_linkUpDownList, src->getId() * 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 += static_cast(info.link_up)->getLatency(); + *lat += static_cast(info.link_up)->getLatency(); return; } 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); + info = xbt_dynar_get_as(p_linkUpDownList, src->getId() * 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); + info = xbt_dynar_get_as(p_linkUpDownList, src->getId() * 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 += static_cast(info.link_up)->getLatency(); + *lat += static_cast(info.link_up)->getLatency(); } } if (p_backbone) { - xbt_dynar_push_as(route->link_list, void *, static_cast(p_backbone)); + xbt_dynar_push_as(route->link_list, void *, + static_cast(p_backbone)); if (lat) *lat += p_backbone->getLatency(); } - if (dst->p_rcType != SURF_NETWORK_ELEMENT_ROUTER) { // No specific link for router - 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 (dst->getRcType() != SURF_NETWORK_ELEMENT_ROUTER) { // No specific link for router + info = xbt_dynar_get_as(p_linkUpDownList, dst->getId() * 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 += 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); + info = xbt_dynar_get_as(p_linkUpDownList, dst->getId() * 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); } } @@ -86,14 +91,14 @@ void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) int isrc; int table_size = xbt_dynar_length(p_indexNetworkElm); - RoutingEdgePtr src; + NetCard *src; xbt_node_t current, previous, backboneNode = NULL, routerNode; s_surf_parsing_link_up_down_t info; - xbt_assert(p_router,"Malformed cluster"); + xbt_assert(p_router,"Malformed cluster. This may be because your platform file is a hypergraph while it must be a graph."); /* create the router */ - char *link_name = p_router->p_name; + char *link_name = p_router->getName(); routerNode = new_xbt_graph_node(graph, link_name, nodes); if(p_backbone) { @@ -104,16 +109,17 @@ void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) } for (isrc = 0; isrc < table_size; isrc++) { - src = xbt_dynar_get_as(p_indexNetworkElm, isrc, RoutingEdgePtr); + src = xbt_dynar_get_as(p_indexNetworkElm, isrc, NetCard*); - if (src->p_rcType != SURF_NETWORK_ELEMENT_ROUTER) { - previous = new_xbt_graph_node(graph, src->p_name, nodes); + if (src->getRcType() != SURF_NETWORK_ELEMENT_ROUTER) { + previous = new_xbt_graph_node(graph, src->getName(), nodes); - info = xbt_dynar_get_as(p_linkUpDownList, src->m_id, s_surf_parsing_link_up_down_t); + info = xbt_dynar_get_as(p_linkUpDownList, src->getId(), s_surf_parsing_link_up_down_t); if (info.link_up) { // link up - const char *link_name = static_cast(info.link_up)->getName(); + 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); @@ -126,7 +132,8 @@ 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 = static_cast(info.link_down)->getName(); + 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); @@ -142,7 +149,7 @@ 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_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER; s_surf_parsing_link_up_down_t info; char* link_id = bprintf("%s_link_%d", cluster->id, id); @@ -150,37 +157,36 @@ void AsCluster::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, link.id = link_id; link.bandwidth = cluster->bw; link.latency = cluster->lat; - link.state = SURF_RESOURCE_ON; + link.initiallyOn = 1; 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); - 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); - 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); - + info.link_up = sg_link_by_name(tmp_link); + xbt_free(tmp_link); + tmp_link = bprintf("%s_DOWN", link_id); + info.link_down = sg_link_by_name(tmp_link); + xbt_free(tmp_link); + } else { + info.link_up = sg_link_by_name(link_id); + 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); +int AsCluster::parsePU(NetCard *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 AsCluster::parseAS(RoutingEdgePtr elm) { - XBT_DEBUG("Load Autonomous system \"%s\"", elm->p_name); - xbt_dynar_push_as(p_indexNetworkElm, RoutingEdgePtr, elm); +int AsCluster::parseAS(NetCard *elm) { + XBT_DEBUG("Load Autonomous system \"%s\"", elm->getName()); + xbt_dynar_push_as(p_indexNetworkElm, NetCard*, elm); return xbt_dynar_length(p_indexNetworkElm)-1; } +} +}