X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a18117755285a374ec3d5830309c924f2830e3ba..900a1b123739221101cc09eb8c65f6d90792c2bb:/src/kernel/routing/DragonflyZone.cpp diff --git a/src/kernel/routing/DragonflyZone.cpp b/src/kernel/routing/DragonflyZone.cpp index 146e00781f..827aa982e7 100644 --- a/src/kernel/routing/DragonflyZone.cpp +++ b/src/kernel/routing/DragonflyZone.cpp @@ -4,11 +4,12 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/kernel/routing/DragonflyZone.hpp" -#include "src/kernel/routing/NetCard.hpp" +#include "src/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" #include #include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_dragonfly, surf_route_cluster, "Dragonfly Routing part of surf"); @@ -16,11 +17,11 @@ namespace simgrid { namespace kernel { namespace routing { -AsClusterDragonfly::AsClusterDragonfly(As* father, const char* name) : AsCluster(father, name) +DragonflyZone::DragonflyZone(NetZone* father, const char* name) : ClusterZone(father, name) { } -AsClusterDragonfly::~AsClusterDragonfly() +DragonflyZone::~DragonflyZone() { if (this->routers_ != nullptr) { for (unsigned int i = 0; i < this->numGroups_ * this->numChassisPerGroup_ * this->numBladesPerChassis_; i++) @@ -29,21 +30,18 @@ AsClusterDragonfly::~AsClusterDragonfly() } } -unsigned int* AsClusterDragonfly::rankId_to_coords(int rankId) +void DragonflyZone::rankId_to_coords(int rankId, unsigned int (*coords)[4]) { // coords : group, chassis, blade, node - unsigned int* coords = (unsigned int*)malloc(4 * sizeof(unsigned int)); - coords[0] = rankId / (numChassisPerGroup_ * numBladesPerChassis_ * numNodesPerBlade_); + (*coords)[0] = rankId / (numChassisPerGroup_ * numBladesPerChassis_ * numNodesPerBlade_); rankId = rankId % (numChassisPerGroup_ * numBladesPerChassis_ * numNodesPerBlade_); - coords[1] = rankId / (numBladesPerChassis_ * numNodesPerBlade_); + (*coords)[1] = rankId / (numBladesPerChassis_ * numNodesPerBlade_); rankId = rankId % (numBladesPerChassis_ * numNodesPerBlade_); - coords[2] = rankId / numNodesPerBlade_; - coords[3] = rankId % numNodesPerBlade_; - - return coords; + (*coords)[2] = rankId / numNodesPerBlade_; + (*coords)[3] = rankId % numNodesPerBlade_; } -void AsClusterDragonfly::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) +void DragonflyZone::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) { std::vector parameters; std::vector tmp; @@ -91,7 +89,7 @@ void AsClusterDragonfly::parse_specific_arguments(sg_platf_cluster_cbarg_t clust /* * Generate the cluster once every node is created */ -void AsClusterDragonfly::seal() +void DragonflyZone::seal() { if (this->numNodesPerBlade_ == 0) { return; @@ -117,7 +115,7 @@ DragonflyRouter::~DragonflyRouter() xbt_free(blueLinks_); } -void AsClusterDragonfly::generateRouters() +void DragonflyZone::generateRouters() { this->routers_ = static_cast(xbt_malloc0(this->numGroups_ * this->numChassisPerGroup_ * this->numBladesPerChassis_ * sizeof(DragonflyRouter*))); @@ -133,43 +131,38 @@ void AsClusterDragonfly::generateRouters() } } -void AsClusterDragonfly::createLink(char* id, int numlinks, Link** linkup, Link** linkdown) +void DragonflyZone::createLink(std::string id, int numlinks, surf::LinkImpl** linkup, surf::LinkImpl** linkdown) { *linkup = nullptr; *linkdown = nullptr; - s_sg_platf_link_cbarg_t linkTemplate; - memset(&linkTemplate, 0, sizeof(linkTemplate)); + LinkCreationArgs linkTemplate; linkTemplate.bandwidth = this->cluster_->bw * numlinks; linkTemplate.latency = this->cluster_->lat; linkTemplate.policy = this->cluster_->sharing_policy; // sthg to do with that ? linkTemplate.id = id; sg_platf_new_link(&linkTemplate); - XBT_DEBUG("Generating link %s", id); - Link* link; + XBT_DEBUG("Generating link %s", id.c_str()); + surf::LinkImpl* link; std::string tmpID; if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX) { - tmpID = std::string(linkTemplate.id) + "_UP"; - link = Link::byName(tmpID.c_str()); + tmpID = linkTemplate.id + "_UP"; + link = surf::LinkImpl::byName(tmpID.c_str()); *linkup = link; // check link? - tmpID = std::string(linkTemplate.id) + "_DOWN"; - link = Link::byName(tmpID.c_str()); + tmpID = linkTemplate.id + "_DOWN"; + link = surf::LinkImpl::byName(tmpID.c_str()); *linkdown = link; // check link ? } else { - link = Link::byName(linkTemplate.id); + link = surf::LinkImpl::byName(linkTemplate.id.c_str()); *linkup = link; *linkdown = link; } - - free((void*)linkTemplate.id); } -void AsClusterDragonfly::generateLinks() +void DragonflyZone::generateLinks() { - static int uniqueId = 0; - char* id = nullptr; - Link* linkup; - Link* linkdown; + surf::LinkImpl* linkup; + surf::LinkImpl* linkdown; unsigned int numRouters = this->numGroups_ * this->numChassisPerGroup_ * this->numBladesPerChassis_; @@ -179,14 +172,18 @@ void AsClusterDragonfly::generateLinks() // Links from routers to their local nodes. for (unsigned int i = 0; i < numRouters; i++) { // allocate structures - 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*))); + this->routers_[i]->myNodes_ = static_cast( + xbt_malloc0(numLinksperLink_ * this->numNodesPerBlade_ * sizeof(surf::LinkImpl*))); + this->routers_[i]->greenLinks_ = + static_cast(xbt_malloc0(this->numBladesPerChassis_ * sizeof(surf::LinkImpl*))); + this->routers_[i]->blackLinks_ = + static_cast(xbt_malloc0(this->numChassisPerGroup_ * sizeof(surf::LinkImpl*))); 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); + std::string id = "local_link_from_router_"+ std::to_string(i) + "_to_node_" + + std::to_string(j / numLinksperLink_) + "_" + std::to_string(uniqueId); this->createLink(id, 1, &linkup, &linkdown); + if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX) { this->routers_[i]->myNodes_[j] = linkup; this->routers_[i]->myNodes_[j + 1] = linkdown; @@ -201,8 +198,10 @@ void AsClusterDragonfly::generateLinks() for (unsigned int i = 0; i < this->numGroups_ * this->numChassisPerGroup_; i++) { for (unsigned int j = 0; j < this->numBladesPerChassis_; j++) { for (unsigned int k = j + 1; k < this->numBladesPerChassis_; k++) { - id = bprintf("green_link_in_chassis_%d_between_routers_%d_and_%d_%d", i % numChassisPerGroup_, j, k, uniqueId); + std::string id = "green_link_in_chassis_" + std::to_string(i % numChassisPerGroup_) +"_between_routers_" + + std::to_string(j) + "_and_" + std::to_string(k) + "_" + std::to_string(uniqueId); this->createLink(id, this->numLinksGreen_, &linkup, &linkdown); + this->routers_[i * numBladesPerChassis_ + j]->greenLinks_[k] = linkup; this->routers_[i * numBladesPerChassis_ + k]->greenLinks_[j] = linkdown; uniqueId++; @@ -215,8 +214,10 @@ void AsClusterDragonfly::generateLinks() for (unsigned int j = 0; j < this->numChassisPerGroup_; j++) { for (unsigned int k = j + 1; k < this->numChassisPerGroup_; k++) { for (unsigned int l = 0; l < this->numBladesPerChassis_; l++) { - id = bprintf("black_link_in_group_%d_between_chassis_%d_and_%d_blade_%d_%d", i, j, k, l, uniqueId); + std::string id = "black_link_in_group_" + std::to_string(i) + "_between_chassis_" + std::to_string(j) + + "_and_" + std::to_string(k) +"_blade_" + std::to_string(l) + "_" + std::to_string(uniqueId); this->createLink(id, this->numLinksBlack_, &linkup, &linkdown); + this->routers_[i * numBladesPerChassis_ * numChassisPerGroup_ + j * numBladesPerChassis_ + l] ->blackLinks_[k] = linkup; this->routers_[i * numBladesPerChassis_ * numChassisPerGroup_ + k * numBladesPerChassis_ + l] @@ -234,10 +235,12 @@ void AsClusterDragonfly::generateLinks() for (unsigned int j = i + 1; j < this->numGroups_; j++) { unsigned int routernumi = i * numBladesPerChassis_ * numChassisPerGroup_ + j; unsigned int routernumj = j * numBladesPerChassis_ * numChassisPerGroup_ + i; - 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->routers_[routernumi]->blueLinks_ = static_cast(xbt_malloc0(sizeof(surf::LinkImpl*))); + this->routers_[routernumj]->blueLinks_ = static_cast(xbt_malloc0(sizeof(surf::LinkImpl*))); + std::string id = "blue_link_between_group_"+ std::to_string(i) +"_and_" + std::to_string(j) +"_routers_" + + std::to_string(routernumi) + "_and_" + std::to_string(routernumj) + "_" + std::to_string(uniqueId); this->createLink(id, this->numLinksBlue_, &linkup, &linkdown); + this->routers_[routernumi]->blueLinks_[0] = linkup; this->routers_[routernumj]->blueLinks_[0] = linkdown; uniqueId++; @@ -245,7 +248,7 @@ void AsClusterDragonfly::generateLinks() } } -void AsClusterDragonfly::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* latency) +void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* latency) { // Minimal routing version. // TODO : non-minimal random one, and adaptive ? @@ -257,7 +260,7 @@ void AsClusterDragonfly::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_rout dst->id()); if ((src->id() == dst->id()) && hasLoopback_) { - std::pair info = privateLinks_.at(src->id() * linkCountPerNode_); + std::pair info = privateLinks_.at(src->id() * linkCountPerNode_); route->link_list->push_back(info.first); if (latency) @@ -265,8 +268,10 @@ void AsClusterDragonfly::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_rout return; } - unsigned int* myCoords = rankId_to_coords(src->id()); - unsigned int* targetCoords = rankId_to_coords(dst->id()); + unsigned int myCoords[4]; + rankId_to_coords(src->id(), &myCoords); + unsigned int targetCoords[4]; + rankId_to_coords(dst->id(), &targetCoords); 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]); @@ -283,7 +288,7 @@ void AsClusterDragonfly::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_rout *latency += myRouter->myNodes_[myCoords[3] * numLinksperLink_]->latency(); if (hasLimiter_) { // limiter for sender - std::pair info = privateLinks_.at(src->id() * linkCountPerNode_ + hasLoopback_); + std::pair info = privateLinks_.at(src->id() * linkCountPerNode_ + hasLoopback_); route->link_list->push_back(info.first); } @@ -335,7 +340,7 @@ void AsClusterDragonfly::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_rout } if (hasLimiter_) { // limiter for receiver - std::pair info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_); + std::pair info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_); route->link_list->push_back(info.first); } @@ -343,9 +348,6 @@ void AsClusterDragonfly::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_rout route->link_list->push_back(targetRouter->myNodes_[targetCoords[3] * numLinksperLink_ + numLinksperLink_ - 1]); if (latency) *latency += targetRouter->myNodes_[targetCoords[3] * numLinksperLink_ + numLinksperLink_ - 1]->latency(); - - xbt_free(myCoords); - xbt_free(targetCoords); } } }