X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b96439b8b4cb4c902a9d72c9890936f14e33972a..9cca09ad88fcaeb49f2637de97df519c3920aaa4:/src/kernel/routing/DragonflyZone.cpp diff --git a/src/kernel/routing/DragonflyZone.cpp b/src/kernel/routing/DragonflyZone.cpp index 8405006ac1..38e788f480 100644 --- a/src/kernel/routing/DragonflyZone.cpp +++ b/src/kernel/routing/DragonflyZone.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -17,7 +17,7 @@ namespace simgrid { namespace kernel { namespace routing { -DragonflyZone::DragonflyZone(NetZone* father, const char* name) : ClusterZone(father, name) +DragonflyZone::DragonflyZone(NetZone* father, std::string name) : ClusterZone(father, name) { } @@ -30,28 +30,24 @@ DragonflyZone::~DragonflyZone() } } -unsigned int* DragonflyZone::rankId_to_coords(int rankId) +void DragonflyZone::rankId_to_coords(int rankId, unsigned int (*coords)[4]) { // coords : group, chassis, blade, node - unsigned int* coords = new unsigned int[4]; - 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 DragonflyZone::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"); } @@ -62,17 +58,34 @@ void DragonflyZone::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) 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(",")); @@ -80,12 +93,25 @@ void DragonflyZone::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) 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]); + } + this->cluster_ = cluster; } @@ -134,7 +160,7 @@ void DragonflyZone::generateRouters() } } -void DragonflyZone::createLink(std::string id, int numlinks, surf::LinkImpl** linkup, surf::LinkImpl** linkdown) +void DragonflyZone::createLink(const std::string& id, int numlinks, surf::LinkImpl** linkup, surf::LinkImpl** linkdown) { *linkup = nullptr; *linkdown = nullptr; @@ -149,13 +175,13 @@ void DragonflyZone::createLink(std::string id, int numlinks, surf::LinkImpl** li std::string tmpID; if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX) { tmpID = linkTemplate.id + "_UP"; - link = surf::LinkImpl::byName(tmpID.c_str()); + link = surf::LinkImpl::byName(tmpID); *linkup = link; // check link? tmpID = linkTemplate.id + "_DOWN"; - link = surf::LinkImpl::byName(tmpID.c_str()); + link = surf::LinkImpl::byName(tmpID); *linkdown = link; // check link ? } else { - link = surf::LinkImpl::byName(linkTemplate.id.c_str()); + link = surf::LinkImpl::byName(linkTemplate.id); *linkup = link; *linkdown = link; } @@ -259,11 +285,11 @@ void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_c 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(), + XBT_VERB("dragonfly getLocalRout from '%s'[%u] to '%s'[%u]", src->name().c_str(), src->id(), dst->name().c_str(), 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); if (latency) @@ -271,8 +297,10 @@ void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_c 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]); @@ -289,7 +317,7 @@ void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_c *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(nodePositionWithLoopback(src->id())); route->link_list->push_back(info.first); } @@ -335,13 +363,11 @@ void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_c 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_); + std::pair info = privateLinks_.at(nodePositionWithLoopback(dst->id())); route->link_list->push_back(info.first); } @@ -349,9 +375,6 @@ void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_c route->link_list->push_back(targetRouter->myNodes_[targetCoords[3] * numLinksperLink_ + numLinksperLink_ - 1]); if (latency) *latency += targetRouter->myNodes_[targetCoords[3] * numLinksperLink_ + numLinksperLink_ - 1]->latency(); - - delete[] myCoords; - delete[] targetCoords; } } }