X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/210da270d0339479db706757d8c836621bb138c9..1d2bca9cb00606cfb06cc2e7d17cd056da2becac:/src/kernel/routing/ClusterZone.cpp

diff --git a/src/kernel/routing/ClusterZone.cpp b/src/kernel/routing/ClusterZone.cpp
index 6cc36f1656..9467b8de99 100644
--- a/src/kernel/routing/ClusterZone.cpp
+++ b/src/kernel/routing/ClusterZone.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2017. 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. */
@@ -22,12 +22,12 @@ ClusterZone::ClusterZone(NetZone* father, const char* name) : NetZoneImpl(father
 
 void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat)
 {
-  XBT_VERB("cluster getLocalRoute from '%s'[%d] to '%s'[%d]", src->cname(), src->id(), dst->cname(), dst->id());
-  xbt_assert(!privateLinks_.empty(),
+  XBT_VERB("cluster getLocalRoute from '%s'[%u] to '%s'[%u]", src->cname(), src->id(), dst->cname(), dst->id());
+  xbt_assert(not privateLinks_.empty(),
              "Cluster routing: no links attached to the source node - did you use host_link tag?");
 
   if ((src->id() == dst->id()) && hasLoopback_) {
-    xbt_assert(!src->isRouter(), "Routing from a cluster private router to itself is meaningless");
+    xbt_assert(not src->isRouter(), "Routing from a cluster private router to itself is meaningless");
 
     std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(src->id() * linkCountPerNode_);
     route->link_list->push_back(info.first);
@@ -36,7 +36,7 @@ void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cba
     return;
   }
 
-  if (!src->isRouter()) { // No private link for the private router
+  if (not src->isRouter()) { // No private link for the private router
     if (hasLimiter_) { // limiter for sender
       std::pair<surf::LinkImpl*, surf::LinkImpl*> info =
           privateLinks_.at(src->id() * linkCountPerNode_ + (hasLoopback_ ? 1 : 0));
@@ -58,7 +58,7 @@ void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cba
       *lat += backbone_->latency();
   }
 
-  if (!dst->isRouter()) { // No specific link for router
+  if (not dst->isRouter()) { // No specific link for router
 
     std::pair<surf::LinkImpl*, surf::LinkImpl*> info =
         privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_ + hasLimiter_);
@@ -84,18 +84,18 @@ 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);
   }
 
-  for (auto src : vertices_) {
-    if (!src->isRouter()) {
+  for (auto src : getVertices()) {
+    if (not src->isRouter()) {
       xbt_node_t previous = new_xbt_graph_node(graph, src->cname(), nodes);
 
       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_) {
@@ -121,30 +121,27 @@ void ClusterZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges
 
 void ClusterZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int /*rank*/, int position)
 {
-  char* link_id = bprintf("%s_link_%d", cluster->id, id);
+  std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(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);
+    std::string tmp_link = std::string(link_id) + "_UP";
     linkUp         = surf::LinkImpl::byName(tmp_link);
-    xbt_free(tmp_link);
-    tmp_link = bprintf("%s_DOWN", link_id);
+    tmp_link             = std::string(link_id) + "_DOWN";
     linkDown = surf::LinkImpl::byName(tmp_link);
-    xbt_free(tmp_link);
   } else {
     linkUp   = surf::LinkImpl::byName(link_id);
     linkDown = linkUp;
   }
   privateLinks_.insert({position, {linkUp, linkDown}});
-  xbt_free(link_id);
 }
 }
 }