From: Stéphane Castelli Date: Fri, 18 Apr 2014 11:53:03 +0000 (+0200) Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid X-Git-Tag: v3_11~107 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/333589a884d671891ca5ac17669d57cc64fcf5a2?hp=36f55a5f2d60d4c9d96c0f7a4473dc24638cd7d1 Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid --- diff --git a/src/surf/surf_routing_cluster_fat_tree.cpp b/src/surf/surf_routing_cluster_fat_tree.cpp index df02a8def8..3ceda714e3 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 @@ -34,44 +34,52 @@ void AsClusterFatTree::create_links(sg_platf_cluster_cbarg_t cluster) { unsigned int nodesRequired = 0; - 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++) { - 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]; - } - - this->nodesByLevel[i] = nodesInThisLevel; - nodesRequired += nodesInThisLevel; + for (unsigned int j = i+1 ; j < this->levels ; j++) { + nodesInThisLevel *= this->lowerLevelNodesNumber[j]; } + + this->nodesByLevel[i] = nodesInThisLevel; + nodesRequired += nodesInThisLevel; + } - 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; - } + 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; + } - // Nodes are totally ordered, by level and then by position, in this->nodes - int k = 0; - for (unsigned int i = 0 ; i < this->levels ; i++) { - for (unsigned int j = 0 ; j < this->nodesByLevel[i] ; j++) { - this->nodes[k]->level = i; - this->nodes[k]->position = j; + // Nodes are totally ordered, by level and then by position, in this->nodes + int k = 0; + for (unsigned int i = 0 ; i < this->levels ; i++) { + for (unsigned int j = 0 ; j < this->nodesByLevel[i] ; j++) { + this->nodes[k]->level = i; + this->nodes[k]->position = j; + if(i != 0) { + int position, size; + this->getLevelPosition(i - 1, &position, &size); // TODO : check position and size ? + /* We create the connexions between this nodes and all its parents + */ + for (unsigned int l = this->upperLevelNodesNumber[i] * j ; + l < this->upperLevelNodesNumber[i] * (j + 1) ; l++) + this->addLink(cluster, this->nodes[position + l], this->nodes[k]); } + k++; } - - + } } -void AsClusterFatTree::getLevelPosition(const unsigned int level, int &position, int &size) { +void AsClusterFatTree::getLevelPosition(const unsigned int level, int *position, int *size) { if (level > this->levels - 1) { - position = -1; - size = -1; + *position = -1; + *size = -1; return; } int tempPosition = 0; @@ -79,8 +87,8 @@ void AsClusterFatTree::getLevelPosition(const unsigned int level, int &position for (unsigned int i = 0 ; i < level ; i++) { tempPosition += this->nodesByLevel[i]; } - position = tempPosition; - size = this->nodesByLevel[level]; + *position = tempPosition; + *size = this->nodesByLevel[level]; } void AsClusterFatTree::addNodes(std::vector const& id) { @@ -89,7 +97,8 @@ void AsClusterFatTree::addNodes(std::vector const& id) { } } -void AsClusterFatTree::addLink(FatTreeNode *parent, FatTreeNode *child) { +void AsClusterFatTree::addLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *parent, + FatTreeNode *child) { using std::make_pair; if (parent->children.size() == this->nodesByLevel[parent->level] || child->parents.size() == this->nodesByLevel[child->level]) { @@ -105,10 +114,10 @@ void AsClusterFatTree::addLink(FatTreeNode *parent, FatTreeNode *child) { parent->children.push_back(child); child->parents.push_back(parent); - // FatTreeLink *newLink; + FatTreeLink *newLink; - // newLink = new FatTreeLink(parent, child, this->lowerLevelPortsNumber[parent->level]); - // this->links.insert(make_pair(make_pair(parent->id, child->id), newLink)); + newLink = new FatTreeLink(cluster, parent, child, this->lowerLevelPortsNumber[parent->level]); + this->links.insert(make_pair(make_pair(parent->id, child->id), newLink)); @@ -130,7 +139,7 @@ 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(tmp.size() != this->levels) { @@ -173,16 +182,16 @@ 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++ ) { + for (unsigned int j = 0 ; j < iter->second->ports ; j++) { + file << iter->second->source->id + << " -- " + << iter->second->destination->id + << ";\n"; + } + } file << "}"; file.close(); } @@ -196,8 +205,25 @@ 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, + unsigned int ports) : ports(ports), source(source), + destination(destination) { + 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 ? + + for(unsigned int i = 0 ; i < ports ; i++) { + NetworkLink* link; + linkTemplate.id = bprintf("link_from_%d_to_%d_%d_UP", source->id, destination->id, i); + sg_platf_new_link(&linkTemplate); + link = (NetworkLink*) xbt_lib_get_or_null(link_lib, linkTemplate.id, SURF_LINK_LEVEL); + this->linksUp.push_back(link); // check link? + linkTemplate.id = bprintf("link_from_%d_to_%d_%d_DOWN", source->id, destination->id, i); + sg_platf_new_link(&linkTemplate); + link = (NetworkLink*) xbt_lib_get_or_null(link_lib, linkTemplate.id, SURF_LINK_LEVEL); + this->linksDown.push_back(link); // check link ? + } +} diff --git a/src/surf/surf_routing_cluster_fat_tree.hpp b/src/surf/surf_routing_cluster_fat_tree.hpp index 7aaf9b1f30..62f9354b4e 100644 --- a/src/surf/surf_routing_cluster_fat_tree.hpp +++ b/src/surf/surf_routing_cluster_fat_tree.hpp @@ -17,6 +17,9 @@ * should certainly be checked for) */ +/* TODO : limiter link ? Loopback? + * + */ class FatTreeNode { public: @@ -36,15 +39,19 @@ public: class FatTreeLink { public: + FatTreeLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *source, + FatTreeNode *destination, unsigned int ports = 0); unsigned int ports; - std::vector linksUp; // From source to destination - std::vector linksDown; // From destination to source + /* Links are dependant of the chosen network model, but must implement + * NetworkLink + */ + std::vector linksUp; // From source to destination + std::vector linksDown; // From destination to source /* As it is symetric, it might as well be first / second instead * of source / destination */ FatTreeNode *source; FatTreeNode *destination; - //FatTreeLink(FatTreeNode *source, FatTreeNode *destination, unsigned int ports = 0); }; class AsClusterFatTree : public AsCluster { @@ -65,15 +72,16 @@ public: protected: //description of a PGFT (TODO : better doc) unsigned int levels; - std::vector lowerLevelNodesNumber; - std::vector upperLevelNodesNumber; - std::vector lowerLevelPortsNumber; + std::vector lowerLevelNodesNumber; // number of children by node + std::vector upperLevelNodesNumber; // number of parents by node + std::vector lowerLevelPortsNumber; // ports between each level l and l-1 std::vector nodes; std::map, FatTreeLink*> links; std::vector nodesByLevel; - void addLink(FatTreeNode *parent, FatTreeNode *child); - void getLevelPosition(const unsigned int level, int &position, int &size); + void addLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *parent, + FatTreeNode *child); + void getLevelPosition(const unsigned int level, int *position, int *size); }; #endif