X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a18117755285a374ec3d5830309c924f2830e3ba..de57b34916659892d2dc26edabf552253afe2c18:/src/kernel/routing/DragonflyZone.cpp diff --git a/src/kernel/routing/DragonflyZone.cpp b/src/kernel/routing/DragonflyZone.cpp index 146e00781f..6b6f2c7229 100644 --- a/src/kernel/routing/DragonflyZone.cpp +++ b/src/kernel/routing/DragonflyZone.cpp @@ -1,14 +1,15 @@ -/* Copyright (c) 2014-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * 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,41 +17,37 @@ namespace simgrid { namespace kernel { namespace routing { -AsClusterDragonfly::AsClusterDragonfly(As* father, const char* name) : AsCluster(father, name) +DragonflyZone::DragonflyZone(NetZone* father, std::string 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++) - delete (routers_[i]); - xbt_free(routers_); + delete routers_[i]; + delete[] routers_; } } -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(ClusterCreationArgs* cluster) { std::vector parameters; std::vector tmp; boost::split(parameters, cluster->topo_parameters, boost::is_any_of(";")); - // TODO : we have to check for zeros and negative numbers, or it might crash - if (parameters.size() != 4) { + if (parameters.size() != 4 || parameters.empty()) { surf_parse_error( "Dragonfly are defined by the number of groups, chassis per groups, blades per chassis, nodes per blade"); } @@ -61,17 +58,34 @@ void AsClusterDragonfly::parse_specific_arguments(sg_platf_cluster_cbarg_t clust surf_parse_error("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element"); } - this->numGroups_ = xbt_str_parse_int(tmp[0].c_str(), "Invalid number of groups: %s"); - this->numLinksBlue_ = xbt_str_parse_int(tmp[1].c_str(), "Invalid number of links for the blue level: %s"); + try { + this->numGroups_ = std::stoi(tmp[0]); + } catch (std::invalid_argument& ia) { + throw std::invalid_argument(std::string("Invalid number of groups:") + tmp[0]); + } + try { + this->numLinksBlue_ = std::stoi(tmp[1]); + } catch (std::invalid_argument& ia) { + throw std::invalid_argument(std::string("Invalid number of links for the blue level:") + tmp[1]); + } // Black network : number of chassis/group, number of links between each router on the black network boost::split(tmp, parameters[1], boost::is_any_of(",")); if (tmp.size() != 2) { surf_parse_error("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element"); } - this->numChassisPerGroup_ = xbt_str_parse_int(tmp[0].c_str(), "Invalid number of groups: %s"); - this->numLinksBlack_ = xbt_str_parse_int(tmp[1].c_str(), "Invalid number of links for the black level: %s"); + try { + this->numChassisPerGroup_ = std::stoi(tmp[0]); + } catch (std::invalid_argument& ia) { + throw std::invalid_argument(std::string("Invalid number of groups:") + tmp[0]); + } + + try { + this->numLinksBlack_ = std::stoi(tmp[1]); + } catch (std::invalid_argument& ia) { + throw std::invalid_argument(std::string("Invalid number of links for the black level:") + tmp[1]); + } // Green network : number of blades/chassis, number of links between each router on the green network boost::split(tmp, parameters[2], boost::is_any_of(",")); @@ -79,19 +93,33 @@ void AsClusterDragonfly::parse_specific_arguments(sg_platf_cluster_cbarg_t clust surf_parse_error("Dragonfly topologies are defined by 3 levels with 2 elements each, and one with one element"); } - this->numBladesPerChassis_ = xbt_str_parse_int(tmp[0].c_str(), "Invalid number of groups: %s"); - this->numLinksGreen_ = xbt_str_parse_int(tmp[1].c_str(), "Invalid number of links for the green level: %s"); + try { + this->numBladesPerChassis_ = std::stoi(tmp[0]); + } catch (std::invalid_argument& ia) { + throw std::invalid_argument(std::string("Invalid number of groups:") + tmp[0]); + } + + try { + this->numLinksGreen_ = std::stoi(tmp[1]); + } catch (std::invalid_argument& ia) { + throw std::invalid_argument(std::string("Invalid number of links for the green level:") + tmp[1]); + } // The last part of topo_parameters should be the number of nodes per blade - this->numNodesPerBlade_ = - xbt_str_parse_int(parameters[3].c_str(), "Last parameter is not the amount of nodes per blade: %s"); + try { + this->numNodesPerBlade_ = std::stoi(parameters[3]); + } catch (std::invalid_argument& ia) { + throw std::invalid_argument(std::string("Last parameter is not the amount of nodes per blade:") + parameters[3]); + } + + if (cluster->sharing_policy == SURF_LINK_SPLITDUPLEX) + this->numLinksperLink_ = 2; + this->cluster_ = cluster; } -/* -* Generate the cluster once every node is created -*/ -void AsClusterDragonfly::seal() +/* Generate the cluster once every node is created */ +void DragonflyZone::seal() { if (this->numNodesPerBlade_ == 0) { return; @@ -107,20 +135,15 @@ DragonflyRouter::DragonflyRouter(int group, int chassis, int blade) : group_(gro DragonflyRouter::~DragonflyRouter() { - if (this->myNodes_ != nullptr) - xbt_free(myNodes_); - if (this->greenLinks_ != nullptr) - xbt_free(greenLinks_); - if (this->blackLinks_ != nullptr) - xbt_free(blackLinks_); - if (this->blueLinks_ != nullptr) - xbt_free(blueLinks_); + delete[] myNodes_; + delete[] greenLinks_; + delete[] blackLinks_; + delete blueLinks_; } -void AsClusterDragonfly::generateRouters() +void DragonflyZone::generateRouters() { - this->routers_ = static_cast(xbt_malloc0(this->numGroups_ * this->numChassisPerGroup_ * - this->numBladesPerChassis_ * sizeof(DragonflyRouter*))); + this->routers_ = new DragonflyRouter*[this->numGroups_ * this->numChassisPerGroup_ * this->numBladesPerChassis_]; for (unsigned int i = 0; i < this->numGroups_; i++) { for (unsigned int j = 0; j < this->numChassisPerGroup_; j++) { @@ -133,66 +156,52 @@ void AsClusterDragonfly::generateRouters() } } -void AsClusterDragonfly::createLink(char* id, int numlinks, Link** linkup, Link** linkdown) +void DragonflyZone::createLink(const 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; - std::string tmpID; - if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX) { - tmpID = std::string(linkTemplate.id) + "_UP"; - link = Link::byName(tmpID.c_str()); - *linkup = link; // check link? - tmpID = std::string(linkTemplate.id) + "_DOWN"; - link = Link::byName(tmpID.c_str()); - *linkdown = link; // check link ? + XBT_DEBUG("Generating link %s", id.c_str()); + surf::LinkImpl* link; + if (this->cluster_->sharing_policy == SURF_LINK_SPLITDUPLEX) { + *linkup = surf::LinkImpl::byName(linkTemplate.id + "_UP"); // check link? + *linkdown = surf::LinkImpl::byName(linkTemplate.id + "_DOWN"); // check link ? } else { - link = Link::byName(linkTemplate.id); + link = surf::LinkImpl::byName(linkTemplate.id); *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_; - if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX) - numLinksperLink_ = 2; - // 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_ = new surf::LinkImpl*[numLinksperLink_ * this->numNodesPerBlade_]; + this->routers_[i]->greenLinks_ = new surf::LinkImpl*[this->numBladesPerChassis_]; + this->routers_[i]->blackLinks_ = new surf::LinkImpl*[this->numChassisPerGroup_]; 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] = linkup; + if (this->cluster_->sharing_policy == SURF_LINK_SPLITDUPLEX) this->routers_[i]->myNodes_[j + 1] = linkdown; - } else { - this->routers_[i]->myNodes_[j] = linkup; - } + uniqueId++; } } @@ -201,8 +210,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 +226,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 +247,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_ = new surf::LinkImpl*; + this->routers_[routernumj]->blueLinks_ = new 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 +260,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, RouteCreationArgs* route, double* latency) { // Minimal routing version. // TODO : non-minimal random one, and adaptive ? @@ -253,20 +268,21 @@ void AsClusterDragonfly::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_rout if (dst->isRouter() || src->isRouter()) return; - XBT_VERB("dragonfly getLocalRout from '%s'[%d] to '%s'[%d]", src->name().c_str(), src->id(), dst->name().c_str(), - dst->id()); + XBT_VERB("dragonfly getLocalRoute from '%s'[%u] to '%s'[%u]", src->getCname(), src->id(), dst->getCname(), dst->id()); if ((src->id() == dst->id()) && hasLoopback_) { - std::pair info = privateLinks_.at(src->id() * linkCountPerNode_); + std::pair info = privateLinks_.at(nodePosition(src->id())); - route->link_list->push_back(info.first); + route->link_list.push_back(info.first); if (latency) *latency += info.first->latency(); 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]); @@ -278,13 +294,13 @@ void AsClusterDragonfly::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_rout DragonflyRouter* currentRouter = myRouter; // node->router local link - route->link_list->push_back(myRouter->myNodes_[myCoords[3] * numLinksperLink_]); + route->link_list.push_back(myRouter->myNodes_[myCoords[3] * numLinksperLink_]); if (latency) *latency += myRouter->myNodes_[myCoords[3] * numLinksperLink_]->latency(); if (hasLimiter_) { // limiter for sender - std::pair info = privateLinks_.at(src->id() * linkCountPerNode_ + hasLoopback_); - route->link_list->push_back(info.first); + std::pair info = privateLinks_.at(nodePositionWithLoopback(src->id())); + route->link_list.push_back(info.first); } if (targetRouter != myRouter) { @@ -294,7 +310,7 @@ void AsClusterDragonfly::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_rout // go to the router of our group connected to this one. if (currentRouter->blade_ != targetCoords[0]) { // go to the nth router in our chassis - route->link_list->push_back(currentRouter->greenLinks_[targetCoords[0]]); + route->link_list.push_back(currentRouter->greenLinks_[targetCoords[0]]); if (latency) *latency += currentRouter->greenLinks_[targetCoords[0]]->latency(); currentRouter = routers_[myCoords[0] * (numChassisPerGroup_ * numBladesPerChassis_) + @@ -303,14 +319,14 @@ void AsClusterDragonfly::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_rout if (currentRouter->chassis_ != 0) { // go to the first chassis of our group - route->link_list->push_back(currentRouter->blackLinks_[0]); + route->link_list.push_back(currentRouter->blackLinks_[0]); if (latency) *latency += currentRouter->blackLinks_[0]->latency(); currentRouter = routers_[myCoords[0] * (numChassisPerGroup_ * numBladesPerChassis_) + targetCoords[0]]; } // go to destination group - the only optical hop - route->link_list->push_back(currentRouter->blueLinks_[0]); + route->link_list.push_back(currentRouter->blueLinks_[0]); if (latency) *latency += currentRouter->blueLinks_[0]->latency(); currentRouter = routers_[targetCoords[0] * (numChassisPerGroup_ * numBladesPerChassis_) + myCoords[0]]; @@ -318,7 +334,7 @@ void AsClusterDragonfly::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_rout // same group, but same blade ? if (targetRouter->blade_ != currentRouter->blade_) { - route->link_list->push_back(currentRouter->greenLinks_[targetCoords[2]]); + route->link_list.push_back(currentRouter->greenLinks_[targetCoords[2]]); if (latency) *latency += currentRouter->greenLinks_[targetCoords[2]]->latency(); currentRouter = routers_[targetCoords[0] * (numChassisPerGroup_ * numBladesPerChassis_) + targetCoords[2]]; @@ -326,26 +342,21 @@ void AsClusterDragonfly::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_rout // same blade, but same chassis ? if (targetRouter->chassis_ != currentRouter->chassis_) { - route->link_list->push_back(currentRouter->blackLinks_[targetCoords[1]]); + route->link_list.push_back(currentRouter->blackLinks_[targetCoords[1]]); if (latency) *latency += currentRouter->blackLinks_[targetCoords[1]]->latency(); - currentRouter = routers_[targetCoords[0] * (numChassisPerGroup_ * numBladesPerChassis_) + - targetCoords[1] * numBladesPerChassis_ + targetCoords[2]]; } } if (hasLimiter_) { // limiter for receiver - std::pair info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_); - route->link_list->push_back(info.first); + std::pair info = privateLinks_.at(nodePositionWithLoopback(dst->id())); + route->link_list.push_back(info.first); } // router->node local link - route->link_list->push_back(targetRouter->myNodes_[targetCoords[3] * numLinksperLink_ + numLinksperLink_ - 1]); + 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); } } }