From: Stéphane Castelli Date: Wed, 16 Apr 2014 15:47:12 +0000 (+0200) Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid X-Git-Tag: v3_11~114 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/efa6b4975756e5758ccae3a2c9b7cbdb91ce5811?hp=58158a8c95d2b78abe05fdd3a5d693ecdcf3eb0e 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 f852c3682b..ffdfc37757 100644 --- a/src/surf/surf_routing_cluster_fat_tree.cpp +++ b/src/surf/surf_routing_cluster_fat_tree.cpp @@ -30,7 +30,7 @@ void AsClusterFatTree::create_links(sg_platf_cluster_cbarg_t cluster) { if(this->levels == 0) { return; } - std::vector nodesByLevel(this->levels); + this->nodesByLevel.resize(this->levels, 0); int nodesRequired = 0; @@ -45,35 +45,43 @@ void AsClusterFatTree::create_links(sg_platf_cluster_cbarg_t cluster) { nodesInThisLevel *= this->lowerLevelNodesNumber[j]; } - nodesByLevel[i] = nodesInThisLevel; + 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()); + 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 (int i = 0 ; i < this->levels ; i++) { - for (int j = 0 ; j < nodesByLevel[i] ; j++) { + for (int j = 0 ; j < this->nodesByLevel[i] ; j++) { this->nodes[k]->level = i; this->nodes[k]->position = j; - - if (i == 0) { - - } - else if (i == this->levels - 1) { - - } - else { - - } } } + + } +void AsClusterFatTree::getLevelPosition(const int level, int &position, int &size) { + if (level > this->levels - 1) { + position = -1; + size = -1; + return; + } + int tempPosition = 0; + + for (int i = 0 ; i < level ; i++) { + tempPosition += this->nodesByLevel[i]; + } + position = tempPosition; + size = this->nodesByLevel[level]; +} void AsClusterFatTree::addNodes(std::vector const& id) { for (int i = 0 ; i < id.size() ; i++) { @@ -81,6 +89,31 @@ void AsClusterFatTree::addNodes(std::vector const& id) { } } +void AsClusterFatTree::addLink(FatTreeNode *parent, FatTreeNode *child) { + using std::make_pair; + if (parent->children.size() == this->nodesByLevel[parent->level] || + 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; + + // newLink = new FatTreeLink(parent, child, this->lowerLevelPortsNumber[parent->level]); + // this->links.insert(make_pair(make_pair(parent->id, child->id), newLink)); + + + +} + void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) { std::vector parameters; @@ -131,28 +164,27 @@ void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t } -void AsClusterFatTree::generateDotFile(string filename) { +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... + * with C++11... */ file.open(filename.c_str(), ios::out | ios::trunc); if(file.is_open()) { - /* TODO : Iterate through a map takes 10 chars with c++11, 100 with c++98. - * All I have to do is write it down... - */ - + // That could also be greatly clarified with C++11 + // std::map,FatTreeLink*>::iterator iter; // file << "graph AsClusterFatTree {\n"; - // for (std::map, FatTreeLink*>::iterator link = this->links.begin() ; link != this->links.end() ; link++ ) { - // for (int j = 0 ; j < link->ports ; j++) { - // file << this->links[i]->source.id - // << " -- " this->links[i]->destination.id - // << ";\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"; // } - // } - // file << "}"; - // file.close(); + //} + file << "}"; + file.close(); } else { std::cerr << "Unable to open file " << filename << std::endl; @@ -163,3 +195,9 @@ void AsClusterFatTree::generateDotFile(string filename) { 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) { + +// } diff --git a/src/surf/surf_routing_cluster_fat_tree.hpp b/src/surf/surf_routing_cluster_fat_tree.hpp index 96ba5c97d0..1c39826b4b 100644 --- a/src/surf/surf_routing_cluster_fat_tree.hpp +++ b/src/surf/surf_routing_cluster_fat_tree.hpp @@ -17,9 +17,10 @@ * should certainly be checked for) */ + class FatTreeNode { public: - int id; // ID as given by the user + int id; // ID as given by the user, should be unique int level; // The 0th level represents the leafs of the PGFT int position; // Position in the level @@ -34,26 +35,32 @@ public: }; class FatTreeLink { -private: - unsigned int ports; - std::vector linksUp; // From source to destination - std::vector linksDown; // From destination to source - FatTreeNode source; - FatTreeNode destination; public: - FatTreeLink(int source, int destination, unsigned int ports = 0); - NetworkLink getLink(int number = 0) const; + unsigned int ports; + 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 { public: AsClusterFatTree(); ~AsClusterFatTree(); - virtual void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t into, double *latency) const; + virtual void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, + sg_platf_route_cbarg_t into, + double *latency) const; + // virtual void getRouteAndLatency(const int src, const int dst, + // std::vector *route, + // double *latency) const; virtual void create_links(sg_platf_cluster_cbarg_t cluster); void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster); void addNodes(std::vector const& id); - void generateDotFile(string filename = "fatTree.dot"); + void generateDotFile(const string& filename = "fatTree.dot") const; protected: //description of a PGFT (TODO : better doc) @@ -64,9 +71,9 @@ protected: std::vector nodes; std::map, FatTreeLink*> links; - -}; - + std::vector nodesByLevel; - + void addLink(FatTreeNode *parent, FatTreeNode *child); + void getLevelPosition(const int level, int &position, int &size); +}; #endif