X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d6ee04bb4b77788c1f17220a2117f41573c9dcde..d7137248837c462e9a20c5640f2c74541faa7ef5:/src/kernel/routing/FatTreeZone.cpp

diff --git a/src/kernel/routing/FatTreeZone.cpp b/src/kernel/routing/FatTreeZone.cpp
index 16e27989f3..6101508561 100644
--- a/src/kernel/routing/FatTreeZone.cpp
+++ b/src/kernel/routing/FatTreeZone.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2017. 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. */
@@ -7,9 +7,11 @@
 #include <sstream>
 #include <string>
 
-#include "src/kernel/routing/FatTreeZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/FatTreeZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp"
+#include "src/surf/xml/platf_private.hpp"
+
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -56,31 +58,31 @@ bool FatTreeZone::isInSubTree(FatTreeNode* root, FatTreeNode* node)
   return true;
 }
 
-void FatTreeZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t into, double* latency)
+void FatTreeZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency)
 {
 
-  if (dst->isRouter() || src->isRouter())
+  if (dst->is_router() || src->is_router())
     return;
 
   /* Let's find the source and the destination in our internal structure */
-  auto searchedNode = this->computeNodes_.find(src->id());
-  xbt_assert(searchedNode != this->computeNodes_.end(), "Could not find the source %s [%u] in the fat tree",
-             src->getCname(), src->id());
+  auto searchedNode = this->compute_nodes_.find(src->id());
+  xbt_assert(searchedNode != this->compute_nodes_.end(), "Could not find the source %s [%u] in the fat tree",
+             src->get_cname(), src->id());
   FatTreeNode* source = searchedNode->second;
 
-  searchedNode = this->computeNodes_.find(dst->id());
-  xbt_assert(searchedNode != this->computeNodes_.end(), "Could not find the destination %s [%u] in the fat tree",
-             dst->getCname(), dst->id());
+  searchedNode = this->compute_nodes_.find(dst->id());
+  xbt_assert(searchedNode != this->compute_nodes_.end(), "Could not find the destination %s [%u] in the fat tree",
+             dst->get_cname(), dst->id());
   FatTreeNode* destination = searchedNode->second;
 
-  XBT_VERB("Get route and latency from '%s' [%u] to '%s' [%u] in a fat tree", src->getCname(), src->id(),
-           dst->getCname(), dst->id());
+  XBT_VERB("Get route and latency from '%s' [%u] to '%s' [%u] in a fat tree", src->get_cname(), src->id(),
+           dst->get_cname(), dst->id());
 
   /* In case destination is the source, and there is a loopback, let's use it instead of going up to a switch */
-  if (source->id == destination->id && this->hasLoopback_) {
+  if (source->id == destination->id && this->has_loopback_) {
     into->link_list.push_back(source->loopback);
     if (latency)
-      *latency += source->loopback->latency();
+      *latency += source->loopback->get_latency();
     return;
   }
 
@@ -91,18 +93,18 @@ void FatTreeZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cba
     int d = destination->position; // as in d-mod-k
 
     for (unsigned int i = 0; i < currentNode->level; i++)
-      d /= this->upperLevelNodesNumber_[i];
+      d /= this->num_parents_per_node_[i];
 
-    int k = this->upperLevelNodesNumber_[currentNode->level];
+    int k = this->num_parents_per_node_[currentNode->level];
     d     = d % k;
-    into->link_list.push_back(currentNode->parents[d]->upLink);
+    into->link_list.push_back(currentNode->parents[d]->up_link_);
 
     if (latency)
-      *latency += currentNode->parents[d]->upLink->latency();
+      *latency += currentNode->parents[d]->up_link_->get_latency();
 
-    if (this->hasLimiter_)
-      into->link_list.push_back(currentNode->limiterLink);
-    currentNode = currentNode->parents[d]->upNode;
+    if (this->has_limiter_)
+      into->link_list.push_back(currentNode->limiter_link_);
+    currentNode = currentNode->parents[d]->up_node_;
   }
 
   XBT_DEBUG("%d(%u,%u) is in the sub tree of %d(%u,%u).", destination->id, destination->level, destination->position,
@@ -111,13 +113,13 @@ void FatTreeZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cba
   // Down part
   while (currentNode != destination) {
     for (unsigned int i = 0; i < currentNode->children.size(); i++) {
-      if (i % this->lowerLevelNodesNumber_[currentNode->level - 1] == destination->label[currentNode->level - 1]) {
-        into->link_list.push_back(currentNode->children[i]->downLink);
+      if (i % this->num_children_per_node_[currentNode->level - 1] == destination->label[currentNode->level - 1]) {
+        into->link_list.push_back(currentNode->children[i]->down_link_);
         if (latency)
-          *latency += currentNode->children[i]->downLink->latency();
-        currentNode = currentNode->children[i]->downNode;
-        if (this->hasLimiter_)
-          into->link_list.push_back(currentNode->limiterLink);
+          *latency += currentNode->children[i]->down_link_->get_latency();
+        currentNode = currentNode->children[i]->down_node_;
+        if (this->has_limiter_)
+          into->link_list.push_back(currentNode->limiter_link_);
         XBT_DEBUG("%d(%u,%u) is accessible through %d(%u,%u)", destination->id, destination->level,
                   destination->position, currentNode->id, currentNode->level, currentNode->position);
       }
@@ -139,9 +141,9 @@ void FatTreeZone::seal()
     std::stringstream msgBuffer;
 
     msgBuffer << "We are creating a fat tree of " << this->levels_ << " levels "
-              << "with " << this->nodesByLevel_[0] << " processing nodes";
+              << "with " << this->nodes_by_level_[0] << " processing nodes";
     for (unsigned int i = 1; i <= this->levels_; i++) {
-      msgBuffer << ", " << this->nodesByLevel_[i] << " switches at level " << i;
+      msgBuffer << ", " << this->nodes_by_level_[i] << " switches at level " << i;
     }
     XBT_DEBUG("%s", msgBuffer.str().c_str());
     msgBuffer.str("");
@@ -158,7 +160,7 @@ void FatTreeZone::seal()
   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++) {
+    for (unsigned int j = 0; j < this->nodes_by_level_[i]; j++) {
       this->connectNodeToParents(this->nodes_[k]);
       k++;
     }
@@ -168,7 +170,7 @@ void FatTreeZone::seal()
     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 << ") ";
+      msgBuffer << "(" << this->links_[i]->up_node_->id << "," << this->links_[i]->down_node_->id << ") ";
     }
     XBT_DEBUG("%s", msgBuffer.str().c_str());
   }
@@ -181,15 +183,15 @@ int FatTreeZone::connectNodeToParents(FatTreeNode* node)
   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->nodes_by_level_[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++) {
-        this->addLink(*currentParentNode, node->label[level] + j * this->lowerLevelNodesNumber_[level], node,
-                      (*currentParentNode)->label[level] + j * this->upperLevelNodesNumber_[level]);
+                (*currentParentNode)->position, this->num_port_lower_level_[level]);
+      for (unsigned int j = 0; j < this->num_port_lower_level_[level]; j++) {
+        this->add_link(*currentParentNode, node->label[level] + j * this->num_children_per_node_[level], node,
+                       (*currentParentNode)->label[level] + j * this->num_parents_per_node_[level]);
       }
       connectionsNumber++;
     }
@@ -233,16 +235,16 @@ bool FatTreeZone::areRelated(FatTreeNode* parent, FatTreeNode* child)
 void FatTreeZone::generateSwitches()
 {
   XBT_DEBUG("Generating switches.");
-  this->nodesByLevel_.resize(this->levels_ + 1, 0);
+  this->nodes_by_level_.resize(this->levels_ + 1, 0);
 
   // Take care of the number of nodes by level
-  this->nodesByLevel_[0] = 1;
+  this->nodes_by_level_[0] = 1;
   for (unsigned int i = 0; i < this->levels_; i++)
-    this->nodesByLevel_[0] *= this->lowerLevelNodesNumber_[i];
+    this->nodes_by_level_[0] *= this->num_children_per_node_[i];
 
-  if (this->nodesByLevel_[0] != this->nodes_.size()) {
+  if (this->nodes_by_level_[0] != this->nodes_.size()) {
     surf_parse_error(std::string("The number of provided nodes does not fit with the wanted topology.") +
-                     " Please check your platform description (We need " + std::to_string(this->nodesByLevel_[0]) +
+                     " Please check your platform description (We need " + std::to_string(this->nodes_by_level_[0]) +
                      "nodes, we got " + std::to_string(this->nodes_.size()));
     return;
   }
@@ -251,23 +253,23 @@ void FatTreeZone::generateSwitches()
     int nodesInThisLevel = 1;
 
     for (unsigned int j = 0; j <= i; j++)
-      nodesInThisLevel *= this->upperLevelNodesNumber_[j];
+      nodesInThisLevel *= this->num_parents_per_node_[j];
 
     for (unsigned int j = i + 1; j < this->levels_; j++)
-      nodesInThisLevel *= this->lowerLevelNodesNumber_[j];
+      nodesInThisLevel *= this->num_children_per_node_[j];
 
-    this->nodesByLevel_[i + 1] = nodesInThisLevel;
+    this->nodes_by_level_[i + 1] = nodesInThisLevel;
   }
 
   // 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++) {
+    for (unsigned int j = 0; j < this->nodes_by_level_[i + 1]; j++) {
       FatTreeNode* newNode = new FatTreeNode(this->cluster_, --k, i + 1, j);
       XBT_DEBUG("We create the switch %d(%u,%u)", newNode->id, newNode->level, newNode->position);
-      newNode->children.resize(this->lowerLevelNodesNumber_[i] * this->lowerLevelPortsNumber_[i]);
+      newNode->children.resize(this->num_children_per_node_[i] * this->num_port_lower_level_[i]);
       if (i != this->levels_ - 1) {
-        newNode->parents.resize(this->upperLevelNodesNumber_[i + 1] * this->lowerLevelPortsNumber_[i + 1]);
+        newNode->parents.resize(this->num_parents_per_node_[i + 1] * this->num_port_lower_level_[i + 1]);
       }
       newNode->label.resize(this->levels_);
       this->nodes_.push_back(newNode);
@@ -285,10 +287,10 @@ void FatTreeZone::generateLabels()
   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];
+      maxLabel[j] = j + 1 > i ? this->num_children_per_node_[j] : this->num_parents_per_node_[j];
     }
 
-    for (unsigned int j = 0; j < this->nodesByLevel_[i]; j++) {
+    for (unsigned int j = 0; j < this->nodes_by_level_[i]; j++) {
 
       if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) {
         std::stringstream msgBuffer;
@@ -327,24 +329,24 @@ int FatTreeZone::getLevelPosition(const unsigned int level)
   int tempPosition = 0;
 
   for (unsigned int i = 0; i < level; i++)
-    tempPosition += this->nodesByLevel_[i];
+    tempPosition += this->nodes_by_level_[i];
 
   return tempPosition;
 }
 
-void FatTreeZone::addProcessingNode(int id)
+void FatTreeZone::add_processing_node(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->parents.resize(this->num_parents_per_node_[0] * this->num_port_lower_level_[0]);
   newNode->label.resize(this->levels_);
-  this->computeNodes_.insert(make_pair(id, newNode));
+  this->compute_nodes_.insert(make_pair(id, newNode));
   this->nodes_.push_back(newNode);
 }
 
-void FatTreeZone::addLink(FatTreeNode* parent, unsigned int parentPort, FatTreeNode* child, unsigned int childPort)
+void FatTreeZone::add_link(FatTreeNode* parent, unsigned int parentPort, FatTreeNode* child, unsigned int childPort)
 {
   FatTreeLink* newLink;
   newLink = new FatTreeLink(this->cluster_, child, parent);
@@ -382,7 +384,7 @@ void FatTreeZone::parse_specific_arguments(ClusterCreationArgs* cluster)
   }
   for (size_t i = 0; i < tmp.size(); i++) {
     try {
-      this->lowerLevelNodesNumber_.push_back(std::stoi(tmp[i]));
+      this->num_children_per_node_.push_back(std::stoi(tmp[i]));
     } catch (std::invalid_argument& ia) {
       throw std::invalid_argument(std::string("Invalid lower level node number:") + tmp[i]);
     }
@@ -395,7 +397,7 @@ void FatTreeZone::parse_specific_arguments(ClusterCreationArgs* cluster)
   }
   for (size_t i = 0; i < tmp.size(); i++) {
     try {
-      this->upperLevelNodesNumber_.push_back(std::stoi(tmp[i]));
+      this->num_parents_per_node_.push_back(std::stoi(tmp[i]));
     } catch (std::invalid_argument& ia) {
       throw std::invalid_argument(std::string("Invalid upper level node number:") + tmp[i]);
     }
@@ -408,7 +410,7 @@ void FatTreeZone::parse_specific_arguments(ClusterCreationArgs* cluster)
   }
   for (size_t i = 0; i < tmp.size(); i++) {
     try {
-      this->lowerLevelPortsNumber_.push_back(std::stoi(tmp[i]));
+      this->num_port_lower_level_.push_back(std::stoi(tmp[i]));
     } catch (std::invalid_argument& ia) {
       throw std::invalid_argument(std::string("Invalid lower level port number:") + tmp[i]);
     }
@@ -416,7 +418,7 @@ void FatTreeZone::parse_specific_arguments(ClusterCreationArgs* cluster)
   this->cluster_ = cluster;
 }
 
-void FatTreeZone::generateDotFile(const std::string& filename) const
+void FatTreeZone::generate_dot_file(const std::string& filename) const
 {
   std::ofstream file;
   file.open(filename, std::ios::out | std::ios::trunc);
@@ -432,7 +434,7 @@ void FatTreeZone::generateDotFile(const std::string& filename) const
   }
 
   for (unsigned int i = 0; i < this->links_.size(); i++) {
-    file << this->links_[i]->downNode->id << " -- " << this->links_[i]->upNode->id << ";\n";
+    file << this->links_[i]->down_node_->id << " -- " << this->links_[i]->up_node_->id << ";\n";
   }
   file << "}";
   file.close();
@@ -445,23 +447,23 @@ FatTreeNode::FatTreeNode(ClusterCreationArgs* cluster, int id, int level, int po
   if (cluster->limiter_link) {
     linkTemplate.bandwidth = cluster->limiter_link;
     linkTemplate.latency   = 0;
-    linkTemplate.policy    = SURF_LINK_SHARED;
+    linkTemplate.policy    = s4u::Link::SharingPolicy::SHARED;
     linkTemplate.id        = "limiter_"+std::to_string(id);
     sg_platf_new_link(&linkTemplate);
-    this->limiterLink = surf::LinkImpl::byName(linkTemplate.id);
+    this->limiter_link_ = resource::LinkImpl::by_name(linkTemplate.id);
   }
   if (cluster->loopback_bw || cluster->loopback_lat) {
     linkTemplate.bandwidth = cluster->loopback_bw;
     linkTemplate.latency   = cluster->loopback_lat;
-    linkTemplate.policy    = SURF_LINK_FATPIPE;
+    linkTemplate.policy    = s4u::Link::SharingPolicy::FATPIPE;
     linkTemplate.id        = "loopback_"+ std::to_string(id);
     sg_platf_new_link(&linkTemplate);
-    this->loopback = surf::LinkImpl::byName(linkTemplate.id);
+    this->loopback = resource::LinkImpl::by_name(linkTemplate.id);
   }
 }
 
 FatTreeLink::FatTreeLink(ClusterCreationArgs* cluster, FatTreeNode* downNode, FatTreeNode* upNode)
-    : upNode(upNode), downNode(downNode)
+    : up_node_(upNode), down_node_(downNode)
 {
   static int uniqueId = 0;
   LinkCreationArgs linkTemplate;
@@ -472,14 +474,14 @@ FatTreeLink::FatTreeLink(ClusterCreationArgs* cluster, FatTreeNode* downNode, Fa
       "link_from_" + std::to_string(downNode->id) + "_" + std::to_string(upNode->id) + "_" + std::to_string(uniqueId);
   sg_platf_new_link(&linkTemplate);
 
-  if (cluster->sharing_policy == SURF_LINK_FULLDUPLEX) {
+  if (cluster->sharing_policy == s4u::Link::SharingPolicy::SPLITDUPLEX) {
     std::string tmpID = std::string(linkTemplate.id) + "_UP";
-    this->upLink      = surf::LinkImpl::byName(tmpID); // check link?
+    this->up_link_    = resource::LinkImpl::by_name(tmpID); // check link?
     tmpID          = std::string(linkTemplate.id) + "_DOWN";
-    this->downLink    = surf::LinkImpl::byName(tmpID); // check link ?
+    this->down_link_  = resource::LinkImpl::by_name(tmpID); // check link ?
   } else {
-    this->upLink   = surf::LinkImpl::byName(linkTemplate.id);
-    this->downLink = this->upLink;
+    this->up_link_   = resource::LinkImpl::by_name(linkTemplate.id);
+    this->down_link_ = this->up_link_;
   }
   uniqueId++;
 }