X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9caf173e476622d309cc5653a83d224d05787cc7..7b4d2c4a1c1c667a0a5676dff5dffe6cb6b8aced:/src/kernel/routing/DragonflyZone.cpp diff --git a/src/kernel/routing/DragonflyZone.cpp b/src/kernel/routing/DragonflyZone.cpp index 7ae3e78d0b..911f9506d6 100644 --- a/src/kernel/routing/DragonflyZone.cpp +++ b/src/kernel/routing/DragonflyZone.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-2019. 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. */ @@ -18,28 +18,20 @@ namespace simgrid { namespace kernel { namespace routing { -DragonflyZone::DragonflyZone(NetZone* father, std::string name) : ClusterZone(father, name) +DragonflyZone::DragonflyZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel) + : ClusterZone(father, name, netmodel) { } -DragonflyZone::~DragonflyZone() -{ - if (this->routers_ != nullptr) { - for (unsigned int i = 0; i < this->num_groups_ * this->num_chassis_per_group_ * this->num_blades_per_chassis_; i++) - delete routers_[i]; - delete[] routers_; - } -} - -void DragonflyZone::rankId_to_coords(int rankId, unsigned int (*coords)[4]) +void DragonflyZone::rankId_to_coords(int rankId, unsigned int coords[4]) { // coords : group, chassis, blade, node - (*coords)[0] = rankId / (num_chassis_per_group_ * num_blades_per_chassis_ * num_nodes_per_blade_); - rankId = rankId % (num_chassis_per_group_ * num_blades_per_chassis_ * num_nodes_per_blade_); - (*coords)[1] = rankId / (num_blades_per_chassis_ * num_nodes_per_blade_); - rankId = rankId % (num_blades_per_chassis_ * num_nodes_per_blade_); - (*coords)[2] = rankId / num_nodes_per_blade_; - (*coords)[3] = rankId % num_nodes_per_blade_; + coords[0] = rankId / (num_chassis_per_group_ * num_blades_per_chassis_ * num_nodes_per_blade_); + rankId = rankId % (num_chassis_per_group_ * num_blades_per_chassis_ * num_nodes_per_blade_); + coords[1] = rankId / (num_blades_per_chassis_ * num_nodes_per_blade_); + rankId = rankId % (num_blades_per_chassis_ * num_nodes_per_blade_); + coords[2] = rankId / num_nodes_per_blade_; + coords[3] = rankId % num_nodes_per_blade_; } void DragonflyZone::parse_specific_arguments(ClusterCreationArgs* cluster) @@ -113,10 +105,11 @@ void DragonflyZone::parse_specific_arguments(ClusterCreationArgs* cluster) 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->sharing_policy_ = cluster->sharing_policy; + if (cluster->sharing_policy == s4u::Link::SharingPolicy::SPLITDUPLEX) this->num_links_per_link_ = 2; - - this->cluster_ = cluster; + this->bw_ = cluster->bw; + this->lat_ = cluster->lat; } /* Generate the cluster once every node is created */ @@ -126,83 +119,65 @@ void DragonflyZone::seal() return; } - this->generateRouters(); - this->generateLinks(); + this->generate_routers(); + this->generate_links(); } -DragonflyRouter::DragonflyRouter(int group, int chassis, int blade) : group_(group), chassis_(chassis), blade_(blade) +void DragonflyZone::generate_routers() { + this->routers_.reserve(this->num_groups_ * this->num_chassis_per_group_ * this->num_blades_per_chassis_); + for (unsigned int i = 0; i < this->num_groups_; i++) + for (unsigned int j = 0; j < this->num_chassis_per_group_; j++) + for (unsigned int k = 0; k < this->num_blades_per_chassis_; k++) + this->routers_.emplace_back(i, j, k); } -DragonflyRouter::~DragonflyRouter() -{ - delete[] my_nodes_; - delete[] green_links_; - delete[] black_links_; - delete blue_links_; -} - -void DragonflyZone::generateRouters() -{ - this->routers_ = - new DragonflyRouter*[this->num_groups_ * this->num_chassis_per_group_ * this->num_blades_per_chassis_]; - - for (unsigned int i = 0; i < this->num_groups_; i++) { - for (unsigned int j = 0; j < this->num_chassis_per_group_; j++) { - for (unsigned int k = 0; k < this->num_blades_per_chassis_; k++) { - DragonflyRouter* router = new DragonflyRouter(i, j, k); - this->routers_[i * this->num_chassis_per_group_ * this->num_blades_per_chassis_ + - j * this->num_blades_per_chassis_ + k] = router; - } - } - } -} - -void DragonflyZone::createLink(const std::string& id, int numlinks, surf::LinkImpl** linkup, surf::LinkImpl** linkdown) +void DragonflyZone::create_link(const std::string& id, int numlinks, resource::LinkImpl** linkup, + resource::LinkImpl** linkdown) { *linkup = nullptr; *linkdown = nullptr; 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; + linkTemplate.bandwidth = this->bw_ * numlinks; + linkTemplate.latency = this->lat_; + linkTemplate.policy = this->sharing_policy_; + linkTemplate.id = std::move(id); sg_platf_new_link(&linkTemplate); - 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 ? + XBT_DEBUG("Generating link %s", linkTemplate.id.c_str()); + resource::LinkImpl* link; + if (this->sharing_policy_ == s4u::Link::SharingPolicy::SPLITDUPLEX) { + *linkup = s4u::Link::by_name(linkTemplate.id + "_UP")->get_impl(); // check link? + *linkdown = s4u::Link::by_name(linkTemplate.id + "_DOWN")->get_impl(); // check link ? } else { - link = surf::LinkImpl::byName(linkTemplate.id); + link = s4u::Link::by_name(linkTemplate.id)->get_impl(); *linkup = link; *linkdown = link; } } -void DragonflyZone::generateLinks() +void DragonflyZone::generate_links() { static int uniqueId = 0; - surf::LinkImpl* linkup; - surf::LinkImpl* linkdown; + resource::LinkImpl* linkup; + resource::LinkImpl* linkdown; unsigned int numRouters = this->num_groups_ * this->num_chassis_per_group_ * this->num_blades_per_chassis_; // Links from routers to their local nodes. for (unsigned int i = 0; i < numRouters; i++) { // allocate structures - this->routers_[i]->my_nodes_ = new surf::LinkImpl*[num_links_per_link_ * this->num_nodes_per_blade_]; - this->routers_[i]->green_links_ = new surf::LinkImpl*[this->num_blades_per_chassis_]; - this->routers_[i]->black_links_ = new surf::LinkImpl*[this->num_chassis_per_group_]; + this->routers_[i].my_nodes_.resize(num_links_per_link_ * this->num_nodes_per_blade_); + this->routers_[i].green_links_.resize(this->num_blades_per_chassis_); + this->routers_[i].black_links_.resize(this->num_chassis_per_group_); for (unsigned int j = 0; j < num_links_per_link_ * this->num_nodes_per_blade_; j += num_links_per_link_) { std::string id = "local_link_from_router_" + std::to_string(i) + "_to_node_" + std::to_string(j / num_links_per_link_) + "_" + std::to_string(uniqueId); - this->createLink(id, 1, &linkup, &linkdown); + this->create_link(id, 1, &linkup, &linkdown); - this->routers_[i]->my_nodes_[j] = linkup; - if (this->cluster_->sharing_policy == SURF_LINK_SPLITDUPLEX) - this->routers_[i]->my_nodes_[j + 1] = linkdown; + this->routers_[i].my_nodes_[j] = linkup; + if (this->sharing_policy_ == s4u::Link::SharingPolicy::SPLITDUPLEX) + this->routers_[i].my_nodes_[j + 1] = linkdown; uniqueId++; } @@ -214,10 +189,10 @@ void DragonflyZone::generateLinks() for (unsigned int k = j + 1; k < this->num_blades_per_chassis_; k++) { std::string id = "green_link_in_chassis_" + std::to_string(i % num_chassis_per_group_) + "_between_routers_" + std::to_string(j) + "_and_" + std::to_string(k) + "_" + std::to_string(uniqueId); - this->createLink(id, this->num_links_green_, &linkup, &linkdown); + this->create_link(id, this->num_links_green_, &linkup, &linkdown); - this->routers_[i * num_blades_per_chassis_ + j]->green_links_[k] = linkup; - this->routers_[i * num_blades_per_chassis_ + k]->green_links_[j] = linkdown; + this->routers_[i * num_blades_per_chassis_ + j].green_links_[k] = linkup; + this->routers_[i * num_blades_per_chassis_ + k].green_links_[j] = linkdown; uniqueId++; } } @@ -230,12 +205,12 @@ void DragonflyZone::generateLinks() for (unsigned int l = 0; l < this->num_blades_per_chassis_; l++) { 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->num_links_black_, &linkup, &linkdown); + this->create_link(id, this->num_links_black_, &linkup, &linkdown); this->routers_[i * num_blades_per_chassis_ * num_chassis_per_group_ + j * num_blades_per_chassis_ + l] - ->black_links_[k] = linkup; + .black_links_[k] = linkup; this->routers_[i * num_blades_per_chassis_ * num_chassis_per_group_ + k * num_blades_per_chassis_ + l] - ->black_links_[j] = linkdown; + .black_links_[j] = linkdown; uniqueId++; } } @@ -249,60 +224,58 @@ void DragonflyZone::generateLinks() for (unsigned int j = i + 1; j < this->num_groups_; j++) { unsigned int routernumi = i * num_blades_per_chassis_ * num_chassis_per_group_ + j; unsigned int routernumj = j * num_blades_per_chassis_ * num_chassis_per_group_ + i; - this->routers_[routernumi]->blue_links_ = new surf::LinkImpl*; - this->routers_[routernumj]->blue_links_ = 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->num_links_blue_, &linkup, &linkdown); + this->create_link(id, this->num_links_blue_, &linkup, &linkdown); - this->routers_[routernumi]->blue_links_[0] = linkup; - this->routers_[routernumj]->blue_links_[0] = linkdown; + this->routers_[routernumi].blue_link_ = linkup; + this->routers_[routernumj].blue_link_ = linkdown; uniqueId++; } } } -void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* latency) +void DragonflyZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* latency) { // Minimal routing version. // TODO : non-minimal random one, and adaptive ? - if (dst->isRouter() || src->isRouter()) + if (dst->is_router() || src->is_router()) return; XBT_VERB("dragonfly getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id()); if ((src->id() == dst->id()) && has_loopback_) { - std::pair info = private_links_.at(nodePosition(src->id())); + std::pair info = private_links_.at(node_pos(src->id())); route->link_list.push_back(info.first); if (latency) - *latency += info.first->latency(); + *latency += info.first->get_latency(); return; } unsigned int myCoords[4]; - rankId_to_coords(src->id(), &myCoords); + rankId_to_coords(src->id(), myCoords); unsigned int targetCoords[4]; - rankId_to_coords(dst->id(), &targetCoords); + 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]); - DragonflyRouter* myRouter = routers_[myCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + - myCoords[1] * num_blades_per_chassis_ + myCoords[2]]; - DragonflyRouter* targetRouter = routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + - targetCoords[1] * num_blades_per_chassis_ + targetCoords[2]]; + DragonflyRouter* myRouter = &routers_[myCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + + myCoords[1] * num_blades_per_chassis_ + myCoords[2]]; + DragonflyRouter* targetRouter = &routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + + targetCoords[1] * num_blades_per_chassis_ + targetCoords[2]]; DragonflyRouter* currentRouter = myRouter; // node->router local link route->link_list.push_back(myRouter->my_nodes_[myCoords[3] * num_links_per_link_]); if (latency) - *latency += myRouter->my_nodes_[myCoords[3] * num_links_per_link_]->latency(); + *latency += myRouter->my_nodes_[myCoords[3] * num_links_per_link_]->get_latency(); if (has_limiter_) { // limiter for sender - std::pair info = private_links_.at(nodePositionWithLoopback(src->id())); + std::pair info = private_links_.at(node_pos_with_loopback(src->id())); route->link_list.push_back(info.first); } @@ -315,51 +288,51 @@ void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArg // go to the nth router in our chassis route->link_list.push_back(currentRouter->green_links_[targetCoords[0]]); if (latency) - *latency += currentRouter->green_links_[targetCoords[0]]->latency(); - currentRouter = routers_[myCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + - myCoords[1] * num_blades_per_chassis_ + targetCoords[0]]; + *latency += currentRouter->green_links_[targetCoords[0]]->get_latency(); + currentRouter = &routers_[myCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + + myCoords[1] * num_blades_per_chassis_ + targetCoords[0]]; } if (currentRouter->chassis_ != 0) { // go to the first chassis of our group route->link_list.push_back(currentRouter->black_links_[0]); if (latency) - *latency += currentRouter->black_links_[0]->latency(); - currentRouter = routers_[myCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + targetCoords[0]]; + *latency += currentRouter->black_links_[0]->get_latency(); + currentRouter = &routers_[myCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + targetCoords[0]]; } // go to destination group - the only optical hop - route->link_list.push_back(currentRouter->blue_links_[0]); + route->link_list.push_back(currentRouter->blue_link_); if (latency) - *latency += currentRouter->blue_links_[0]->latency(); - currentRouter = routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + myCoords[0]]; + *latency += currentRouter->blue_link_->get_latency(); + currentRouter = &routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + myCoords[0]]; } // same group, but same blade ? if (targetRouter->blade_ != currentRouter->blade_) { route->link_list.push_back(currentRouter->green_links_[targetCoords[2]]); if (latency) - *latency += currentRouter->green_links_[targetCoords[2]]->latency(); - currentRouter = routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + targetCoords[2]]; + *latency += currentRouter->green_links_[targetCoords[2]]->get_latency(); + currentRouter = &routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + targetCoords[2]]; } // same blade, but same chassis ? if (targetRouter->chassis_ != currentRouter->chassis_) { route->link_list.push_back(currentRouter->black_links_[targetCoords[1]]); if (latency) - *latency += currentRouter->black_links_[targetCoords[1]]->latency(); + *latency += currentRouter->black_links_[targetCoords[1]]->get_latency(); } } if (has_limiter_) { // limiter for receiver - std::pair info = private_links_.at(nodePositionWithLoopback(dst->id())); + std::pair info = private_links_.at(node_pos_with_loopback(dst->id())); route->link_list.push_back(info.first); } // router->node local link route->link_list.push_back(targetRouter->my_nodes_[targetCoords[3] * num_links_per_link_ + num_links_per_link_ - 1]); if (latency) - *latency += targetRouter->my_nodes_[targetCoords[3] * num_links_per_link_ + num_links_per_link_ - 1]->latency(); + *latency += targetRouter->my_nodes_[targetCoords[3] * num_links_per_link_ + num_links_per_link_ - 1]->get_latency(); } } }