What's not malloced cannot be leaked

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

diff --git a/src/surf/AsCluster.cpp b/src/surf/AsCluster.cpp
index a297300..cd79138 100644 (file)
--- a/src/surf/AsCluster.cpp
+++ b/src/surf/AsCluster.cpp
@@ -17,6 +17,10 @@ namespace surf {
   AsCluster::AsCluster(const char*name)
     : AsImpl(name)
   {}
+  AsCluster::~AsCluster()
+  {
+    xbt_dynar_free(&privateLinks_);
+  }
 
 void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat)
 {
@@ -27,8 +31,8 @@ void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
   if (! src->isRouter()) {    // No specific link for router
 
     if((src->id() == dst->id()) && has_loopback_  ){
-      info = xbt_dynar_get_as(upDownLinks, src->id() * nb_links_per_node_, s_surf_parsing_link_up_down_t);
-      route->link_list->push_back(info.link_up);
+      info = xbt_dynar_get_as(privateLinks_, src->id() * nb_links_per_node_, s_surf_parsing_link_up_down_t);
+      route->link_list.push_back(info.link_up);
       if (lat)
         *lat += info.link_up->getLatency();
       return;
@@ -36,13 +40,13 @@ void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
 
 
     if (has_limiter_){          // limiter for sender
-      info = xbt_dynar_get_as(upDownLinks, src->id() * nb_links_per_node_ + has_loopback_, s_surf_parsing_link_up_down_t);
-      route->link_list->push_back((Link*)info.link_up);
+      info = xbt_dynar_get_as(privateLinks_, src->id() * nb_links_per_node_ + has_loopback_, s_surf_parsing_link_up_down_t);
+      route->link_list.push_back((Link*)info.link_up);
     }
 
-    info = xbt_dynar_get_as(upDownLinks, src->id() * nb_links_per_node_ + has_loopback_ + has_limiter_, s_surf_parsing_link_up_down_t);
+    info = xbt_dynar_get_as(privateLinks_, src->id() * nb_links_per_node_ + has_loopback_ + has_limiter_, s_surf_parsing_link_up_down_t);
     if (info.link_up) {         // link up
-      route->link_list->push_back(info.link_up);
+      route->link_list.push_back(info.link_up);
       if (lat)
         *lat += info.link_up->getLatency();
     }
@@ -50,29 +54,28 @@ void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
   }
 
   if (backbone_) {
-    route->link_list->push_back(backbone_);
+    route->link_list.push_back(backbone_);
     if (lat)
       *lat += backbone_->getLatency();
   }
 
   if (! dst->isRouter()) {    // No specific link for router
-    info = xbt_dynar_get_as(upDownLinks, dst->id() * nb_links_per_node_ + has_loopback_ + has_limiter_, s_surf_parsing_link_up_down_t);
+    info = xbt_dynar_get_as(privateLinks_, dst->id() * nb_links_per_node_ + has_loopback_ + has_limiter_, s_surf_parsing_link_up_down_t);
 
     if (info.link_down) {       // link down
-      route->link_list->push_back(info.link_down);
+      route->link_list.push_back(info.link_down);
       if (lat)
         *lat += info.link_down->getLatency();
     }
     if (has_limiter_){          // limiter for receiver
-        info = xbt_dynar_get_as(upDownLinks, dst->id() * nb_links_per_node_ + has_loopback_, s_surf_parsing_link_up_down_t);
-        route->link_list->push_back(info.link_up);
+        info = xbt_dynar_get_as(privateLinks_, dst->id() * nb_links_per_node_ + has_loopback_, s_surf_parsing_link_up_down_t);
+        route->link_list.push_back(info.link_up);
     }
   }
 }
 
 void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
 {
-  int isrc;
   int table_size = xbt_dynar_length(vertices_);
 
   NetCard *src;
@@ -92,13 +95,13 @@ void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
     new_xbt_graph_edge(graph, routerNode, backboneNode, edges);
   }
 
-  for (isrc = 0; isrc < table_size; isrc++) {
+  for (int isrc = 0; isrc < table_size; isrc++) {
     src = xbt_dynar_get_as(vertices_, isrc, NetCard*);
 
     if (! src->isRouter()) {
       previous = new_xbt_graph_node(graph, src->name(), nodes);
 
-      info = xbt_dynar_get_as(upDownLinks, src->id(), s_surf_parsing_link_up_down_t);
+      info = xbt_dynar_get_as(privateLinks_, src->id(), s_surf_parsing_link_up_down_t);
 
       if (info.link_up) {     // link up
 
@@ -133,10 +136,10 @@ 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 = SG_PLATF_LINK_INITIALIZER;
   s_surf_parsing_link_up_down_t info;
   char* link_id = bprintf("%s_link_%d", cluster->id, id);
 
+  s_sg_platf_link_cbarg_t link;
   memset(&link, 0, sizeof(link));
   link.id = link_id;
   link.bandwidth = cluster->bw;
@@ -146,16 +149,15 @@ 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 = sg_link_by_name(tmp_link);
+    info.link_up = Link::byName(tmp_link);
     xbt_free(tmp_link);
     tmp_link = bprintf("%s_DOWN", link_id);
-    info.link_down = sg_link_by_name(tmp_link);
+    info.link_down = Link::byName(tmp_link);
     xbt_free(tmp_link);
   } else {
-    info.link_up = sg_link_by_name(link_id);
-    info.link_down = info.link_up;
+    info.link_up = info.link_down = Link::byName(link_id);
   }
-  xbt_dynar_set(upDownLinks, position, &info);
+  xbt_dynar_set(privateLinks_, position, &info);
   xbt_free(link_id);
 }