Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into tomerge

[simgrid.git] / src / surf / surf_routing_cluster.cpp

diff --git a/src/surf/surf_routing_cluster.cpp b/src/surf/surf_routing_cluster.cpp
index 91427cd..c33c05f 100644 (file)
--- a/src/surf/surf_routing_cluster.cpp
+++ b/src/surf/surf_routing_cluster.cpp
@@ -29,7 +29,7 @@ AsCluster::AsCluster() : AsNone()
 }
 
 /* Business methods */
-void AsCluster::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t route, double *lat)
+void AsCluster::getRouteAndLatency(RoutingEdge *src, RoutingEdge *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]",
@@ -41,7 +41,7 @@ void AsCluster::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl
       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<NetworkLinkPtr>(info.link_up)->getLatency();
+        *lat += static_cast<Link*>(info.link_up)->getLatency();
       return;
     }
 
@@ -55,13 +55,13 @@ void AsCluster::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl
     if (info.link_up) {         // link up
       xbt_dynar_push_as(route->link_list, void *, info.link_up);
       if (lat)
-        *lat += static_cast<NetworkLinkPtr>(info.link_up)->getLatency();
+        *lat += static_cast<Link*>(info.link_up)->getLatency();
     }
 
   }
 
   if (p_backbone) {
-    xbt_dynar_push_as(route->link_list, void *, static_cast<ResourcePtr>(p_backbone));
+    xbt_dynar_push_as(route->link_list, void *, static_cast<Resource*>(p_backbone));
     if (lat)
       *lat += p_backbone->getLatency();
   }
@@ -72,7 +72,7 @@ void AsCluster::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl
     if (info.link_down) {       // link down
       xbt_dynar_push_as(route->link_list, void *, info.link_down);
       if (lat)
-        *lat += static_cast<NetworkLinkPtr>(info.link_down)->getLatency();
+        *lat += static_cast<Link*>(info.link_down)->getLatency();
     }
     if (p_has_limiter){          // limiter for receiver
         info = xbt_dynar_get_as(p_linkUpDownList, dst->getId() * p_nb_links_per_node + p_has_loopback, s_surf_parsing_link_up_down_t);
@@ -86,7 +86,7 @@ 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;
+  RoutingEdge *src;
   xbt_node_t current, previous, backboneNode = NULL, routerNode;
   s_surf_parsing_link_up_down_t info;
 
@@ -104,7 +104,7 @@ 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, RoutingEdge*);
 
     if (src->getRcType() != SURF_NETWORK_ELEMENT_ROUTER) {
       previous = new_xbt_graph_node(graph, src->getName(), nodes);
@@ -113,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 = static_cast<ResourcePtr>(info.link_up)->getName();
+        const char *link_name = static_cast<Resource*>(info.link_up)->getName();
         current = new_xbt_graph_node(graph, link_name, nodes);
         new_xbt_graph_edge(graph, previous, current, edges);
 
@@ -126,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 = static_cast<ResourcePtr>(info.link_down)->getName();
+        const char *link_name = static_cast<Resource*>(info.link_down)->getName();
         current = new_xbt_graph_node(graph, link_name, nodes);
         new_xbt_graph_edge(graph, previous, current, edges);
 
@@ -156,28 +156,28 @@ void AsCluster::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id,
 
   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);
+    info.link_up = sg_link_by_name(tmp_link);
     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);
+    info.link_down = sg_link_by_name(tmp_link);
     xbt_free(tmp_link);
   } else {
-    info.link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL);
+    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) {
+int AsCluster::parsePU(RoutingEdge *elm) {
   XBT_DEBUG("Load process unit \"%s\"", elm->getName());
-  xbt_dynar_push_as(p_indexNetworkElm, RoutingEdgePtr, elm);
+  xbt_dynar_push_as(p_indexNetworkElm, RoutingEdge*, elm);
   return xbt_dynar_length(p_indexNetworkElm)-1;
 }
 
-int AsCluster::parseAS(RoutingEdgePtr elm) {
+int AsCluster::parseAS(RoutingEdge *elm) {
   XBT_DEBUG("Load Autonomous system \"%s\"", elm->getName());
-  xbt_dynar_push_as(p_indexNetworkElm, RoutingEdgePtr, elm);
+  xbt_dynar_push_as(p_indexNetworkElm, RoutingEdge*, elm);
   return xbt_dynar_length(p_indexNetworkElm)-1;
 }