X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c8bcfe7ac56e69ba55d4797455a6b637baeec83e..9ef6657fec2b0eacbd273c2e3a53dc9f4fb2c8a0:/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 309a9fa910..40948d23cc 100644 --- a/src/surf/surf_routing_cluster_fat_tree.cpp +++ b/src/surf/surf_routing_cluster_fat_tree.cpp @@ -1,8 +1,8 @@ #include "surf_routing_cluster_fat_tree.hpp" +#include "xbt/lib.h" #include #include - #include #include @@ -18,97 +18,179 @@ AsClusterFatTree::~AsClusterFatTree() { void AsClusterFatTree::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t into, - double *latency) const{ + double *latency) { // TODO } /* This function makes the assumption that parse_specific_arguments() and * addNodes() have already been called */ -void AsClusterFatTree::create_links(sg_platf_cluster_cbarg_t cluster) { - +void AsClusterFatTree::create_links(sg_platf_cluster_cbarg_t cluster){ if(this->levels == 0) { return; } + this->generateSwitches(); + this->generateLabels(); + 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++) { + if(i != this->levels - 1) { + for(unsigned int l = 0 ; l < this->nodesByLevel[i+1] ; l++) { + this->connectNodeToParents(cluster, this->nodes[k]); + } + } + k++; + } + } +} + +int AsClusterFatTree::connectNodeToParents(sg_platf_cluster_cbarg_t cluster, + FatTreeNode *node) { + FatTreeNode* currentParentNode; + int connectionsNumber = 0; + const int level = node->level; + currentParentNode = this->nodes[this->getLevelPosition(level + 1)]; + for (unsigned int i = 0 ; i < this->nodesByLevel[level] ; i++ ) { + if(this->areRelated(currentParentNode, node)) { + this->addLink(cluster, currentParentNode, node->label[level + 1], node, + currentParentNode->label[level + 1]); + connectionsNumber++; + } + } + return connectionsNumber; +} + + +bool AsClusterFatTree::areRelated(FatTreeNode *parent, FatTreeNode *child) { + if (parent->level != child->level + 1) { + return false; + } + + for (unsigned int i = 0 ; i < this->levels; i++) { + if (parent->label[i] != child->label[i] && i != parent->level) { + return false; + } + } + return true; +} + +void AsClusterFatTree::generateSwitches() { this->nodesByLevel.resize(this->levels, 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]; + } - for (int i = 0 ; i < this->levels ; i++) { - int nodesInThisLevel = 1; + + if(this->nodesByLevel[0] < this->nodes.size()) { + surf_parse_error("There is not enough nodes to fit to the described topology." + " Please check your platform description (We need %d nodes, we only got %zu)", + this->nodesByLevel[0], this->nodes.size()); + return; + } + + for (unsigned int i = 0 ; i < this->levels ; i++) { + int nodesInThisLevel = 1; - for (int j = 0 ; j < i ; j++) { - nodesInThisLevel *= this->upperLevelNodesNumber[j]; - } + for (unsigned int j = 0 ; j <= i ; j++) { + nodesInThisLevel *= this->upperLevelNodesNumber[j]; + } - for (int j = i+1 ; j < this->levels ; j++) { - nodesInThisLevel *= this->lowerLevelNodesNumber[j]; - } - - this->nodesByLevel[i] = nodesInThisLevel; - nodesRequired += nodesInThisLevel; + for (unsigned int j = i+1 ; j < this->levels ; j++) { + nodesInThisLevel *= this->lowerLevelNodesNumber[j]; } - - if(nodesRequired > this->nodes.size()) { - surf_parse_error("There is not enough nodes to fit to the described topology." - " Please check your platform description (We need %d nodes, we only got %lu)", - nodesRequired, this->nodes.size()); - return; + + this->nodesByLevel[i+1] = nodesInThisLevel; + nodesRequired += nodesInThisLevel; + } + + + // If we have to many compute nodes, we ditch them + if (this->nodesByLevel[0] > this->nodes.size()) { + for (unsigned int i = this->nodesByLevel[0] ; i < this->nodes.size() ; i++) { + delete this->nodes[i]; } + this->nodes.resize(this->nodesByLevel[0]); + } - // Nodes are totally ordered, by level and then by position, in this->nodes - int k = 0; - for (int i = 0 ; i < this->levels ; i++) { - for (int j = 0 ; j < this->nodesByLevel[i] ; j++) { - this->nodes[k]->level = i; - this->nodes[k]->position = j; - } + // We create the switches + int k = 0; + for (unsigned int i = 1 ; i < this->levels ; i++) { + for (unsigned int j = 0 ; j < this->nodesByLevel[i] ; j++) { + FatTreeNode* newNode; + newNode = new FatTreeNode(--k, i, j); + newNode->children.resize(this->lowerLevelNodesNumber[i]); + newNode->parents.resize(this->upperLevelNodesNumber[i]); + this->nodes.push_back(newNode); } + } +} +void AsClusterFatTree::generateLabels() { + // TODO : check if nodesByLevel and nodes are filled + for (unsigned int i = 0 ; i < this->levels ; i++) { + std::vector maxLabel(this->nodesByLevel[i]); + std::vector currentLabel(this->nodesByLevel[i], 0); + unsigned int k = 0; + for (unsigned int j = 0 ; j < this->nodesByLevel[i] ; j++) { + maxLabel[j] = j > i ? + this->lowerLevelNodesNumber[i] : this->upperLevelNodesNumber[i]; + } + for (unsigned int j = 0 ; j < this->nodesByLevel[i] ; j++) { + this->nodes[k]->label.assign(currentLabel.begin(), currentLabel.end()); + + int remainder = 0; + + do { + int pos = currentLabel.size() - 1; + remainder = ++currentLabel[pos] / maxLabel[pos]; + currentLabel[pos] = currentLabel[pos] % maxLabel[pos]; + --pos; + } + while(remainder != 0); + k++; + } + } } -void AsClusterFatTree::getLevelPosition(const int level, int &position, int &size) { + +int AsClusterFatTree::getLevelPosition(const unsigned int level) { if (level > this->levels - 1) { - position = -1; - size = -1; - return; + // Well, that should never happen. Maybe should we throw instead. + return -1; } int tempPosition = 0; - for (int i = 0 ; i < level ; i++) { + for (unsigned int i = 0 ; i < level ; i++) { tempPosition += this->nodesByLevel[i]; } - position = tempPosition; - size = this->nodesByLevel[level]; + return tempPosition; } -void AsClusterFatTree::addNodes(std::vector const& id) { - for (unsigned int i = 0 ; i < id.size() ; i++) { +void AsClusterFatTree::addComputeNodes(std::vector const& id) { + for (size_t i = 0 ; i < id.size() ; i++) { this->nodes.push_back(new FatTreeNode(id[i])); } } -void AsClusterFatTree::addLink(FatTreeNode *parent, FatTreeNode *child) { +void AsClusterFatTree::addLink(sg_platf_cluster_cbarg_t cluster, + FatTreeNode *parent, unsigned int parentPort, + FatTreeNode *child, unsigned int childPort) { using std::make_pair; - if ((int)parent->children.size() == this->nodesByLevel[parent->level] || - (int)child->parents.size() == this->nodesByLevel[child->level]) { - /* NB : This case should never happen, if this private function is not misused, - * so should we keep this test, keep it only for debug, throw an exception - * or get rid of it ? In all cases, anytime we get in there, code should be - * fixed - */ - xbt_die("I've been asked to create a link that could not possibly exist"); - return; - } - parent->children.push_back(child); - child->parents.push_back(parent); - // FatTreeLink *newLink; + FatTreeLink *newLink; + newLink = new FatTreeLink(cluster, parent, child); + + parent->children[parentPort] = newLink; + child->parents[childPort] = newLink; - // newLink = new FatTreeLink(parent, child, this->lowerLevelPortsNumber[parent->level]); - // this->links.insert(make_pair(make_pair(parent->id, child->id), newLink)); + this->links.insert(make_pair(make_pair(parent->id, child->id), newLink)); @@ -130,35 +212,35 @@ void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t // The first parts of topo_parameters should be the levels number this->levels = std::atoi(tmp[0].c_str()); // stoi() only in C++11... - + // Then, a l-sized vector standing for the childs number by level boost::split(tmp, parameters[1], boost::is_any_of(",")); - if((int)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(unsigned int i = 0 ; i < tmp.size() ; i++){ + for(size_t i = 0 ; i < tmp.size() ; i++){ this->lowerLevelNodesNumber.push_back(std::atoi(tmp[i].c_str())); } // Then, a l-sized vector standing for the parents number by level boost::split(tmp, parameters[2], boost::is_any_of(",")); - if((int)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(unsigned int i = 0 ; i < tmp.size() ; i++){ + for(size_t i = 0 ; i < tmp.size() ; i++){ this->upperLevelNodesNumber.push_back(std::atoi(tmp[i].c_str())); } // Finally, a l-sized vector standing for the ports number with the lower level boost::split(tmp, parameters[3], boost::is_any_of(",")); - if((int)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(unsigned int i = 0 ; i < tmp.size() ; i++){ + for(size_t i = 0 ; i < tmp.size() ; i++){ this->lowerLevelPortsNumber.push_back(std::atoi(tmp[i].c_str())); } } @@ -173,16 +255,14 @@ void AsClusterFatTree::generateDotFile(const string& filename) const { if(file.is_open()) { // That could also be greatly clarified with C++11 - // std::map,FatTreeLink*>::iterator iter; - // file << "graph AsClusterFatTree {\n"; - // for (iter = this->links.begin() ; iter != this->links.end() ; iter++ ) { - // for (int j = 0 ; j < iter->second->ports ; j++) { - // file << iter->second->source->id - // << " -- " - // << iter->second->destination->id - // << ";\n"; - // } - //} + std::map,FatTreeLink*>::const_iterator iter; + file << "graph AsClusterFatTree {\n"; + for (iter = this->links.begin() ; iter != this->links.end() ; iter++ ) { + file << iter->second->source->id + << " -- " + << iter->second->destination->id + << ";\n"; + } file << "}"; file.close(); } @@ -196,8 +276,27 @@ FatTreeNode::FatTreeNode(int id, int level, int position) : id(id), level(level), position(position){} -// FatTreeLink::FatTreeLink(FatTreeNode *source, FatTreeNode *destination, -// int ports) : source(source), destination(destination), -// ports(ports) { - -// } +FatTreeLink::FatTreeLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *source, + FatTreeNode *destination) : source(source), + destination(destination) { + static int uniqueId = 0; + s_sg_platf_link_cbarg_t linkTemplate; + linkTemplate.bandwidth = cluster->bw; + linkTemplate.latency = cluster->lat; + linkTemplate.state = SURF_RESOURCE_ON; + linkTemplate.policy = cluster->sharing_policy; // Maybe should we do sthg with that ? + + + NetworkLink* link; + linkTemplate.id = bprintf("link_from_%d_to_%d_%d_UP", source->id, destination->id, uniqueId); + sg_platf_new_link(&linkTemplate); + link = (NetworkLink*) xbt_lib_get_or_null(link_lib, linkTemplate.id, SURF_LINK_LEVEL); + this->linkUp = link; // check link? + linkTemplate.id = bprintf("link_from_%d_to_%d_%d_DOWN", source->id, destination->id, uniqueId); + sg_platf_new_link(&linkTemplate); + link = (NetworkLink*) xbt_lib_get_or_null(link_lib, linkTemplate.id, SURF_LINK_LEVEL); + this->linkDown = link; // check link ? + + uniqueId++; + +}