From 8710733042ed7302d2e983ec3e8bd018a125cd7f Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 27 Jul 2016 10:57:37 +0200 Subject: [PATCH] try to minimize the addition of new tech debt --- src/routing/AsClusterDragonfly.cpp | 85 ++++++++++++------------------ 1 file changed, 33 insertions(+), 52 deletions(-) diff --git a/src/routing/AsClusterDragonfly.cpp b/src/routing/AsClusterDragonfly.cpp index c0a5bdf36c..2c9453e1e1 100644 --- a/src/routing/AsClusterDragonfly.cpp +++ b/src/routing/AsClusterDragonfly.cpp @@ -12,8 +12,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_dragonfly, surf_route_cluster, "Dragonfly Routing part of surf"); - - namespace simgrid { namespace routing { @@ -22,10 +20,8 @@ AsClusterDragonfly::AsClusterDragonfly(const char*name) } AsClusterDragonfly::~AsClusterDragonfly() { - - if(this->routers_!=nullptr){ - unsigned int i; - for (i=0; inumGroups_*this->numChassisPerGroup_*this->numBladesPerChassis_;i++) + if(this->routers_ != nullptr){ + for (unsigned int i=0; inumGroups_*this->numChassisPerGroup_*this->numBladesPerChassis_;i++) delete(routers_[i]); xbt_free(routers_); } @@ -33,7 +29,6 @@ AsClusterDragonfly::~AsClusterDragonfly() { unsigned int *AsClusterDragonfly::rankId_to_coords(int rankId) { - //coords : group, chassis, blade, node unsigned int *coords = (unsigned int *) malloc(4 * sizeof(unsigned int)); coords[0] = rankId/ (numChassisPerGroup_*numBladesPerChassis_*numNodesPerBlade_); @@ -42,7 +37,7 @@ unsigned int *AsClusterDragonfly::rankId_to_coords(int rankId) rankId=rankId%(numBladesPerChassis_*numNodesPerBlade_); coords[2] = rankId/ numNodesPerBlade_; coords[3]=rankId%numNodesPerBlade_; - + return coords; } @@ -102,11 +97,7 @@ void AsClusterDragonfly::seal(){ this->generateLinks(); } -DragonflyRouter::DragonflyRouter(int group, int chassis, int blade){ - this->group_=group; - this->chassis_=chassis; - this->blade_=blade; -} +DragonflyRouter::DragonflyRouter(int group, int chassis, int blade):group_(group),chassis_(chassis),blade_(blade){ } DragonflyRouter::~DragonflyRouter(){ if(this->myNodes_!=nullptr) @@ -121,23 +112,18 @@ DragonflyRouter::~DragonflyRouter(){ void AsClusterDragonfly::generateRouters() { + this->routers_=static_cast(xbt_malloc0(this->numGroups_*this->numChassisPerGroup_*this->numBladesPerChassis_*sizeof(DragonflyRouter*))); -unsigned int i, j, k; - -this->routers_=(DragonflyRouter**)xbt_malloc0(this->numGroups_*this->numChassisPerGroup_*this->numBladesPerChassis_*sizeof(DragonflyRouter*)); - -for(i=0;inumGroups_;i++){ - for(j=0;jnumChassisPerGroup_;j++){ - for(k=0;knumBladesPerChassis_;k++){ - DragonflyRouter* router = new DragonflyRouter(i,j,k); - this->routers_[i*this->numChassisPerGroup_*this->numBladesPerChassis_+j*this->numBladesPerChassis_+k]=router; + for(unsigned int i=0;inumGroups_;i++){ + for(unsigned int j=0;jnumChassisPerGroup_;j++){ + for(unsigned int k=0;knumBladesPerChassis_;k++){ + DragonflyRouter* router = new DragonflyRouter(i,j,k); + this->routers_[i*this->numChassisPerGroup_*this->numBladesPerChassis_+j*this->numBladesPerChassis_+k]=router; + } } } } -} - - void AsClusterDragonfly::createLink(char* id, int numlinks, Link** linkup, Link** linkdown){ *linkup=nullptr; *linkdown=nullptr; @@ -171,25 +157,24 @@ void AsClusterDragonfly::createLink(char* id, int numlinks, Link** linkup, Link* void AsClusterDragonfly::generateLinks() { - unsigned int i, j, k, l; static int uniqueId = 0; char* id = nullptr; - Link* linkup, *linkdown; + Link* linkup; + Link *linkdown; unsigned int numRouters = this->numGroups_*this->numChassisPerGroup_*this->numBladesPerChassis_; if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX) numLinksperLink_=2; - //Links from routers to their local nodes. - for(i=0; irouters_[i]->myNodes_=(Link**)xbt_malloc0(numLinksperLink_*this->numNodesPerBlade_*sizeof(Link*)); - this->routers_[i]->greenLinks_=(Link**)xbt_malloc0(this->numBladesPerChassis_*sizeof(Link*)); - this->routers_[i]->blackLinks_=(Link**)xbt_malloc0(this->numChassisPerGroup_*sizeof(Link*)); + this->routers_[i]->myNodes_=static_cast(xbt_malloc0(numLinksperLink_*this->numNodesPerBlade_*sizeof(Link*))); + this->routers_[i]->greenLinks_=static_cast(xbt_malloc0(this->numBladesPerChassis_*sizeof(Link*))); + this->routers_[i]->blackLinks_=static_cast(xbt_malloc0(this->numChassisPerGroup_*sizeof(Link*))); - for(j=0; j< numLinksperLink_*this->numNodesPerBlade_; j+=numLinksperLink_){ + for(unsigned int j=0; j< numLinksperLink_*this->numNodesPerBlade_; j+=numLinksperLink_){ id = bprintf("local_link_from_router_%d_to_node_%d_%d", i, j/numLinksperLink_, uniqueId); this->createLink(id, 1, &linkup, &linkdown); if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX) { @@ -204,9 +189,9 @@ void AsClusterDragonfly::generateLinks() { } //Green links from routers to same chassis routers - alltoall - for(i=0; inumGroups_*this->numChassisPerGroup_;i++){ - for(j=0; jnumBladesPerChassis_;j++){ - for(k=j+1;knumBladesPerChassis_;k++){ + for(unsigned int i=0; inumGroups_*this->numChassisPerGroup_;i++){ + for(unsigned int j=0; jnumBladesPerChassis_;j++){ + for(unsigned int k=j+1;knumBladesPerChassis_;k++){ id = bprintf("green_link_in_chassis_%d_between_routers_%d_and_%d_%d", i%numChassisPerGroup_, j, k, uniqueId); this->createLink(id, this->numLinksGreen_, &linkup, &linkdown); this->routers_[i*numBladesPerChassis_+j]->greenLinks_[k] = linkup; @@ -217,10 +202,10 @@ void AsClusterDragonfly::generateLinks() { } //Black links from routers to same group routers - alltoall - for(i=0; inumGroups_;i++){ - for(j=0; jnumChassisPerGroup_;j++){ - for(k=j+1;knumChassisPerGroup_;k++){ - for(l=0;lnumBladesPerChassis_;l++){ + for(unsigned int i=0; inumGroups_;i++){ + for(unsigned int j=0; jnumChassisPerGroup_;j++){ + for(unsigned int k=j+1;knumChassisPerGroup_;k++){ + for(unsigned int l=0;lnumBladesPerChassis_;l++){ id = bprintf("black_link_in_group_%d_between_chassis_%d_and_%d_blade_%d_%d", i, j, k,l, uniqueId); this->createLink(id, this->numLinksBlack_,&linkup, &linkdown); this->routers_[i*numBladesPerChassis_*numChassisPerGroup_+j*numBladesPerChassis_+l]->blackLinks_[k] = linkup; @@ -232,14 +217,14 @@ void AsClusterDragonfly::generateLinks() { } - //Blue links betweeen groups - Not all routers involved, only one per group is linked to others. Let's say router n of each group is linked to group n. + //Blue links between groups - Not all routers involved, only one per group is linked to others. Let's say router n of each group is linked to group n. //FIXME: in reality blue links may be attached to several different routers - for(i=0; inumGroups_;i++){ - for(j=i+1; jnumGroups_;j++){ + for(unsigned int i=0; inumGroups_;i++){ + for(unsigned int j=i+1; jnumGroups_;j++){ unsigned int routernumi=i*numBladesPerChassis_*numChassisPerGroup_+j; unsigned int routernumj=j*numBladesPerChassis_*numChassisPerGroup_+i; - this->routers_[routernumi]->blueLinks_=(Link**)xbt_malloc0(sizeof(Link*)); - this->routers_[routernumj]->blueLinks_=(Link**)xbt_malloc0(sizeof(Link*)); + this->routers_[routernumi]->blueLinks_=static_cast(xbt_malloc0(sizeof(Link*))); + this->routers_[routernumj]->blueLinks_=static_cast(xbt_malloc0(sizeof(Link*))); id = bprintf("blue_link_between_group_%d_and_%d_routers_%d_and_%d_%d", i, j, routernumi,routernumj, uniqueId); this->createLink(id, this->numLinksBlue_, &linkup, &linkdown); this->routers_[routernumi]->blueLinks_[0] = linkup; @@ -249,17 +234,14 @@ void AsClusterDragonfly::generateLinks() { } } - void AsClusterDragonfly::getRouteAndLatency(NetCard * src, NetCard * dst, sg_platf_route_cbarg_t route, double *latency) { - //Minimal routing version. // TODO : non-minimal random one, and adaptive ? if (dst->isRouter() || src->isRouter()) return; - XBT_VERB("dragonfly_get_route_and_latency from '%s'[%d] to '%s'[%d]", - src->name(), src->id(), dst->name(), dst->id()); + XBT_VERB("dragonfly_get_route_and_latency from '%s'[%d] to '%s'[%d]", src->name(), src->id(), dst->name(), dst->id()); if ((src->id() == dst->id()) && hasLoopback_) { s_surf_parsing_link_up_down_t info = xbt_dynar_get_as(privateLinks_, src->id() * linkCountPerNode_, s_surf_parsing_link_up_down_t); @@ -270,9 +252,8 @@ void AsClusterDragonfly::getRouteAndLatency(NetCard * src, NetCard * dst, sg_pla return; } - unsigned int *myCoords, *targetCoords; - myCoords = rankId_to_coords(src->id()); - targetCoords = rankId_to_coords(dst->id()); + unsigned int *myCoords = rankId_to_coords(src->id()); + unsigned int *targetCoords = rankId_to_coords(dst->id()); XBT_DEBUG("src : %u group, %u chassis, %u blade, %u node", myCoords[0], myCoords[1], myCoords[2], myCoords[3]); XBT_DEBUG("dst : %u group, %u chassis, %u blade, %u node", targetCoords[0], targetCoords[1], targetCoords[2], targetCoords[3]); -- 2.20.1