/* 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. */
/* 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. */
{
if (this->routers_ != nullptr) {
for (unsigned int i = 0; i < this->numGroups_ * this->numChassisPerGroup_ * this->numBladesPerChassis_; i++)
{
if (this->routers_ != nullptr) {
for (unsigned int i = 0; i < this->numGroups_ * this->numChassisPerGroup_ * this->numBladesPerChassis_; i++)
{
// coords : group, chassis, blade, node
{
// coords : group, chassis, blade, node
{
std::vector<std::string> parameters;
std::vector<std::string> tmp;
boost::split(parameters, cluster->topo_parameters, boost::is_any_of(";"));
{
std::vector<std::string> parameters;
std::vector<std::string> tmp;
boost::split(parameters, cluster->topo_parameters, boost::is_any_of(";"));
surf_parse_error(
"Dragonfly are defined by the number of groups, chassis per groups, blades per chassis, nodes per blade");
}
surf_parse_error(
"Dragonfly are defined by the number of groups, chassis per groups, blades per chassis, nodes per blade");
}
- 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]);
+ }
// 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");
}
// 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(","));
// 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(","));
- 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]);
+ }
- 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;
+
for (unsigned int i = 0; i < this->numGroups_; i++) {
for (unsigned int j = 0; j < this->numChassisPerGroup_; j++) {
for (unsigned int i = 0; i < this->numGroups_; i++) {
for (unsigned int j = 0; j < this->numChassisPerGroup_; j++) {
-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)
sg_platf_new_link(&linkTemplate);
XBT_DEBUG("Generating link %s", id.c_str());
surf::LinkImpl* link;
sg_platf_new_link(&linkTemplate);
XBT_DEBUG("Generating link %s", id.c_str());
surf::LinkImpl* link;
- std::string tmpID;
- if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX) {
- tmpID = linkTemplate.id + "_UP";
- link = surf::LinkImpl::byName(tmpID.c_str());
- *linkup = link; // check link?
- tmpID = linkTemplate.id + "_DOWN";
- link = surf::LinkImpl::byName(tmpID.c_str());
- *linkdown = link; // check 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 ?
- this->routers_[i]->myNodes_ = static_cast<surf::LinkImpl**>(
- xbt_malloc0(numLinksperLink_ * this->numNodesPerBlade_ * sizeof(surf::LinkImpl*)));
- this->routers_[i]->greenLinks_ =
- static_cast<surf::LinkImpl**>(xbt_malloc0(this->numBladesPerChassis_ * sizeof(surf::LinkImpl*)));
- this->routers_[i]->blackLinks_ =
- static_cast<surf::LinkImpl**>(xbt_malloc0(this->numChassisPerGroup_ * sizeof(surf::LinkImpl*)));
+ 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_) {
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);
for (unsigned int j = 0; j < numLinksperLink_ * this->numNodesPerBlade_; j += numLinksperLink_) {
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)
for (unsigned int j = i + 1; j < this->numGroups_; j++) {
unsigned int routernumi = i * numBladesPerChassis_ * numChassisPerGroup_ + j;
unsigned int routernumj = j * numBladesPerChassis_ * numChassisPerGroup_ + i;
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<surf::LinkImpl**>(xbt_malloc0(sizeof(surf::LinkImpl*)));
- this->routers_[routernumj]->blueLinks_ = static_cast<surf::LinkImpl**>(xbt_malloc0(sizeof(surf::LinkImpl*)));
+ 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);
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);
-void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* 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 ?
{
// Minimal routing version.
// TODO : non-minimal random one, and adaptive ?
- 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());
- 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]);
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]);
if (latency)
*latency += myRouter->myNodes_[myCoords[3] * numLinksperLink_]->latency();
if (hasLimiter_) { // limiter for sender
if (latency)
*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_);
- route->link_list->push_back(info.first);
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(nodePositionWithLoopback(src->id()));
+ route->link_list.push_back(info.first);
// go to the router of our group connected to this one.
if (currentRouter->blade_ != targetCoords[0]) {
// go to the nth router in our chassis
// go to the router of our group connected to this one.
if (currentRouter->blade_ != targetCoords[0]) {
// go to the nth router in our chassis
if (latency)
*latency += currentRouter->greenLinks_[targetCoords[0]]->latency();
currentRouter = routers_[myCoords[0] * (numChassisPerGroup_ * numBladesPerChassis_) +
if (latency)
*latency += currentRouter->greenLinks_[targetCoords[0]]->latency();
currentRouter = routers_[myCoords[0] * (numChassisPerGroup_ * numBladesPerChassis_) +
if (latency)
*latency += currentRouter->blackLinks_[0]->latency();
currentRouter = routers_[myCoords[0] * (numChassisPerGroup_ * numBladesPerChassis_) + targetCoords[0]];
}
// go to destination group - the only optical hop
if (latency)
*latency += currentRouter->blackLinks_[0]->latency();
currentRouter = routers_[myCoords[0] * (numChassisPerGroup_ * numBladesPerChassis_) + targetCoords[0]];
}
// go to destination group - the only optical hop
if (latency)
*latency += currentRouter->blueLinks_[0]->latency();
currentRouter = routers_[targetCoords[0] * (numChassisPerGroup_ * numBladesPerChassis_) + myCoords[0]];
if (latency)
*latency += currentRouter->blueLinks_[0]->latency();
currentRouter = routers_[targetCoords[0] * (numChassisPerGroup_ * numBladesPerChassis_) + myCoords[0]];
// same group, but same blade ?
if (targetRouter->blade_ != currentRouter->blade_) {
// same group, but same blade ?
if (targetRouter->blade_ != currentRouter->blade_) {
if (latency)
*latency += currentRouter->greenLinks_[targetCoords[2]]->latency();
currentRouter = routers_[targetCoords[0] * (numChassisPerGroup_ * numBladesPerChassis_) + targetCoords[2]];
if (latency)
*latency += currentRouter->greenLinks_[targetCoords[2]]->latency();
currentRouter = routers_[targetCoords[0] * (numChassisPerGroup_ * numBladesPerChassis_) + targetCoords[2]];
// same blade, but same chassis ?
if (targetRouter->chassis_ != currentRouter->chassis_) {
// same blade, but same chassis ?
if (targetRouter->chassis_ != currentRouter->chassis_) {
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_);
- route->link_list->push_back(info.first);
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(nodePositionWithLoopback(dst->id()));
+ route->link_list.push_back(info.first);