X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3bcec4e865accfb7659d7431b5bc21121429b681..f01580e0ccb84c36906cb6be929b5c9b784c1cc1:/src/surf/surf_routing_cluster_fat_tree.cpp

diff --git a/src/surf/surf_routing_cluster_fat_tree.cpp b/src/surf/surf_routing_cluster_fat_tree.cpp
index 01bee9a1b4..e68b89c0da 100644
--- a/src/surf/surf_routing_cluster_fat_tree.cpp
+++ b/src/surf/surf_routing_cluster_fat_tree.cpp
@@ -1,4 +1,13 @@
-#include "surf_routing_cluster_fat_tree.hpp"
+#include <cstdlib>
+
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+#include <iostream>
+
+#include "src/surf/surf_routing_private.hpp"
+#include "src/surf/surf_routing_cluster_fat_tree.hpp"
 #include "xbt/lib.h"
 
 #include <boost/algorithm/string/split.hpp>
@@ -9,21 +18,21 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_fat_tree, surf, "Routing for fat trees");
 
-AS_t model_fat_tree_cluster_create(void)
-{
-  return new AsClusterFatTree();
-}
+namespace simgrid {
+namespace surf {
 
-AsClusterFatTree::AsClusterFatTree() : levels(0) {
+AsClusterFatTree::AsClusterFatTree(const char*name)
+  : AsCluster(name)
+{
   XBT_DEBUG("Creating a new fat tree.");
 }
 
 AsClusterFatTree::~AsClusterFatTree() {
-  for (unsigned int i = 0 ; i < this->nodes.size() ; i++) {
-    delete this->nodes[i];
+  for (unsigned int i = 0 ; i < this->nodes_.size() ; i++) {
+    delete this->nodes_[i];
   }
-  for (unsigned int i = 0 ; i < this->links.size() ; i++) {
-    delete this->links[i];
+  for (unsigned int i = 0 ; i < this->links_.size() ; i++) {
+    delete this->links_[i];
   }
 }
 
@@ -39,7 +48,7 @@ bool AsClusterFatTree::isInSubTree(FatTreeNode *root, FatTreeNode *node) {
     }
   }
   
-  for (unsigned int i = root->level ; i < this->levels ; i++) {
+  for (unsigned int i = root->level ; i < this->levels_ ; i++) {
     if(root->label[i] != node->label[i]) {
       return false;
     }
@@ -47,8 +56,8 @@ bool AsClusterFatTree::isInSubTree(FatTreeNode *root, FatTreeNode *node) {
   return true;
 }
 
-void AsClusterFatTree::getRouteAndLatency(RoutingEdgePtr src,
-                                          RoutingEdgePtr dst,
+void AsClusterFatTree::getRouteAndLatency(NetCard *src,
+                                          NetCard *dst,
                                           sg_platf_route_cbarg_t into,
                                           double *latency) {
   FatTreeNode *source, *destination, *currentNode;
@@ -58,29 +67,29 @@ void AsClusterFatTree::getRouteAndLatency(RoutingEdgePtr src,
 if (dst->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType() == SURF_NETWORK_ELEMENT_ROUTER) return;
 
   /* Let's find the source and the destination in our internal structure */
-  tempIter = this->computeNodes.find(src->getId());
+  tempIter = this->computeNodes_.find(src->id());
 
   // xbt_die -> assert
-  if (tempIter == this->computeNodes.end()) {
-    xbt_die("Could not find the source %s [%d] in the fat tree", src->getName(),
-            src->getId());
+  if (tempIter == this->computeNodes_.end()) {
+    xbt_die("Could not find the source %s [%d] in the fat tree", src->name(),
+            src->id());
   }
   source = tempIter->second;
-  tempIter = this->computeNodes.find(dst->getId());
-  if (tempIter == this->computeNodes.end()) {
+  tempIter = this->computeNodes_.find(dst->id());
+  if (tempIter == this->computeNodes_.end()) {
     xbt_die("Could not find the destination %s [%d] in the fat tree",
-            dst->getName(), dst->getId());
+            dst->name(), dst->id());
   }
 
 
   destination = tempIter->second;
   
   XBT_VERB("Get route and latency from '%s' [%d] to '%s' [%d] in a fat tree",
-            src->getName(), src->getId(), dst->getName(), dst->getId());
+            src->name(), src->id(), dst->name(), dst->id());
 
   /* In case destination is the source, and there is a loopback, let's get
      through it instead of going up to a switch*/
-  if(source->id == destination->id && this->p_has_loopback) {
+  if(source->id == destination->id && this->has_loopback_) {
     xbt_dynar_push_as(into->link_list, void*, source->loopback);
     if(latency) {
       *latency += source->loopback->getLatency();
@@ -96,9 +105,9 @@ if (dst->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType() == SURF_
     d = destination->position;
 
     for (unsigned int i = 0 ; i < currentNode->level ; i++) {
-      d /= this->upperLevelNodesNumber[i];
+      d /= this->upperLevelNodesNumber_[i];
     }
-    k = this->upperLevelNodesNumber[currentNode->level];
+    k = this->upperLevelNodesNumber_[currentNode->level];
     d = d % k;
     xbt_dynar_push_as(into->link_list, void*,currentNode->parents[d]->upLink);
 
@@ -106,7 +115,7 @@ if (dst->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType() == SURF_
       *latency += currentNode->parents[d]->upLink->getLatency();
     }
 
-    if (this->p_has_limiter) {
+    if (this->has_limiter_) {
       xbt_dynar_push_as(into->link_list, void*,currentNode->limiterLink);
     }
     currentNode = currentNode->parents[d]->upNode;
@@ -119,14 +128,14 @@ if (dst->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType() == SURF_
   // Down part
   while(currentNode != destination) {
     for(unsigned int i = 0 ; i < currentNode->children.size() ; i++) {
-      if(i % this->lowerLevelNodesNumber[currentNode->level - 1] ==
+      if(i % this->lowerLevelNodesNumber_[currentNode->level - 1] ==
          destination->label[currentNode->level - 1]) {
         xbt_dynar_push_as(into->link_list, void*,currentNode->children[i]->downLink);
         if(latency) {
           *latency += currentNode->children[i]->downLink->getLatency();
         }
         currentNode = currentNode->children[i]->downNode;
-        if (this->p_has_limiter) {
+        if (this->has_limiter_) {
           xbt_dynar_push_as(into->link_list, void*,currentNode->limiterLink);
         }
         XBT_DEBUG("%d(%u,%u) is accessible through %d(%u,%u)", destination->id,
@@ -141,7 +150,7 @@ if (dst->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType() == SURF_
  * addNodes() have already been called
  */
 void AsClusterFatTree::create_links(){
-  if(this->levels == 0) {
+  if(this->levels_ == 0) {
     return;
   }
   this->generateSwitches();
@@ -150,18 +159,18 @@ void AsClusterFatTree::create_links(){
   if(XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) {
     std::stringstream msgBuffer;
 
-    msgBuffer << "We are creating a fat tree of " << this->levels << " levels "
-              << "with " << this->nodesByLevel[0] << " processing nodes";
-    for (unsigned int i = 1 ; i <= this->levels ; i++) {
-      msgBuffer << ", " << this->nodesByLevel[i] << " switches at level " << i;
+    msgBuffer << "We are creating a fat tree of " << this->levels_ << " levels "
+              << "with " << this->nodesByLevel_[0] << " processing nodes";
+    for (unsigned int i = 1 ; i <= this->levels_ ; i++) {
+      msgBuffer << ", " << this->nodesByLevel_[i] << " switches at level " << i;
     }
     XBT_DEBUG("%s", msgBuffer.str().c_str());
     msgBuffer.str("");
     msgBuffer << "Nodes are : ";
 
-    for (unsigned int i = 0 ;  i < this->nodes.size() ; i++) {
-      msgBuffer << this->nodes[i]->id << "(" << this->nodes[i]->level << ","
-                << this->nodes[i]->position << ") ";
+    for (unsigned int i = 0 ;  i < this->nodes_.size() ; i++) {
+      msgBuffer << this->nodes_[i]->id << "(" << this->nodes_[i]->level << ","
+                << this->nodes_[i]->position << ") ";
     }
     XBT_DEBUG("%s", msgBuffer.str().c_str());
   }
@@ -171,9 +180,9 @@ void AsClusterFatTree::create_links(){
 
   unsigned int k = 0;
   // Nodes are totally ordered, by level and then by position, in this->nodes
-  for (unsigned int i = 0 ; i < this->levels ; i++) {
-    for (unsigned int j = 0 ; j < this->nodesByLevel[i] ; j++) {
-        this->connectNodeToParents(this->nodes[k]);
+  for (unsigned int i = 0 ; i < this->levels_ ; i++) {
+    for (unsigned int j = 0 ; j < this->nodesByLevel_[i] ; j++) {
+        this->connectNodeToParents(this->nodes_[k]);
         k++;
     }
   }
@@ -181,9 +190,9 @@ void AsClusterFatTree::create_links(){
   if(XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) {
     std::stringstream msgBuffer;
     msgBuffer << "Links are : ";
-    for (unsigned int i = 0 ; i < this->links.size() ; i++) {
-      msgBuffer << "(" << this->links[i]->upNode->id << ","
-                << this->links[i]->downNode->id << ") ";
+    for (unsigned int i = 0 ; i < this->links_.size() ; i++) {
+      msgBuffer << "(" << this->links_[i]->upNode->id << ","
+                << this->links_[i]->downNode->id << ") ";
     }
     XBT_DEBUG("%s", msgBuffer.str().c_str());
   }
@@ -192,23 +201,23 @@ void AsClusterFatTree::create_links(){
 }
 
 int AsClusterFatTree::connectNodeToParents(FatTreeNode *node) {
-  std::vector<FatTreeNode*>::iterator currentParentNode = this->nodes.begin();
+  std::vector<FatTreeNode*>::iterator currentParentNode = this->nodes_.begin();
   int connectionsNumber = 0;
   const int level = node->level;
   XBT_DEBUG("We are connecting node %d(%u,%u) to his parents.",
             node->id, node->level, node->position);
   currentParentNode += this->getLevelPosition(level + 1);
-  for (unsigned int i = 0 ; i < this->nodesByLevel[level + 1] ; i++ ) {
+  for (unsigned int i = 0 ; i < this->nodesByLevel_[level + 1] ; i++ ) {
     if(this->areRelated(*currentParentNode, node)) {
       XBT_DEBUG("%d(%u,%u) and %d(%u,%u) are related,"
                 " with %u links between them.", node->id,
                 node->level, node->position, (*currentParentNode)->id,
-                (*currentParentNode)->level, (*currentParentNode)->position, this->lowerLevelPortsNumber[level]);
-      for (unsigned int j = 0 ; j < this->lowerLevelPortsNumber[level] ; j++) {
+                (*currentParentNode)->level, (*currentParentNode)->position, this->lowerLevelPortsNumber_[level]);
+      for (unsigned int j = 0 ; j < this->lowerLevelPortsNumber_[level] ; j++) {
       this->addLink(*currentParentNode, node->label[level] +
-                    j * this->lowerLevelNodesNumber[level], node,
+                    j * this->lowerLevelNodesNumber_[level], node,
                     (*currentParentNode)->label[level] +
-                    j * this->upperLevelNodesNumber[level]);
+                    j * this->upperLevelNodesNumber_[level]);
       }
       connectionsNumber++;
     }
@@ -225,14 +234,14 @@ bool AsClusterFatTree::areRelated(FatTreeNode *parent, FatTreeNode *child) {
     msgBuffer << "Are " << child->id << "(" << child->level << ","
               << child->position << ") <";
 
-    for (unsigned int i = 0 ; i < this->levels ; i++) {
+    for (unsigned int i = 0 ; i < this->levels_ ; i++) {
       msgBuffer << child->label[i] << ",";
     }
     msgBuffer << ">";
     
     msgBuffer << " and " << parent->id << "(" << parent->level
               << "," << parent->position << ") <";
-    for (unsigned int i = 0 ; i < this->levels ; i++) {
+    for (unsigned int i = 0 ; i < this->levels_ ; i++) {
       msgBuffer << parent->label[i] << ",";
     }
     msgBuffer << ">";
@@ -244,7 +253,7 @@ bool AsClusterFatTree::areRelated(FatTreeNode *parent, FatTreeNode *child) {
     return false;
   }
   
-  for (unsigned int i = 0 ; i < this->levels; i++) {
+  for (unsigned int i = 0 ; i < this->levels_; i++) {
     if (parent->label[i] != child->label[i] && i + 1 != parent->level) {
       return false;
     }
@@ -254,56 +263,50 @@ bool AsClusterFatTree::areRelated(FatTreeNode *parent, FatTreeNode *child) {
 
 void AsClusterFatTree::generateSwitches() {
   XBT_DEBUG("Generating switches.");
-  this->nodesByLevel.resize(this->levels + 1, 0);
+  this->nodesByLevel_.resize(this->levels_ + 1, 0);
   unsigned int nodesRequired = 0;
 
-  // We take care of the number of nodes by level
-  this->nodesByLevel[0] = 1;
-  for (unsigned int i = 0 ; i < this->levels ; i++) {
-    this->nodesByLevel[0] *= this->lowerLevelNodesNumber[i];
-  }
-
+  // Take care of the number of nodes by level
+  this->nodesByLevel_[0] = 1;
+  for (unsigned int i = 0 ; i < this->levels_ ; i++)
+    this->nodesByLevel_[0] *= this->lowerLevelNodesNumber_[i];
      
-  if(this->nodesByLevel[0] != this->nodes.size()) {
+  if(this->nodesByLevel_[0] != this->nodes_.size()) {
     surf_parse_error("The number of provided nodes does not fit with the wanted topology."
                      " Please check your platform description (We need %d nodes, we got %zu)",
-                     this->nodesByLevel[0], this->nodes.size());
+                     this->nodesByLevel_[0], this->nodes_.size());
     return;
   }
 
   
-  for (unsigned int i = 0 ; i < this->levels ; i++) {
+  for (unsigned int i = 0 ; i < this->levels_ ; i++) {
     int nodesInThisLevel = 1;
       
-    for (unsigned int j = 0 ;  j <= i ; j++) {
-      nodesInThisLevel *= this->upperLevelNodesNumber[j];
-    }
+    for (unsigned int j = 0 ;  j <= i ; j++)
+      nodesInThisLevel *= this->upperLevelNodesNumber_[j];
       
-    for (unsigned int j = i+1 ; j < this->levels ; j++) {
-      nodesInThisLevel *= this->lowerLevelNodesNumber[j];
-    }
+    for (unsigned int j = i+1 ; j < this->levels_ ; j++)
+      nodesInThisLevel *= this->lowerLevelNodesNumber_[j];
 
-    this->nodesByLevel[i+1] = nodesInThisLevel;
+    this->nodesByLevel_[i+1] = nodesInThisLevel;
     nodesRequired += nodesInThisLevel;
   }
 
 
-  // We create the switches
+  // Create the switches
   int k = 0;
-  for (unsigned int i = 0 ; i < this->levels ; i++) {
-    for (unsigned int j = 0 ; j < this->nodesByLevel[i + 1] ; j++) {
-      FatTreeNode* newNode;
-      newNode = new FatTreeNode(this->cluster, --k, i + 1, j);
-      XBT_DEBUG("We create the switch %d(%d,%d)", newNode->id, newNode->level,
-                newNode->position);
-      newNode->children.resize(this->lowerLevelNodesNumber[i] *
-                               this->lowerLevelPortsNumber[i]);
-      if (i != this->levels - 1) {
-        newNode->parents.resize(this->upperLevelNodesNumber[i + 1] *
-                                this->lowerLevelPortsNumber[i + 1]);
+  for (unsigned int i = 0 ; i < this->levels_ ; i++) {
+    for (unsigned int j = 0 ; j < this->nodesByLevel_[i + 1] ; j++) {
+      FatTreeNode* newNode = new FatTreeNode(this->cluster_, --k, i + 1, j);
+      XBT_DEBUG("We create the switch %d(%d,%d)", newNode->id, newNode->level, newNode->position);
+      newNode->children.resize(this->lowerLevelNodesNumber_[i] *
+                               this->lowerLevelPortsNumber_[i]);
+      if (i != this->levels_ - 1) {
+        newNode->parents.resize(this->upperLevelNodesNumber_[i + 1] *
+                                this->lowerLevelPortsNumber_[i + 1]);
       }
-      newNode->label.resize(this->levels);
-      this->nodes.push_back(newNode);
+      newNode->label.resize(this->levels_);
+      this->nodes_.push_back(newNode);
     }
   }
 }
@@ -311,53 +314,45 @@ void AsClusterFatTree::generateSwitches() {
 void AsClusterFatTree::generateLabels() {
   XBT_DEBUG("Generating labels.");
   // TODO : check if nodesByLevel and nodes are filled
-  std::vector<int> maxLabel(this->levels);
-  std::vector<int> currentLabel(this->levels);
+  std::vector<int> maxLabel(this->levels_);
+  std::vector<int> currentLabel(this->levels_);
   unsigned int k = 0;
-  for (unsigned int i = 0 ; i <= this->levels ; i++) {
-    currentLabel.assign(this->levels, 0);
-    for (unsigned int j = 0 ; j < this->levels ; j++) {
+  for (unsigned int i = 0 ; i <= this->levels_ ; i++) {
+    currentLabel.assign(this->levels_, 0);
+    for (unsigned int j = 0 ; j < this->levels_ ; j++) {
       maxLabel[j] = j + 1 > i ?
-        this->lowerLevelNodesNumber[j] : this->upperLevelNodesNumber[j];
+        this->lowerLevelNodesNumber_[j] : this->upperLevelNodesNumber_[j];
     }
     
-    for (unsigned int j = 0 ; j < this->nodesByLevel[i] ; j++) {
+    for (unsigned int j = 0 ; j < this->nodesByLevel_[i] ; j++) {
 
       if(XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug )) {
         std::stringstream msgBuffer;
 
         msgBuffer << "Assigning label <";
-        for (unsigned int l = 0 ; l < this->levels ; l++) {
+        for (unsigned int l = 0 ; l < this->levels_ ; l++) {
           msgBuffer << currentLabel[l] << ",";
         }
         msgBuffer << "> to " << k << " (" << i << "," << j <<")";
         
         XBT_DEBUG("%s", msgBuffer.str().c_str());
       }
-      this->nodes[k]->label.assign(currentLabel.begin(), currentLabel.end());
+      this->nodes_[k]->label.assign(currentLabel.begin(), currentLabel.end());
 
       bool remainder = true;
-      
       unsigned int pos = 0;
-      do {
-        std::stringstream msgBuffer;
-
+      while (remainder && pos < this->levels_) {
         ++currentLabel[pos];
         if (currentLabel[pos] >= maxLabel[pos]) {
           currentLabel[pos] = 0;
           remainder = true;
+          ++pos;
         }
         else {
-          remainder = false;
-        }
-        if (!remainder) {
           pos = 0;
-        }
-        else {
-          ++pos;
+          remainder = false;
         }
       }
-      while(remainder && pos < this->levels);
       k++;
     }
   }
@@ -365,128 +360,108 @@ void AsClusterFatTree::generateLabels() {
 
 
 int AsClusterFatTree::getLevelPosition(const unsigned  int level) {
-  if (level > this->levels) {
-    // Well, that should never happen. Maybe should we throw instead.
-    return -1;
-  }
+  xbt_assert(level <= this->levels_, "The impossible did happen. Yet again.");
   int tempPosition = 0;
 
-  for (unsigned int i = 0 ; i < level ; i++) {
-    tempPosition += this->nodesByLevel[i];
-  }
- return tempPosition;
+  for (unsigned int i = 0 ; i < level ; i++)
+    tempPosition += this->nodesByLevel_[i];
+
+  return tempPosition;
 }
 
 void AsClusterFatTree::addProcessingNode(int id) {
   using std::make_pair;
   static int position = 0;
   FatTreeNode* newNode;
-  newNode = new FatTreeNode(this->cluster, id, 0, position++);
-  newNode->parents.resize(this->upperLevelNodesNumber[0] *
-                          this->lowerLevelPortsNumber[0]);
-  newNode->label.resize(this->levels);
-  this->computeNodes.insert(make_pair(id,newNode));
-  this->nodes.push_back(newNode);
+  newNode = new FatTreeNode(this->cluster_, id, 0, position++);
+  newNode->parents.resize(this->upperLevelNodesNumber_[0] *
+                          this->lowerLevelPortsNumber_[0]);
+  newNode->label.resize(this->levels_);
+  this->computeNodes_.insert(make_pair(id,newNode));
+  this->nodes_.push_back(newNode);
 }
 
 void AsClusterFatTree::addLink(FatTreeNode *parent, unsigned int parentPort,
                                FatTreeNode *child, unsigned int childPort) {
   FatTreeLink *newLink;
-  newLink = new FatTreeLink(this->cluster, child, parent);
-  XBT_DEBUG("Creating a link between the parent (%d,%d,%u)"
-            " and the child (%d,%d,%u)", parent->level, parent->position,
-            parentPort, child->level, child->position, childPort);
+  newLink = new FatTreeLink(this->cluster_, child, parent);
+  XBT_DEBUG("Creating a link between the parent (%d,%d,%u) and the child (%d,%d,%u)",
+      parent->level, parent->position, parentPort, child->level, child->position, childPort);
   parent->children[parentPort] = newLink;
   child->parents[childPort] = newLink;
 
-  this->links.push_back(newLink);
-
-  
-
+  this->links_.push_back(newLink);
 }
 
-void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t 
-                                                cluster) {
-  std::vector<string> parameters;
-  std::vector<string> tmp;
+void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t 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){
-    surf_parse_error("Fat trees are defined by the levels number and 3 vectors" 
-                     ", see the documentation for more informations");
+    surf_parse_error("Fat trees are defined by the levels number and 3 vectors, see the documentation for more informations");
   }
 
   // The first parts of topo_parameters should be the levels number
-  this->levels = std::atoi(parameters[0].c_str()); // stoi() only in C++11...
+  this->levels_ = xbt_str_parse_int(parameters[0].c_str(), "First parameter is not the amount of levels: %s");
   
   // Then, a l-sized vector standing for the childs number by level
   boost::split(tmp, parameters[1], boost::is_any_of(","));
-  if(tmp.size() != this->levels) {
+  if(tmp.size() != this->levels_) {
     surf_parse_error("Fat trees are defined by the levels number and 3 vectors" 
                      ", see the documentation for more informations"); 
   }
   for(size_t i = 0 ; i < tmp.size() ; i++){
-    this->lowerLevelNodesNumber.push_back(std::atoi(tmp[i].c_str())); 
+    this->lowerLevelNodesNumber_.push_back(xbt_str_parse_int(tmp[i].c_str(), "Invalid lower level node number: %s"));
   }
   
   // Then, a l-sized vector standing for the parents number by level
   boost::split(tmp, parameters[2], boost::is_any_of(","));
-  if(tmp.size() != this->levels) {
+  if(tmp.size() != this->levels_) {
     surf_parse_error("Fat trees are defined by the levels number and 3 vectors" 
                      ", see the documentation for more informations"); 
   }
   for(size_t i = 0 ; i < tmp.size() ; i++){
-    this->upperLevelNodesNumber.push_back(std::atoi(tmp[i].c_str())); 
+    this->upperLevelNodesNumber_.push_back(xbt_str_parse_int(tmp[i].c_str(), "Invalid upper level node number: %s"));
   }
   
   // Finally, a l-sized vector standing for the ports number with the lower level
   boost::split(tmp, parameters[3], boost::is_any_of(","));
-  if(tmp.size() != this->levels) {
+  if(tmp.size() != this->levels_) {
     surf_parse_error("Fat trees are defined by the levels number and 3 vectors" 
                      ", see the documentation for more informations"); 
     
   }
   for(size_t i = 0 ; i < tmp.size() ; i++){
-    this->lowerLevelPortsNumber.push_back(std::atoi(tmp[i].c_str())); 
+    this->lowerLevelPortsNumber_.push_back(xbt_str_parse_int(tmp[i].c_str(), "Invalid lower level node number: %s"));
   }
-  this->cluster = cluster;
+  this->cluster_ = cluster;
 }
 
 
-void AsClusterFatTree::generateDotFile(const string& filename) const {
-  ofstream file;
-  /* Maybe should we get directly a char*, as open takes strings only beginning
-   * with C++11...
-   */
-  file.open(filename.c_str(), ios::out | ios::trunc); 
-  
-  if(file.is_open()) {
-    file << "graph AsClusterFatTree {\n";
-    for (unsigned int i = 0 ; i < this->nodes.size() ; i++) {
-      file << this->nodes[i]->id;
-      if(this->nodes[i]->id < 0) {
-        file << " [shape=circle];\n";
-      }
-      else {
-        file << " [shape=hexagon];\n";
-      }
-    }
+void AsClusterFatTree::generateDotFile(const std::string& filename) const {
+  std::ofstream file;
+  file.open(filename, std::ios::out | std::ios::trunc);
+  xbt_assert(file.is_open(), "Unable to open file %s", filename.c_str());
 
-    for (unsigned int i = 0 ; i < this->links.size() ; i++ ) {
-      file << this->links[i]->downNode->id
-             << " -- "
-           << this->links[i]->upNode->id
-             << ";\n";
-    }
-    file << "}";
-    file.close();
+  file << "graph AsClusterFatTree {\n";
+  for (unsigned int i = 0 ; i < this->nodes_.size() ; i++) {
+    file << this->nodes_[i]->id;
+    if(this->nodes_[i]->id < 0)
+      file << " [shape=circle];\n";
+    else
+      file << " [shape=hexagon];\n";
   }
-  else {
-    XBT_DEBUG("Unable to open file %s", filename.c_str());
-    return;
+
+  for (unsigned int i = 0 ; i < this->links_.size() ; i++ ) {
+    file << this->links_[i]->downNode->id
+        << " -- "
+        << this->links_[i]->upNode->id
+        << ";\n";
   }
+  file << "}";
+  file.close();
 }
 
 FatTreeNode::FatTreeNode(sg_platf_cluster_cbarg_t cluster, int id, int level,
@@ -497,26 +472,22 @@ FatTreeNode::FatTreeNode(sg_platf_cluster_cbarg_t cluster, int id, int level,
     memset(&linkTemplate, 0, sizeof(linkTemplate));
     linkTemplate.bandwidth = cluster->limiter_link;
     linkTemplate.latency = 0;
-    linkTemplate.state = SURF_RESOURCE_ON;
+    linkTemplate.initiallyOn = 1;
     linkTemplate.policy = SURF_LINK_SHARED;
     linkTemplate.id = bprintf("limiter_%d", id);
     sg_platf_new_link(&linkTemplate);
-    this->limiterLink = (NetworkLink*) xbt_lib_get_or_null(link_lib,
-                                                           linkTemplate.id,
-                                                           SURF_LINK_LEVEL);
+    this->limiterLink = Link::byName(linkTemplate.id);
     free((void*)linkTemplate.id);
   }
   if(cluster->loopback_bw || cluster->loopback_lat) {
     memset(&linkTemplate, 0, sizeof(linkTemplate));
     linkTemplate.bandwidth = cluster->loopback_bw;
     linkTemplate.latency = cluster->loopback_lat;
-    linkTemplate.state = SURF_RESOURCE_ON;
+    linkTemplate.initiallyOn = 1;
     linkTemplate.policy = SURF_LINK_FATPIPE;
     linkTemplate.id = bprintf("loopback_%d", id);
     sg_platf_new_link(&linkTemplate);
-    this->loopback = (NetworkLink*) xbt_lib_get_or_null(link_lib,
-                                                        linkTemplate.id,
-                                                        SURF_LINK_LEVEL);
+    this->loopback = Link::byName(linkTemplate.id);
     free((void*)linkTemplate.id);
   }  
 }
@@ -530,29 +501,29 @@ FatTreeLink::FatTreeLink(sg_platf_cluster_cbarg_t cluster,
   memset(&linkTemplate, 0, sizeof(linkTemplate));
   linkTemplate.bandwidth = cluster->bw;
   linkTemplate.latency = cluster->lat;
-  linkTemplate.state = SURF_RESOURCE_ON;
+  linkTemplate.initiallyOn = 1;
   linkTemplate.policy = cluster->sharing_policy; // sthg to do with that ?
   linkTemplate.id = bprintf("link_from_%d_to_%d_%d", downNode->id, upNode->id,
                             uniqueId);
   sg_platf_new_link(&linkTemplate);
-  NetworkLink* link;
+  Link* link;
   std::string tmpID;
   if (cluster->sharing_policy == SURF_LINK_FULLDUPLEX) {
     tmpID = std::string(linkTemplate.id) + "_UP";
-    link = (NetworkLink*) xbt_lib_get_or_null(link_lib, tmpID.c_str(),
-                                              SURF_LINK_LEVEL);
+    link =  Link::byName(tmpID.c_str());
     this->upLink = link; // check link?
     tmpID = std::string(linkTemplate.id) + "_DOWN";
-    link = (NetworkLink*) xbt_lib_get_or_null(link_lib, tmpID.c_str(),
-                                              SURF_LINK_LEVEL);
+    link = Link::byName(tmpID.c_str());
     this->downLink = link; // check link ?
   }
   else {
-    link = (NetworkLink*) xbt_lib_get_or_null(link_lib, linkTemplate.id,
-                                              SURF_LINK_LEVEL);
+    link = Link::byName(linkTemplate.id);
     this->upLink = link;
     this->downLink = link;
   }
   uniqueId++;
   free((void*)linkTemplate.id);
 }
+
+}
+}