X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bdda1e97bd0162312e4b1d6c6d5b8ec18f4d9f7..caf6aba21918125649ff5a84fafb22e225b2d580:/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 b32b6a6cbc..041abb77bb 100644 --- a/src/surf/surf_routing_cluster_fat_tree.cpp +++ b/src/surf/surf_routing_cluster_fat_tree.cpp @@ -1,4 +1,13 @@ -#include "surf_routing_cluster_fat_tree.hpp" +#include + +#include +#include +#include +#include +#include + +#include "src/surf/surf_routing_private.hpp" +#include "src/surf/surf_routing_cluster_fat_tree.hpp" #include "xbt/lib.h" #include @@ -11,9 +20,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_fat_tree, surf, "Routing for fat tree AS_t model_fat_tree_cluster_create(void) { - return new AsClusterFatTree(); + return new simgrid::surf::AsClusterFatTree(); } +namespace simgrid { +namespace surf { + AsClusterFatTree::AsClusterFatTree() : levels(0) { XBT_DEBUG("Creating a new fat tree."); } @@ -22,6 +34,9 @@ AsClusterFatTree::~AsClusterFatTree() { for (unsigned int i = 0 ; i < this->nodes.size() ; i++) { delete this->nodes[i]; } + for (unsigned int i = 0 ; i < this->links.size() ; i++) { + delete this->links[i]; + } } bool AsClusterFatTree::isInSubTree(FatTreeNode *root, FatTreeNode *node) { @@ -44,8 +59,8 @@ bool AsClusterFatTree::isInSubTree(FatTreeNode *root, FatTreeNode *node) { return true; } -void AsClusterFatTree::getRouteAndLatency(RoutingEdgePtr src, - RoutingEdgePtr dst, +void AsClusterFatTree::getRouteAndLatency(NetCard *src, + NetCard *dst, sg_platf_route_cbarg_t into, double *latency) { FatTreeNode *source, *destination, *currentNode; @@ -82,6 +97,7 @@ if (dst->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType() == SURF_ if(latency) { *latency += source->loopback->getLatency(); } + return; } currentNode = source; @@ -284,9 +300,6 @@ void AsClusterFatTree::generateSwitches() { } - // If we have to many compute nodes, we ditch them - - // We create the switches int k = 0; for (unsigned int i = 0 ; i < this->levels ; i++) { @@ -406,8 +419,8 @@ void AsClusterFatTree::addLink(FatTreeNode *parent, unsigned int parentPort, void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) { - std::vector parameters; - std::vector tmp; + std::vector parameters; + std::vector tmp; boost::split(parameters, cluster->topo_parameters, boost::is_any_of(";")); @@ -415,7 +428,6 @@ void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t if (parameters.size() != 4){ surf_parse_error("Fat trees are defined by the levels number and 3 vectors" ", see the documentation for more informations"); - // Well, there's no doc, yet } // The first parts of topo_parameters should be the levels number @@ -455,12 +467,12 @@ void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t } -void AsClusterFatTree::generateDotFile(const string& filename) const { - 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(), ios::out | ios::trunc); + file.open(filename.c_str(), std::ios::out | std::ios::trunc); if(file.is_open()) { file << "graph AsClusterFatTree {\n"; @@ -492,31 +504,27 @@ void AsClusterFatTree::generateDotFile(const string& filename) const { FatTreeNode::FatTreeNode(sg_platf_cluster_cbarg_t cluster, int id, int level, int position) : id(id), level(level), position(position) { - s_sg_platf_link_cbarg_t linkTemplate; + s_sg_platf_link_cbarg_t linkTemplate = SG_PLATF_LINK_INITIALIZER; if(cluster->limiter_link) { memset(&linkTemplate, 0, sizeof(linkTemplate)); linkTemplate.bandwidth = cluster->limiter_link; linkTemplate.latency = 0; - linkTemplate.state = SURF_RESOURCE_ON; + linkTemplate.initiallyOn = 1; linkTemplate.policy = SURF_LINK_SHARED; linkTemplate.id = bprintf("limiter_%d", id); sg_platf_new_link(&linkTemplate); - this->limiterLink = (NetworkLink*) xbt_lib_get_or_null(link_lib, - linkTemplate.id, - SURF_LINK_LEVEL); + this->limiterLink = Link::byName(linkTemplate.id); free((void*)linkTemplate.id); } if(cluster->loopback_bw || cluster->loopback_lat) { memset(&linkTemplate, 0, sizeof(linkTemplate)); linkTemplate.bandwidth = cluster->loopback_bw; linkTemplate.latency = cluster->loopback_lat; - linkTemplate.state = SURF_RESOURCE_ON; + linkTemplate.initiallyOn = 1; linkTemplate.policy = SURF_LINK_FATPIPE; linkTemplate.id = bprintf("loopback_%d", id); sg_platf_new_link(&linkTemplate); - this->loopback = (NetworkLink*) xbt_lib_get_or_null(link_lib, - linkTemplate.id, - SURF_LINK_LEVEL); + this->loopback = Link::byName(linkTemplate.id); free((void*)linkTemplate.id); } } @@ -526,33 +534,33 @@ FatTreeLink::FatTreeLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *upNode) : upNode(upNode), downNode(downNode) { static int uniqueId = 0; - s_sg_platf_link_cbarg_t linkTemplate; + s_sg_platf_link_cbarg_t linkTemplate = SG_PLATF_LINK_INITIALIZER; memset(&linkTemplate, 0, sizeof(linkTemplate)); linkTemplate.bandwidth = cluster->bw; linkTemplate.latency = cluster->lat; - linkTemplate.state = SURF_RESOURCE_ON; + linkTemplate.initiallyOn = 1; linkTemplate.policy = cluster->sharing_policy; // sthg to do with that ? linkTemplate.id = bprintf("link_from_%d_to_%d_%d", downNode->id, upNode->id, uniqueId); sg_platf_new_link(&linkTemplate); - NetworkLink* link; + Link* link; std::string tmpID; if (cluster->sharing_policy == SURF_LINK_FULLDUPLEX) { tmpID = std::string(linkTemplate.id) + "_UP"; - link = (NetworkLink*) xbt_lib_get_or_null(link_lib, tmpID.c_str(), - SURF_LINK_LEVEL); + link = Link::byName(tmpID.c_str()); this->upLink = link; // check link? tmpID = std::string(linkTemplate.id) + "_DOWN"; - link = (NetworkLink*) xbt_lib_get_or_null(link_lib, tmpID.c_str(), - SURF_LINK_LEVEL); + link = Link::byName(tmpID.c_str()); this->downLink = link; // check link ? } else { - link = (NetworkLink*) xbt_lib_get_or_null(link_lib, linkTemplate.id, - SURF_LINK_LEVEL); + link = Link::byName(linkTemplate.id); this->upLink = link; this->downLink = link; } uniqueId++; free((void*)linkTemplate.id); } + +} +}