-/* 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. */
namespace kernel {
namespace routing {
-DragonflyZone::DragonflyZone(NetZone* father, const char* name) : ClusterZone(father, name)
+DragonflyZone::DragonflyZone(NetZone* father, std::string name) : ClusterZone(father, name)
{
}
}
}
-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 = (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 DragonflyZone::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster)
+void DragonflyZone::parse_specific_arguments(ClusterCreationArgs* cluster)
{
std::vector<std::string> parameters;
std::vector<std::string> tmp;
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(","));
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;
}
}
}
-void DragonflyZone::createLink(char* 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;
linkTemplate.bandwidth = this->cluster_->bw * numlinks;
linkTemplate.latency = this->cluster_->lat;
linkTemplate.policy = this->cluster_->sharing_policy; // sthg to do with that ?
- linkTemplate.id = std::string(id);
+ linkTemplate.id = id;
sg_platf_new_link(&linkTemplate);
- XBT_DEBUG("Generating link %s", id);
+ 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 = surf::LinkImpl::byName(tmpID.c_str());
+ tmpID = linkTemplate.id + "_UP";
+ link = surf::LinkImpl::byName(tmpID);
*linkup = link; // check link?
- tmpID = std::string(linkTemplate.id) + "_DOWN";
- link = surf::LinkImpl::byName(tmpID.c_str());
+ tmpID = linkTemplate.id + "_DOWN";
+ 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;
}
static_cast<surf::LinkImpl**>(xbt_malloc0(this->numChassisPerGroup_ * sizeof(surf::LinkImpl*)));
for (unsigned int j = 0; j < numLinksperLink_ * this->numNodesPerBlade_; j += numLinksperLink_) {
- char* 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);
- xbt_free(id);
+
if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX) {
this->routers_[i]->myNodes_[j] = linkup;
this->routers_[i]->myNodes_[j + 1] = linkdown;
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++) {
- char* 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);
- xbt_free(id);
+
this->routers_[i * numBladesPerChassis_ + j]->greenLinks_[k] = linkup;
this->routers_[i * numBladesPerChassis_ + k]->greenLinks_[j] = linkdown;
uniqueId++;
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++) {
- char* 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);
- xbt_free(id);
+
this->routers_[i * numBladesPerChassis_ * numChassisPerGroup_ + j * numBladesPerChassis_ + l]
->blackLinks_[k] = linkup;
this->routers_[i * numBladesPerChassis_ * numChassisPerGroup_ + k * numBladesPerChassis_ + l]
unsigned int routernumj = j * numBladesPerChassis_ * numChassisPerGroup_ + i;
this->routers_[routernumi]->blueLinks_ = static_cast<surf::LinkImpl**>(xbt_malloc0(sizeof(surf::LinkImpl*)));
this->routers_[routernumj]->blueLinks_ = static_cast<surf::LinkImpl**>(xbt_malloc0(sizeof(surf::LinkImpl*)));
- char* id = bprintf("blue_link_between_group_%d_and_%d_routers_%d_and_%d_%d", i, j, routernumi, routernumj, 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->createLink(id, this->numLinksBlue_, &linkup, &linkdown);
- xbt_free(id);
+
this->routers_[routernumi]->blueLinks_[0] = linkup;
this->routers_[routernumj]->blueLinks_[0] = linkdown;
uniqueId++;
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<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(src->id() * linkCountPerNode_);
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(nodePosition(src->id()));
route->link_list->push_back(info.first);
if (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]);
*latency += myRouter->myNodes_[myCoords[3] * numLinksperLink_]->latency();
if (hasLimiter_) { // limiter for sender
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(src->id() * linkCountPerNode_ + hasLoopback_);
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(nodePositionWithLoopback(src->id()));
route->link_list->push_back(info.first);
}
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<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_);
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(nodePositionWithLoopback(dst->id()));
route->link_list->push_back(info.first);
}
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);
}
}
}
