A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
snake_case routing::NetPoint
[simgrid.git]
/
src
/
kernel
/
routing
/
DragonflyZone.cpp
diff --git
a/src/kernel/routing/DragonflyZone.cpp
b/src/kernel/routing/DragonflyZone.cpp
index
d7bc1a1
..
a5a268d
100644
(file)
--- a/
src/kernel/routing/DragonflyZone.cpp
+++ b/
src/kernel/routing/DragonflyZone.cpp
@@
-18,9
+18,7
@@
namespace simgrid {
namespace kernel {
namespace routing {
namespace kernel {
namespace routing {
-DragonflyZone::DragonflyZone(NetZone* father, std::string name) : ClusterZone(father, name)
-{
-}
+DragonflyZone::DragonflyZone(NetZoneImpl* father, std::string name) : ClusterZone(father, name) {}
DragonflyZone::~DragonflyZone()
{
DragonflyZone::~DragonflyZone()
{
@@
-31,15
+29,15
@@
DragonflyZone::~DragonflyZone()
}
}
}
}
-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 : 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)
}
void DragonflyZone::parse_specific_arguments(ClusterCreationArgs* cluster)
@@
-113,10
+111,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]);
}
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->num_links_per_link_ = 2;
-
- this->
cluster_ = cluster
;
+ this->bw_ = cluster->bw;
+ this->
lat_ = cluster->lat
;
}
/* Generate the cluster once every node is created */
}
/* Generate the cluster once every node is created */
@@
-126,8
+125,8
@@
void DragonflyZone::seal()
return;
}
return;
}
- this->generate
R
outers();
- this->generate
L
inks();
+ this->generate
_r
outers();
+ this->generate
_l
inks();
}
DragonflyRouter::DragonflyRouter(int group, int chassis, int blade) : group_(group), chassis_(chassis), blade_(blade)
}
DragonflyRouter::DragonflyRouter(int group, int chassis, int blade) : group_(group), chassis_(chassis), blade_(blade)
@@
-142,7
+141,7
@@
DragonflyRouter::~DragonflyRouter()
delete blue_links_;
}
delete blue_links_;
}
-void DragonflyZone::generate
R
outers()
+void DragonflyZone::generate
_r
outers()
{
this->routers_ =
new DragonflyRouter*[this->num_groups_ * this->num_chassis_per_group_ * this->num_blades_per_chassis_];
{
this->routers_ =
new DragonflyRouter*[this->num_groups_ * this->num_chassis_per_group_ * this->num_blades_per_chassis_];
@@
-158,50
+157,51
@@
void DragonflyZone::generateRouters()
}
}
}
}
-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;
{
*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.bandwidth = this->
bw_
* numlinks;
+ linkTemplate.latency = this->
lat_
;
+ linkTemplate.policy = this->
sharing_policy_;
linkTemplate.id = id;
sg_platf_new_link(&linkTemplate);
XBT_DEBUG("Generating link %s", id.c_str());
linkTemplate.id = 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 = s
urf::LinkImpl::byName(linkTemplate.id + "_UP"
); // check link?
- *linkdown = s
urf::LinkImpl::byName(linkTemplate.id + "_DOWN"
); // check link ?
+
resource
::LinkImpl* link;
+ if (this->
sharing_policy_ == s4u::Link::SharingPolicy::
SPLITDUPLEX) {
+ *linkup = s
4u::Link::by_name(linkTemplate.id + "_UP")->get_impl(
); // check link?
+ *linkdown = s
4u::Link::by_name(linkTemplate.id + "_DOWN")->get_impl(
); // check link ?
} else {
} else {
- link = s
urf::LinkImpl::byName(linkTemplate.id
);
+ link = s
4u::Link::by_name(linkTemplate.id)->get_impl(
);
*linkup = link;
*linkdown = link;
}
}
*linkup = link;
*linkdown = link;
}
}
-void DragonflyZone::generate
L
inks()
+void DragonflyZone::generate
_l
inks()
{
static int uniqueId = 0;
{
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
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_ = new
resource
::LinkImpl*[num_links_per_link_ * this->num_nodes_per_blade_];
+ this->routers_[i]->green_links_ = new
resource
::LinkImpl*[this->num_blades_per_chassis_];
+ this->routers_[i]->black_links_ = new
resource
::LinkImpl*[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);
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->create
L
ink(id, 1, &linkup, &linkdown);
+ this->create
_l
ink(id, 1, &linkup, &linkdown);
this->routers_[i]->my_nodes_[j] = linkup;
this->routers_[i]->my_nodes_[j] = linkup;
- if (this->
cluster_->sharing_policy == SURF_LINK_
SPLITDUPLEX)
+ if (this->
sharing_policy_ == s4u::Link::SharingPolicy::
SPLITDUPLEX)
this->routers_[i]->my_nodes_[j + 1] = linkdown;
uniqueId++;
this->routers_[i]->my_nodes_[j + 1] = linkdown;
uniqueId++;
@@
-214,7
+214,7
@@
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);
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->create
L
ink(id, this->num_links_green_, &linkup, &linkdown);
+ this->create
_l
ink(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;
@@
-230,7
+230,7
@@
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);
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->create
L
ink(id, this->num_links_black_, &linkup, &linkdown);
+ this->create
_l
ink(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;
this->routers_[i * num_blades_per_chassis_ * num_chassis_per_group_ + j * num_blades_per_chassis_ + l]
->black_links_[k] = linkup;
@@
-249,11
+249,11
@@
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;
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*;
+ this->routers_[routernumi]->blue_links_ = new
resource
::LinkImpl*;
+ this->routers_[routernumj]->blue_links_ = new
resource
::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);
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->create
L
ink(id, this->num_links_blue_, &linkup, &linkdown);
+ this->create
_l
ink(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_links_[0] = linkup;
this->routers_[routernumj]->blue_links_[0] = linkdown;
@@
-262,7
+262,7
@@
void DragonflyZone::generateLinks()
}
}
}
}
-void DragonflyZone::get
LocalR
oute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* latency)
+void DragonflyZone::get
_local_r
oute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* latency)
{
// Minimal routing version.
// TODO : non-minimal random one, and adaptive ?
{
// Minimal routing version.
// TODO : non-minimal random one, and adaptive ?
@@
-274,18
+274,18
@@
void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArg
dst->id());
if ((src->id() == dst->id()) && has_loopback_) {
dst->id());
if ((src->id() == dst->id()) && has_loopback_) {
- std::pair<
surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(nodePosition
(src->id()));
+ std::pair<
resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos
(src->id()));
route->link_list.push_back(info.first);
if (latency)
route->link_list.push_back(info.first);
if (latency)
- *latency += info.first->latency();
+ *latency += info.first->
get_
latency();
return;
}
unsigned int myCoords[4];
return;
}
unsigned int myCoords[4];
- rankId_to_coords(src->id(),
&
myCoords);
+ rankId_to_coords(src->id(), myCoords);
unsigned int targetCoords[4];
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]);
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]);
@@
-299,10
+299,10
@@
void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArg
// node->router local link
route->link_list.push_back(myRouter->my_nodes_[myCoords[3] * num_links_per_link_]);
if (latency)
// 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
if (has_limiter_) { // limiter for sender
- std::pair<
surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(nodePositionWithL
oopback(src->id()));
+ std::pair<
resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos_with_l
oopback(src->id()));
route->link_list.push_back(info.first);
}
route->link_list.push_back(info.first);
}
@@
-315,7
+315,7
@@
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)
// 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();
+ *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]];
}
currentRouter = routers_[myCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) +
myCoords[1] * num_blades_per_chassis_ + targetCoords[0]];
}
@@
-324,14
+324,14
@@
void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArg
// go to the first chassis of our group
route->link_list.push_back(currentRouter->black_links_[0]);
if (latency)
// 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();
+ *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]);
if (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]);
if (latency)
- *latency += currentRouter->blue_links_[0]->latency();
+ *latency += currentRouter->blue_links_[0]->
get_
latency();
currentRouter = routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + myCoords[0]];
}
currentRouter = routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + myCoords[0]];
}
@@
-339,7
+339,7
@@
void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArg
if (targetRouter->blade_ != currentRouter->blade_) {
route->link_list.push_back(currentRouter->green_links_[targetCoords[2]]);
if (latency)
if (targetRouter->blade_ != currentRouter->blade_) {
route->link_list.push_back(currentRouter->green_links_[targetCoords[2]]);
if (latency)
- *latency += currentRouter->green_links_[targetCoords[2]]->latency();
+ *latency += currentRouter->green_links_[targetCoords[2]]->
get_
latency();
currentRouter = routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + targetCoords[2]];
}
currentRouter = routers_[targetCoords[0] * (num_chassis_per_group_ * num_blades_per_chassis_) + targetCoords[2]];
}
@@
-347,19
+347,19
@@
void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArg
if (targetRouter->chassis_ != currentRouter->chassis_) {
route->link_list.push_back(currentRouter->black_links_[targetCoords[1]]);
if (latency)
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
}
}
if (has_limiter_) { // limiter for receiver
- std::pair<
surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(nodePositionWithL
oopback(dst->id()));
+ std::pair<
resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos_with_l
oopback(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)
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();
}
}
}
}
}
}