even more cleanups in the routing

diff --git a/src/surf/surf_routing_cluster_fat_tree.cpp b/src/surf/surf_routing_cluster_fat_tree.cpp
index b4667dd..e68b89c 100644 (file)
--- a/src/surf/surf_routing_cluster_fat_tree.cpp
+++ b/src/surf/surf_routing_cluster_fat_tree.cpp
@@ -266,12 +266,10 @@ void AsClusterFatTree::generateSwitches() {
   this->nodesByLevel_.resize(this->levels_ + 1, 0);
   unsigned int nodesRequired = 0;
 
   this->nodesByLevel_.resize(this->levels_ + 1, 0);
   unsigned int nodesRequired = 0;
 

-  // We take care of the number of nodes by level
+  // Take care of the number of nodes by level

   this->nodesByLevel_[0] = 1;
   this->nodesByLevel_[0] = 1;

-  for (unsigned int i = 0 ; i < this->levels_ ; i++) {
+  for (unsigned int i = 0 ; i < this->levels_ ; i++)

     this->nodesByLevel_[0] *= this->lowerLevelNodesNumber_[i];
     this->nodesByLevel_[0] *= this->lowerLevelNodesNumber_[i];

-  }
-

      
   if(this->nodesByLevel_[0] != this->nodes_.size()) {
     surf_parse_error("The number of provided nodes does not fit with the wanted topology."
      
   if(this->nodesByLevel_[0] != this->nodes_.size()) {
     surf_parse_error("The number of provided nodes does not fit with the wanted topology."


@@ -284,27 +282,23 @@ void AsClusterFatTree::generateSwitches() {
   for (unsigned int i = 0 ; i < this->levels_ ; i++) {
     int nodesInThisLevel = 1;
       
   for (unsigned int i = 0 ; i < this->levels_ ; i++) {
     int nodesInThisLevel = 1;
       

-    for (unsigned int j = 0 ;  j <= i ; j++) {
+    for (unsigned int j = 0 ;  j <= i ; j++)

       nodesInThisLevel *= this->upperLevelNodesNumber_[j];
       nodesInThisLevel *= this->upperLevelNodesNumber_[j];

-    }

       
       

-    for (unsigned int j = i+1 ; j < this->levels_ ; j++) {
+    for (unsigned int j = i+1 ; j < this->levels_ ; j++)

       nodesInThisLevel *= this->lowerLevelNodesNumber_[j];
       nodesInThisLevel *= this->lowerLevelNodesNumber_[j];

-    }

 
     this->nodesByLevel_[i+1] = nodesInThisLevel;
     nodesRequired += 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++) {
   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);
+      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->children.resize(this->lowerLevelNodesNumber_[i] *
                                this->lowerLevelPortsNumber_[i]);
       if (i != this->levels_ - 1) {


@@ -346,27 +340,19 @@ void AsClusterFatTree::generateLabels() {
       this->nodes_[k]->label.assign(currentLabel.begin(), currentLabel.end());
 
       bool remainder = true;
       this->nodes_[k]->label.assign(currentLabel.begin(), currentLabel.end());
 
       bool remainder = true;

-      

       unsigned int pos = 0;
       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;
         ++currentLabel[pos];
         if (currentLabel[pos] >= maxLabel[pos]) {
           currentLabel[pos] = 0;
           remainder = true;

+          ++pos;

         }
         else {
         }
         else {

-          remainder = false;
-        }
-        if (!remainder) {

           pos = 0;
           pos = 0;

-        }
-        else {
-          ++pos;
+          remainder = false;

         }
       }
         }
       }

-      while(remainder && pos < this->levels_);

       k++;
     }
   }
       k++;
     }
   }


@@ -374,16 +360,13 @@ void AsClusterFatTree::generateLabels() {
 
 
 int AsClusterFatTree::getLevelPosition(const unsigned  int level) {
 
 
 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;
 
   int tempPosition = 0;
 

-  for (unsigned int i = 0 ; i < level ; i++) {
+  for (unsigned int i = 0 ; i < level ; i++)

     tempPosition += this->nodesByLevel_[i];
     tempPosition += this->nodesByLevel_[i];

-  }
- return tempPosition;
+
+  return tempPosition;

 }
 
 void AsClusterFatTree::addProcessingNode(int id) {
 }
 
 void AsClusterFatTree::addProcessingNode(int id) {


@@ -402,29 +385,22 @@ void AsClusterFatTree::addLink(FatTreeNode *parent, unsigned int parentPort,
                                FatTreeNode *child, unsigned int childPort) {
   FatTreeLink *newLink;
   newLink = new FatTreeLink(this->cluster_, child, parent);
                                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);
+  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);
   parent->children[parentPort] = newLink;
   child->parents[childPort] = newLink;
 
   this->links_.push_back(newLink);

-
-  
-

 }
 
 }
 

-void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t 
-                                                cluster) {
+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(";"));
   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){
 
   // 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
   }
 
   // The first parts of topo_parameters should be the levels number


@@ -466,36 +442,26 @@ void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t
 
 void AsClusterFatTree::generateDotFile(const std::string& filename) const {
   std::ofstream file;
 
 void AsClusterFatTree::generateDotFile(const std::string& filename) const {
   std::ofstream file;

-  /* Maybe should we get directly a char*, as open takes strings only beginning
-   * with C++11...
-   */
-  file.open(filename.c_str(), std::ios::out | std::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";
-      }
-    }
+  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,
 }
 
 FatTreeNode::FatTreeNode(sg_platf_cluster_cbarg_t cluster, int id, int level,

diff --git a/src/surf/surf_routing_cluster_torus.cpp b/src/surf/surf_routing_cluster_torus.cpp
index 6f6c6bc..83151df 100644 (file)
--- a/src/surf/surf_routing_cluster_torus.cpp
+++ b/src/surf/surf_routing_cluster_torus.cpp
@@ -31,7 +31,7 @@ namespace simgrid {
       : AsCluster(name) {
     }
     AsClusterTorus::~AsClusterTorus() {
       : AsCluster(name) {
     }
     AsClusterTorus::~AsClusterTorus() {

-      xbt_dynar_free(&p_dimensions_);
+      xbt_dynar_free(&dimensions_);

     }
 
     void AsClusterTorus::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position) {
     }
 
     void AsClusterTorus::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position) {


@@ -47,10 +47,10 @@ namespace simgrid {
           // we need to iterate over all dimensions
           // and create all links there
           dim_product = 1;      // Needed to calculate the next neighbour_id
           // we need to iterate over all dimensions
           // and create all links there
           dim_product = 1;      // Needed to calculate the next neighbour_id

-      for (j = 0; j < xbt_dynar_length(p_dimensions_); j++) {
+      for (j = 0; j < xbt_dynar_length(dimensions_); j++) {

 
         memset(&link, 0, sizeof(link));
 
         memset(&link, 0, sizeof(link));

-        current_dimension = xbt_dynar_get_as(p_dimensions_, j, int);
+        current_dimension = xbt_dynar_get_as(dimensions_, j, int);

         neighbour_rank_id =
             (((int) rank / dim_product) % current_dimension ==
                 current_dimension - 1) ? rank - (current_dimension - 1) * dim_product : rank + dim_product;
         neighbour_rank_id =
             (((int) rank / dim_product) % current_dimension ==
                 current_dimension - 1) ? rank - (current_dimension - 1) * dim_product : rank + dim_product;


@@ -93,7 +93,7 @@ namespace simgrid {
       xbt_dynar_t dimensions = xbt_str_split(cluster->topo_parameters, ",");
 
       if (!xbt_dynar_is_empty(dimensions)) {
       xbt_dynar_t dimensions = xbt_str_split(cluster->topo_parameters, ",");
 
       if (!xbt_dynar_is_empty(dimensions)) {

-        p_dimensions_ = xbt_dynar_new(sizeof(int), NULL);
+        dimensions_ = xbt_dynar_new(sizeof(int), NULL);

         /**
          * We are in a torus cluster
          * Parse attribute dimensions="dim1,dim2,dim3,...,dimN"
         /**
          * We are in a torus cluster
          * Parse attribute dimensions="dim1,dim2,dim3,...,dimN"


@@ -102,10 +102,10 @@ namespace simgrid {
          */
         xbt_dynar_foreach(dimensions, iter, groups) {
           int tmp = surf_parse_get_int(xbt_dynar_get_as(dimensions, iter, char *));
          */
         xbt_dynar_foreach(dimensions, iter, groups) {
           int tmp = surf_parse_get_int(xbt_dynar_get_as(dimensions, iter, char *));

-          xbt_dynar_set_as(p_dimensions_, iter, int, tmp);
+          xbt_dynar_set_as(dimensions_, iter, int, tmp);

         }
 
         }
 

-        nb_links_per_node_ = xbt_dynar_length(p_dimensions_);
+        nb_links_per_node_ = xbt_dynar_length(dimensions_);

 
       }
       xbt_dynar_free(&dimensions);
 
       }
       xbt_dynar_free(&dimensions);


@@ -144,8 +144,8 @@ namespace simgrid {
        * into this dimension or not.
        */
       unsigned int *myCoords, *targetCoords;
        * into this dimension or not.
        */
       unsigned int *myCoords, *targetCoords;

-      myCoords = rankId_to_coords(src->id(), p_dimensions_);
-      targetCoords = rankId_to_coords(dst->id(), p_dimensions_);
+      myCoords = rankId_to_coords(src->id(), dimensions_);
+      targetCoords = rankId_to_coords(dst->id(), dimensions_);

       /**
        * linkOffset describes the offset where the link
        * we want to use is stored
       /**
        * linkOffset describes the offset where the link
        * we want to use is stored


@@ -153,15 +153,15 @@ namespace simgrid {
        * which can only be the case if src->m_id == dst->m_id -- see above
        * for this special case)
        */
        * which can only be the case if src->m_id == dst->m_id -- see above
        * for this special case)
        */

-      int nodeOffset = (xbt_dynar_length(p_dimensions_) + 1) * src->id();
+      int nodeOffset = (xbt_dynar_length(dimensions_) + 1) * src->id();

 
       int linkOffset = nodeOffset;
       bool use_lnk_up = false;  // Is this link of the form "cur -> next" or "next -> cur"?
       // false means: next -> cur
       while (current_node != dst->id()) {
         dim_product = 1;        // First, we will route in x-dimension
 
       int linkOffset = nodeOffset;
       bool use_lnk_up = false;  // Is this link of the form "cur -> next" or "next -> cur"?
       // false means: next -> cur
       while (current_node != dst->id()) {
         dim_product = 1;        // First, we will route in x-dimension

-        for (j = 0; j < xbt_dynar_length(p_dimensions_); j++) {
-          cur_dim = xbt_dynar_get_as(p_dimensions_, j, int);
+        for (j = 0; j < xbt_dynar_length(dimensions_); j++) {
+          cur_dim = xbt_dynar_get_as(dimensions_, j, int);

 
           // current_node/dim_product = position in current dimension
           if ((current_node / dim_product) % cur_dim != (dst->id() / dim_product) % cur_dim) {
 
           // current_node/dim_product = position in current dimension
           if ((current_node / dim_product) % cur_dim != (dst->id() / dim_product) % cur_dim) {

diff --git a/src/surf/surf_routing_cluster_torus.hpp b/src/surf/surf_routing_cluster_torus.hpp
index f92c67f..ecb674e 100644 (file)
--- a/src/surf/surf_routing_cluster_torus.hpp
+++ b/src/surf/surf_routing_cluster_torus.hpp
@@ -24,7 +24,8 @@ namespace simgrid {
       void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position) override;
       void getRouteAndLatency(NetCard * src, NetCard * dst, sg_platf_route_cbarg_t into, double *latency) override;
       void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) override;
       void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position) override;
       void getRouteAndLatency(NetCard * src, NetCard * dst, sg_platf_route_cbarg_t into, double *latency) override;
       void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) override;

-      xbt_dynar_t p_dimensions_ = NULL;
+    private:
+      xbt_dynar_t dimensions_ = NULL;

     };
 
   }}
     };
 
   }}