Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
give a network_model to each NetZone (unused for now)
[simgrid.git] / src / kernel / routing / DragonflyZone.cpp
index 1ce8275..34b4513 100644 (file)
@@ -1,14 +1,16 @@
-/* Copyright (c) 2014-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2018. 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 "src/kernel/routing/DragonflyZone.hpp"
-#include "src/kernel/routing/NetCard.hpp"
+#include "simgrid/kernel/routing/DragonflyZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp"
+#include "src/surf/xml/platf_private.hpp"
 
-#include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <string>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_dragonfly, surf_route_cluster, "Dragonfly Routing part of surf");
 
@@ -16,322 +18,352 @@ namespace simgrid {
 namespace kernel {
 namespace routing {
 
-AsClusterDragonfly::AsClusterDragonfly(As* father, const char* name) : AsCluster(father, name)
+DragonflyZone::DragonflyZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel)
+    : ClusterZone(father, name, netmodel)
 {
 }
 
-AsClusterDragonfly::~AsClusterDragonfly() {
-  if(this->routers_ != nullptr){
-    for (unsigned int i=0; i<this->numGroups_*this->numChassisPerGroup_*this->numBladesPerChassis_;i++)
-        delete(routers_[i]);
-    xbt_free(routers_);
+DragonflyZone::~DragonflyZone()
+{
+  if (this->routers_ != nullptr) {
+    for (unsigned int i = 0; i < this->num_groups_ * this->num_chassis_per_group_ * this->num_blades_per_chassis_; i++)
+      delete routers_[i];
+    delete[] routers_;
   }
 }
 
-unsigned int *AsClusterDragonfly::rankId_to_coords(int rankId)
+void DragonflyZone::rankId_to_coords(int rankId, unsigned int coords[4])
 {
-  //coords : group, chassis, blade, node
-  unsigned int *coords = (unsigned int *) malloc(4 * sizeof(unsigned int));
-  coords[0] = rankId/ (numChassisPerGroup_*numBladesPerChassis_*numNodesPerBlade_);
-  rankId=rankId%(numChassisPerGroup_*numBladesPerChassis_*numNodesPerBlade_);
-  coords[1] = rankId/ (numBladesPerChassis_*numNodesPerBlade_);
-  rankId=rankId%(numBladesPerChassis_*numNodesPerBlade_);
-  coords[2] = rankId/ numNodesPerBlade_;
-  coords[3]=rankId%numNodesPerBlade_;
-
-  return coords;
+  // coords : group, chassis, blade, node
+  coords[0] = rankId / (num_chassis_per_group_ * num_blades_per_chassis_ * num_nodes_per_blade_);
+  rankId    = rankId % (num_chassis_per_group_ * num_blades_per_chassis_ * num_nodes_per_blade_);
+  coords[1] = rankId / (num_blades_per_chassis_ * num_nodes_per_blade_);
+  rankId    = rankId % (num_blades_per_chassis_ * num_nodes_per_blade_);
+  coords[2] = rankId / num_nodes_per_blade_;
+  coords[3] = rankId % num_nodes_per_blade_;
 }
 
-void AsClusterDragonfly::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) {
+void DragonflyZone::parse_specific_arguments(ClusterCreationArgs* cluster)
+{
   std::vector<std::string> parameters;
   std::vector<std::string> tmp;
   boost::split(parameters, cluster->topo_parameters, boost::is_any_of(";"));
 
-  // TODO : we have to check for zeros and negative numbers, or it might crash
-  if (parameters.size() != 4){
+  if (parameters.size() != 4 || parameters.empty()) {
     surf_parse_error(
         "Dragonfly are defined by the number of groups, chassis per groups, blades per chassis, nodes per blade");
   }
 
   // Blue network : number of groups, number of links between each group
   boost::split(tmp, parameters[0], boost::is_any_of(","));
-  if(tmp.size() != 2) {
+  if (tmp.size() != 2) {
     surf_parse_error("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element");
   }
 
-  this->numGroups_=xbt_str_parse_int(tmp[0].c_str(), "Invalid number of groups: %s");
-  this->numLinksBlue_=xbt_str_parse_int(tmp[1].c_str(), "Invalid number of links for the blue level: %s");
+  try {
+    this->num_groups_ = std::stoi(tmp[0]);
+  } catch (std::invalid_argument& ia) {
+    throw std::invalid_argument(std::string("Invalid number of groups:") + tmp[0]);
+  }
 
+  try {
+    this->num_links_blue_ = std::stoi(tmp[1]);
+  } catch (std::invalid_argument& ia) {
+    throw std::invalid_argument(std::string("Invalid number of links for the blue level:") + tmp[1]);
+  }
   // Black network : number of chassis/group, number of links between each router on the black network
   boost::split(tmp, parameters[1], boost::is_any_of(","));
-  if(tmp.size() != 2) {
+  if (tmp.size() != 2) {
     surf_parse_error("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element");
   }
 
-  this->numChassisPerGroup_=xbt_str_parse_int(tmp[0].c_str(), "Invalid number of groups: %s");
-  this->numLinksBlack_=xbt_str_parse_int(tmp[1].c_str(), "Invalid number of links  for the black level: %s");
+  try {
+    this->num_chassis_per_group_ = std::stoi(tmp[0]);
+  } catch (std::invalid_argument& ia) {
+    throw std::invalid_argument(std::string("Invalid number of groups:") + tmp[0]);
+  }
 
+  try {
+    this->num_links_black_ = std::stoi(tmp[1]);
+  } catch (std::invalid_argument& ia) {
+    throw std::invalid_argument(std::string("Invalid number of links for the black level:") + tmp[1]);
+  }
 
- // Green network : number of blades/chassis, number of links between each router on the green network
 // Green network : number of blades/chassis, number of links between each router on the green network
   boost::split(tmp, parameters[2], boost::is_any_of(","));
-  if(tmp.size() != 2) {
+  if (tmp.size() != 2) {
     surf_parse_error("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element");
   }
 
-  this->numBladesPerChassis_=xbt_str_parse_int(tmp[0].c_str(), "Invalid number of groups: %s");
-  this->numLinksGreen_=xbt_str_parse_int(tmp[1].c_str(), "Invalid number of links for the green level: %s");
+  try {
+    this->num_blades_per_chassis_ = std::stoi(tmp[0]);
+  } catch (std::invalid_argument& ia) {
+    throw std::invalid_argument(std::string("Invalid number of groups:") + tmp[0]);
+  }
 
+  try {
+    this->num_links_green_ = std::stoi(tmp[1]);
+  } catch (std::invalid_argument& ia) {
+    throw std::invalid_argument(std::string("Invalid number of links for the green level:") + tmp[1]);
+  }
 
   // The last part of topo_parameters should be the number of nodes per blade
-  this->numNodesPerBlade_ = xbt_str_parse_int(parameters[3].c_str(), "Last parameter is not the amount of nodes per blade: %s");
-  this->cluster_ = cluster;
+  try {
+    this->num_nodes_per_blade_ = std::stoi(parameters[3]);
+  } catch (std::invalid_argument& ia) {
+    throw std::invalid_argument(std::string("Last parameter is not the amount of nodes per blade:") + parameters[3]);
+  }
+
+  this->sharing_policy_ = cluster->sharing_policy;
+  if (cluster->sharing_policy == s4u::Link::SharingPolicy::SPLITDUPLEX)
+    this->num_links_per_link_ = 2;
+  this->bw_  = cluster->bw;
+  this->lat_ = cluster->lat;
 }
 
-/*
-* Generate the cluster once every node is created
-*/
-void AsClusterDragonfly::seal(){
-  if(this->numNodesPerBlade_ == 0) {
+/* Generate the cluster once every node is created */
+void DragonflyZone::seal()
+{
+  if (this->num_nodes_per_blade_ == 0) {
     return;
   }
 
-  this->generateRouters();
-  this->generateLinks();
+  this->generate_routers();
+  this->generate_links();
 }
 
-DragonflyRouter::DragonflyRouter(int group, int chassis, int blade):group_(group),chassis_(chassis),blade_(blade){ }
-
-DragonflyRouter::~DragonflyRouter(){
-  if(this->myNodes_!=nullptr)
-    xbt_free(myNodes_);
-  if(this->greenLinks_!=nullptr)
-    xbt_free(greenLinks_);
-  if(this->blackLinks_!=nullptr)
-    xbt_free(blackLinks_);
-  if(this->blueLinks_!=nullptr)
-    xbt_free(blueLinks_);
+DragonflyRouter::DragonflyRouter(int group, int chassis, int blade) : group_(group), chassis_(chassis), blade_(blade)
+{
 }
 
+DragonflyRouter::~DragonflyRouter()
+{
+  delete[] my_nodes_;
+  delete[] green_links_;
+  delete[] black_links_;
+  delete blue_links_;
+}
 
-void AsClusterDragonfly::generateRouters() {
-  this->routers_=static_cast<DragonflyRouter**>(xbt_malloc0(this->numGroups_*this->numChassisPerGroup_*this->numBladesPerChassis_*sizeof(DragonflyRouter*)));
-
-  for(unsigned int i=0;i<this->numGroups_;i++){
-    for(unsigned int j=0;j<this->numChassisPerGroup_;j++){
-      for(unsigned int k=0;k<this->numBladesPerChassis_;k++){
-        DragonflyRouter* router = new DragonflyRouter(i,j,k);
-        this->routers_[i*this->numChassisPerGroup_*this->numBladesPerChassis_+j*this->numBladesPerChassis_+k]=router;
+void DragonflyZone::generate_routers()
+{
+  this->routers_ =
+      new DragonflyRouter*[this->num_groups_ * this->num_chassis_per_group_ * this->num_blades_per_chassis_];
+
+  for (unsigned int i = 0; i < this->num_groups_; i++) {
+    for (unsigned int j = 0; j < this->num_chassis_per_group_; j++) {
+      for (unsigned int k = 0; k < this->num_blades_per_chassis_; k++) {
+        DragonflyRouter* router = new DragonflyRouter(i, j, k);
+        this->routers_[i * this->num_chassis_per_group_ * this->num_blades_per_chassis_ +
+                       j * this->num_blades_per_chassis_ + k] = router;
       }
     }
   }
 }
 
-void AsClusterDragonfly::createLink(char* id, int numlinks, Link** linkup, Link** linkdown){
-  *linkup=nullptr;
-  *linkdown=nullptr;
-  s_sg_platf_link_cbarg_t linkTemplate;
-  memset(&linkTemplate, 0, sizeof(linkTemplate));
-  linkTemplate.bandwidth = this->cluster_->bw * numlinks;
-  linkTemplate.latency = this->cluster_->lat;
-  linkTemplate.policy = this->cluster_->sharing_policy; // sthg to do with that ?
-  linkTemplate.id = id;
+void DragonflyZone::create_link(const std::string& id, int numlinks, resource::LinkImpl** linkup,
+                                resource::LinkImpl** linkdown)
+{
+  *linkup   = nullptr;
+  *linkdown = nullptr;
+  LinkCreationArgs linkTemplate;
+  linkTemplate.bandwidth = this->bw_ * numlinks;
+  linkTemplate.latency   = this->lat_;
+  linkTemplate.policy    = this->sharing_policy_;
+  linkTemplate.id        = id;
   sg_platf_new_link(&linkTemplate);
-  XBT_DEBUG("Generating link %s", id);
-  Link* link;
-  std::string tmpID;
-  if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX) {
-    tmpID = std::string(linkTemplate.id) + "_UP";
-    link =  Link::byName(tmpID.c_str());
-    *linkup = link; // check link?
-    tmpID = std::string(linkTemplate.id) + "_DOWN";
-    link = Link::byName(tmpID.c_str());
-    *linkdown = link; // check link ?
-  }
-  else {
-    link = Link::byName(linkTemplate.id);
-    *linkup = link;
+  XBT_DEBUG("Generating link %s", id.c_str());
+  resource::LinkImpl* link;
+  if (this->sharing_policy_ == s4u::Link::SharingPolicy::SPLITDUPLEX) {
+    *linkup   = s4u::Link::by_name(linkTemplate.id + "_UP")->get_impl();   // check link?
+    *linkdown = s4u::Link::by_name(linkTemplate.id + "_DOWN")->get_impl(); // check link ?
+  } else {
+    link      = s4u::Link::by_name(linkTemplate.id)->get_impl();
+    *linkup   = link;
     *linkdown = link;
   }
-
-  free((void*)linkTemplate.id);
 }
 
+void DragonflyZone::generate_links()
+{
+  static int uniqueId = 0;
+  resource::LinkImpl* linkup;
+  resource::LinkImpl* linkdown;
 
-void AsClusterDragonfly::generateLinks() {
+  unsigned int numRouters = this->num_groups_ * this->num_chassis_per_group_ * this->num_blades_per_chassis_;
+
+  // Links from routers to their local nodes.
+  for (unsigned int i = 0; i < numRouters; i++) {
+    // allocate structures
+    this->routers_[i]->my_nodes_    = new resource::LinkImpl*[num_links_per_link_ * this->num_nodes_per_blade_];
+    this->routers_[i]->green_links_ = new resource::LinkImpl*[this->num_blades_per_chassis_];
+    this->routers_[i]->black_links_ = new resource::LinkImpl*[this->num_chassis_per_group_];
+
+    for (unsigned int j = 0; j < num_links_per_link_ * this->num_nodes_per_blade_; j += num_links_per_link_) {
+      std::string id = "local_link_from_router_" + std::to_string(i) + "_to_node_" +
+                       std::to_string(j / num_links_per_link_) + "_" + std::to_string(uniqueId);
+      this->create_link(id, 1, &linkup, &linkdown);
+
+      this->routers_[i]->my_nodes_[j] = linkup;
+      if (this->sharing_policy_ == s4u::Link::SharingPolicy::SPLITDUPLEX)
+        this->routers_[i]->my_nodes_[j + 1] = linkdown;
 
-  static int uniqueId = 0;
-  char* id = nullptr;
-  Link* linkup;
-  Link *linkdown;
-
-  unsigned int numRouters = this->numGroups_*this->numChassisPerGroup_*this->numBladesPerChassis_;
-
-  if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX)
-    numLinksperLink_=2;
-
-  //Links from routers to their local nodes.
-  for(unsigned int i=0; i<numRouters;i++){
-  //allocate structures
-    this->routers_[i]->myNodes_=static_cast<Link**>(xbt_malloc0(numLinksperLink_*this->numNodesPerBlade_*sizeof(Link*)));
-    this->routers_[i]->greenLinks_=static_cast<Link**>(xbt_malloc0(this->numBladesPerChassis_*sizeof(Link*)));
-    this->routers_[i]->blackLinks_=static_cast<Link**>(xbt_malloc0(this->numChassisPerGroup_*sizeof(Link*)));
-
-    for(unsigned int j=0; j< numLinksperLink_*this->numNodesPerBlade_; j+=numLinksperLink_){
-      id = bprintf("local_link_from_router_%d_to_node_%d_%d", i, j/numLinksperLink_, uniqueId);
-      this->createLink(id, 1, &linkup, &linkdown);
-      if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX) {
-        this->routers_[i]->myNodes_[j] = linkup; 
-        this->routers_[i]->myNodes_[j+1] = linkdown; 
-      }
-      else {
-        this->routers_[i]->myNodes_[j] = linkup;
-      }
       uniqueId++;
     }
   }
 
-  //Green links from routers to same chassis routers - alltoall
-  for(unsigned int i=0; i<this->numGroups_*this->numChassisPerGroup_;i++){
-    for(unsigned int j=0; j<this->numBladesPerChassis_;j++){
-      for(unsigned int k=j+1;k<this->numBladesPerChassis_;k++){
-        id = bprintf("green_link_in_chassis_%d_between_routers_%d_and_%d_%d", i%numChassisPerGroup_, j, k, uniqueId);
-        this->createLink(id, this->numLinksGreen_, &linkup, &linkdown);
-        this->routers_[i*numBladesPerChassis_+j]->greenLinks_[k] = linkup;
-        this->routers_[i*numBladesPerChassis_+k]->greenLinks_[j] = linkdown; 
+  // Green links from routers to same chassis routers - alltoall
+  for (unsigned int i = 0; i < this->num_groups_ * this->num_chassis_per_group_; i++) {
+    for (unsigned int j = 0; j < this->num_blades_per_chassis_; j++) {
+      for (unsigned int k = j + 1; k < this->num_blades_per_chassis_; k++) {
+        std::string id = "green_link_in_chassis_" + std::to_string(i % num_chassis_per_group_) + "_between_routers_" +
+                         std::to_string(j) + "_and_" + std::to_string(k) + "_" + std::to_string(uniqueId);
+        this->create_link(id, this->num_links_green_, &linkup, &linkdown);
+
+        this->routers_[i * num_blades_per_chassis_ + j]->green_links_[k] = linkup;
+        this->routers_[i * num_blades_per_chassis_ + k]->green_links_[j] = linkdown;
         uniqueId++;
       }
     }
   }
 
-  //Black links from routers to same group routers - alltoall
-  for(unsigned int i=0; i<this->numGroups_;i++){
-    for(unsigned int j=0; j<this->numChassisPerGroup_;j++){
-      for(unsigned int k=j+1;k<this->numChassisPerGroup_;k++){
-        for(unsigned int l=0;l<this->numBladesPerChassis_;l++){
-          id = bprintf("black_link_in_group_%d_between_chassis_%d_and_%d_blade_%d_%d", i, j, k,l, uniqueId);
-          this->createLink(id, this->numLinksBlack_,&linkup, &linkdown);
-          this->routers_[i*numBladesPerChassis_*numChassisPerGroup_+j*numBladesPerChassis_+l]->blackLinks_[k] = linkup;
-          this->routers_[i*numBladesPerChassis_*numChassisPerGroup_+k*numBladesPerChassis_+l]->blackLinks_[j] = linkdown; 
+  // Black links from routers to same group routers - alltoall
+  for (unsigned int i = 0; i < this->num_groups_; i++) {
+    for (unsigned int j = 0; j < this->num_chassis_per_group_; j++) {
+      for (unsigned int k = j + 1; k < this->num_chassis_per_group_; k++) {
+        for (unsigned int l = 0; l < this->num_blades_per_chassis_; l++) {
+          std::string id = "black_link_in_group_" + std::to_string(i) + "_between_chassis_" + std::to_string(j) +
+              "_and_" + std::to_string(k) +"_blade_" + std::to_string(l) + "_" + std::to_string(uniqueId);
+          this->create_link(id, this->num_links_black_, &linkup, &linkdown);
+
+          this->routers_[i * num_blades_per_chassis_ * num_chassis_per_group_ + j * num_blades_per_chassis_ + l]
+              ->black_links_[k] = linkup;
+          this->routers_[i * num_blades_per_chassis_ * num_chassis_per_group_ + k * num_blades_per_chassis_ + l]
+              ->black_links_[j] = linkdown;
           uniqueId++;
         }
       }
     }
   }
 
-
-  //Blue links between groups - Not all routers involved, only one per group is linked to others. Let's say router n of each group is linked to group n.
-//FIXME: in reality blue links may be attached to several different routers
-  for(unsigned int i=0; i<this->numGroups_;i++){
-    for(unsigned int j=i+1; j<this->numGroups_;j++){
-      unsigned int routernumi=i*numBladesPerChassis_*numChassisPerGroup_+j;
-      unsigned int routernumj=j*numBladesPerChassis_*numChassisPerGroup_+i;
-      this->routers_[routernumi]->blueLinks_=static_cast<Link**>(xbt_malloc0(sizeof(Link*)));
-      this->routers_[routernumj]->blueLinks_=static_cast<Link**>(xbt_malloc0(sizeof(Link*)));
-        id = bprintf("blue_link_between_group_%d_and_%d_routers_%d_and_%d_%d", i, j, routernumi,routernumj, uniqueId);
-        this->createLink(id, this->numLinksBlue_, &linkup, &linkdown);
-        this->routers_[routernumi]->blueLinks_[0] = linkup;
-        this->routers_[routernumj]->blueLinks_[0] = linkdown; 
-        uniqueId++;
+  // Blue links between groups - Not all routers involved, only one per group is linked to others. Let's say router n of
+  // each group is linked to group n.
+  // FIXME: in reality blue links may be attached to several different routers
+  for (unsigned int i = 0; i < this->num_groups_; i++) {
+    for (unsigned int j = i + 1; j < this->num_groups_; j++) {
+      unsigned int routernumi                 = i * num_blades_per_chassis_ * num_chassis_per_group_ + j;
+      unsigned int routernumj                 = j * num_blades_per_chassis_ * num_chassis_per_group_ + i;
+      this->routers_[routernumi]->blue_links_ = new resource::LinkImpl*;
+      this->routers_[routernumj]->blue_links_ = new resource::LinkImpl*;
+      std::string id = "blue_link_between_group_"+ std::to_string(i) +"_and_" + std::to_string(j) +"_routers_" +
+          std::to_string(routernumi) + "_and_" + std::to_string(routernumj) + "_" + std::to_string(uniqueId);
+      this->create_link(id, this->num_links_blue_, &linkup, &linkdown);
+
+      this->routers_[routernumi]->blue_links_[0] = linkup;
+      this->routers_[routernumj]->blue_links_[0] = linkdown;
+      uniqueId++;
     }
   }
 }
 
-void AsClusterDragonfly::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* latency)
+void DragonflyZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* latency)
 {
-  //Minimal routing version.
+  // Minimal routing version.
   // TODO : non-minimal random one, and adaptive ?
 
-  if (dst->isRouter() || src->isRouter())
+  if (dst->is_router() || src->is_router())
     return;
 
-  XBT_VERB("dragonfly getLocalRout from '%s'[%d] to '%s'[%d]", src->name().c_str(), src->id(), dst->name().c_str(),
+  XBT_VERB("dragonfly getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(),
            dst->id());
 
-  if ((src->id() == dst->id()) && hasLoopback_) {
-    std::pair<Link*, Link*> info = privateLinks_.at(src->id() * linkCountPerNode_);
+  if ((src->id() == dst->id()) && has_loopback_) {
+    std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos(src->id()));
 
-    route->link_list->push_back(info.first);
+    route->link_list.push_back(info.first);
     if (latency)
-      *latency += info.first->latency();
+      *latency += info.first->get_latency();
     return;
   }
 
-  unsigned int *myCoords = rankId_to_coords(src->id());
-  unsigned int *targetCoords = rankId_to_coords(dst->id());
+  unsigned int myCoords[4];
+  rankId_to_coords(src->id(), myCoords);
+  unsigned int targetCoords[4];
+  rankId_to_coords(dst->id(), targetCoords);
   XBT_DEBUG("src : %u group, %u chassis, %u blade, %u node", myCoords[0], myCoords[1], myCoords[2], myCoords[3]);
-  XBT_DEBUG("dst : %u group, %u chassis, %u blade, %u node", targetCoords[0], targetCoords[1], targetCoords[2], targetCoords[3]);
+  XBT_DEBUG("dst : %u group, %u chassis, %u blade, %u node", targetCoords[0], targetCoords[1], targetCoords[2],
+            targetCoords[3]);
 
-  DragonflyRouter* myRouter = routers_[myCoords[0]*(numChassisPerGroup_*numBladesPerChassis_)+myCoords[1] * numBladesPerChassis_+myCoords[2]];
-  DragonflyRouter* targetRouter = routers_[targetCoords[0]*(numChassisPerGroup_*numBladesPerChassis_)+targetCoords[1] *numBladesPerChassis_ +targetCoords[2]];
-  DragonflyRouter* currentRouter=myRouter;
+  DragonflyRouter* myRouter      = routers_[myCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) +
+                                       myCoords[1] * num_blades_per_chassis_ + myCoords[2]];
+  DragonflyRouter* targetRouter  = routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) +
+                                           targetCoords[1] * num_blades_per_chassis_ + targetCoords[2]];
+  DragonflyRouter* currentRouter = myRouter;
 
-  //node->router local link
-  route->link_list->push_back(myRouter->myNodes_[myCoords[3]*numLinksperLink_]);
+  // node->router local link
+  route->link_list.push_back(myRouter->my_nodes_[myCoords[3] * num_links_per_link_]);
   if (latency)
-    *latency += myRouter->myNodes_[myCoords[3] * numLinksperLink_]->latency();
+    *latency += myRouter->my_nodes_[myCoords[3] * num_links_per_link_]->get_latency();
 
-  if (hasLimiter_) {    // limiter for sender
-    std::pair<Link*, Link*> info = privateLinks_.at(src->id() * linkCountPerNode_ + hasLoopback_);
-    route->link_list->push_back(info.first);
+  if (has_limiter_) { // limiter for sender
+    std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos_with_loopback(src->id()));
+    route->link_list.push_back(info.first);
   }
 
-  if(targetRouter!=myRouter){
+  if (targetRouter != myRouter) {
 
-    //are we on a different group ?
-    if(targetRouter->group_ != currentRouter->group_){
-      //go to the router of our group connected to this one.
-      if(currentRouter->blade_!=targetCoords[0]){
-        //go to the nth router in our chassis
-        route->link_list->push_back(currentRouter->greenLinks_[targetCoords[0]]);
+    // are we on a different group ?
+    if (targetRouter->group_ != currentRouter->group_) {
+      // go to the router of our group connected to this one.
+      if (currentRouter->blade_ != targetCoords[0]) {
+        // go to the nth router in our chassis
+        route->link_list.push_back(currentRouter->green_links_[targetCoords[0]]);
         if (latency)
-          *latency += currentRouter->greenLinks_[targetCoords[0]]->latency();
-        currentRouter=routers_[myCoords[0]*(numChassisPerGroup_*numBladesPerChassis_)+myCoords[1] * numBladesPerChassis_+targetCoords[0]];
+          *latency += currentRouter->green_links_[targetCoords[0]]->get_latency();
+        currentRouter = routers_[myCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) +
+                                 myCoords[1] * num_blades_per_chassis_ + targetCoords[0]];
       }
 
-      if(currentRouter->chassis_!=0){
-        //go to the first chassis of our group
-        route->link_list->push_back(currentRouter->blackLinks_[0]);
+      if (currentRouter->chassis_ != 0) {
+        // go to the first chassis of our group
+        route->link_list.push_back(currentRouter->black_links_[0]);
         if (latency)
-          *latency += currentRouter->blackLinks_[0]->latency();
-        currentRouter=routers_[myCoords[0]*(numChassisPerGroup_*numBladesPerChassis_)+targetCoords[0]];
+          *latency += currentRouter->black_links_[0]->get_latency();
+        currentRouter = routers_[myCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + targetCoords[0]];
       }
 
-      //go to destination group - the only optical hop 
-      route->link_list->push_back(currentRouter->blueLinks_[0]);
+      // go to destination group - the only optical hop
+      route->link_list.push_back(currentRouter->blue_links_[0]);
       if (latency)
-        *latency += currentRouter->blueLinks_[0]->latency();
-      currentRouter=routers_[targetCoords[0]*(numChassisPerGroup_*numBladesPerChassis_)+myCoords[0]];
+        *latency += currentRouter->blue_links_[0]->get_latency();
+      currentRouter = routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + myCoords[0]];
     }
 
-    
-    //same group, but same blade ?
-    if(targetRouter->blade_ != currentRouter->blade_){
-      route->link_list->push_back(currentRouter->greenLinks_[targetCoords[2]]);
+    // same group, but same blade ?
+    if (targetRouter->blade_ != currentRouter->blade_) {
+      route->link_list.push_back(currentRouter->green_links_[targetCoords[2]]);
       if (latency)
-        *latency += currentRouter->greenLinks_[targetCoords[2]]->latency();
-      currentRouter=routers_[targetCoords[0]*(numChassisPerGroup_*numBladesPerChassis_)+targetCoords[2]];
+        *latency += currentRouter->green_links_[targetCoords[2]]->get_latency();
+      currentRouter = routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + targetCoords[2]];
     }
 
-    //same blade, but same chassis ?
-    if(targetRouter->chassis_ != currentRouter->chassis_){
-      route->link_list->push_back(currentRouter->blackLinks_[targetCoords[1]]);
+    // same blade, but same chassis ?
+    if (targetRouter->chassis_ != currentRouter->chassis_) {
+      route->link_list.push_back(currentRouter->black_links_[targetCoords[1]]);
       if (latency)
-        *latency += currentRouter->blackLinks_[targetCoords[1]]->latency();
-      currentRouter=routers_[targetCoords[0]*(numChassisPerGroup_*numBladesPerChassis_)+targetCoords[1]*numBladesPerChassis_+targetCoords[2]];
+        *latency += currentRouter->black_links_[targetCoords[1]]->get_latency();
     }
   }
 
-  if (hasLimiter_) {    // limiter for receiver
-    std::pair<Link*, Link*> info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_);
-    route->link_list->push_back(info.first);
+  if (has_limiter_) { // limiter for receiver
+    std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos_with_loopback(dst->id()));
+    route->link_list.push_back(info.first);
   }
 
-  //router->node local link
-  route->link_list->push_back(targetRouter->myNodes_[targetCoords[3]*numLinksperLink_+numLinksperLink_-1]);
+  // router->node local link
+  route->link_list.push_back(targetRouter->my_nodes_[targetCoords[3] * num_links_per_link_ + num_links_per_link_ - 1]);
   if (latency)
-    *latency += targetRouter->myNodes_[targetCoords[3] * numLinksperLink_ + numLinksperLink_ - 1]->latency();
-
-  xbt_free(myCoords);
-  xbt_free(targetCoords);
+    *latency += targetRouter->my_nodes_[targetCoords[3] * num_links_per_link_ + num_links_per_link_ - 1]->get_latency();
+}
+}
 }
-}}} // namespace
+} // namespace