finish the transition from C structures to C++ objects

[simgrid.git] / src / kernel / routing / ClusterZone.cpp

diff --git a/src/kernel/routing/ClusterZone.cpp b/src/kernel/routing/ClusterZone.cpp
index 6cc36f1..b3363f9 100644 (file)
--- a/src/kernel/routing/ClusterZone.cpp
+++ b/src/kernel/routing/ClusterZone.cpp
@@ -84,7 +84,7 @@ void ClusterZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges
 
   xbt_node_t backboneNode = nullptr;
   if (backbone_) {
-    backboneNode = new_xbt_graph_node(graph, backbone_->getName(), nodes);
+    backboneNode = new_xbt_graph_node(graph, backbone_->cname(), nodes);
     new_xbt_graph_edge(graph, routerNode, backboneNode, edges);
   }
 
@@ -95,7 +95,7 @@ void ClusterZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges
       std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(src->id());
 
       if (info.first) { // link up
-        xbt_node_t current = new_xbt_graph_node(graph, info.first->getName(), nodes);
+        xbt_node_t current = new_xbt_graph_node(graph, info.first->cname(), nodes);
         new_xbt_graph_edge(graph, previous, current, edges);
 
         if (backbone_) {
@@ -106,7 +106,7 @@ void ClusterZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges
       }
 
       if (info.second) { // link down
-        xbt_node_t current = new_xbt_graph_node(graph, info.second->getName(), nodes);
+        xbt_node_t current = new_xbt_graph_node(graph, info.second->cname(), nodes);
         new_xbt_graph_edge(graph, previous, current, edges);
 
         if (backbone_) {
@@ -123,15 +123,15 @@ void ClusterZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id
 {
   char* link_id = bprintf("%s_link_%d", cluster->id, id);
 
-  s_sg_platf_link_cbarg_t link;
-  memset(&link, 0, sizeof(link));
+  LinkCreationArgs link;
   link.id        = link_id;
   link.bandwidth = cluster->bw;
   link.latency   = cluster->lat;
   link.policy    = cluster->sharing_policy;
   sg_platf_new_link(&link);
 
-  surf::LinkImpl *linkUp, *linkDown;
+  surf::LinkImpl *linkUp;
+  surf::LinkImpl *linkDown;
   if (link.policy == SURF_LINK_FULLDUPLEX) {
     char* tmp_link = bprintf("%s_UP", link_id);
     linkUp         = surf::LinkImpl::byName(tmp_link);
@@ -144,7 +144,6 @@ void ClusterZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id
     linkDown = linkUp;
   }
   privateLinks_.insert({position, {linkUp, linkDown}});
-  xbt_free(link_id);
 }
 }
 }