* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/kernel/routing/DragonflyZone.hpp"
-#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
+#include <string>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_dragonfly, surf_route_cluster, "Dragonfly Routing part of surf");
namespace kernel {
namespace routing {
-AsClusterDragonfly::AsClusterDragonfly(As* father, const char* name) : AsCluster(father, name)
+DragonflyZone::DragonflyZone(NetZone* father, const char* name) : ClusterZone(father, name)
{
}
-AsClusterDragonfly::~AsClusterDragonfly()
+DragonflyZone::~DragonflyZone()
{
if (this->routers_ != nullptr) {
for (unsigned int i = 0; i < this->numGroups_ * this->numChassisPerGroup_ * this->numBladesPerChassis_; i++)
}
}
-unsigned int* AsClusterDragonfly::rankId_to_coords(int rankId)
+unsigned int* DragonflyZone::rankId_to_coords(int rankId)
{
// coords : group, chassis, blade, node
unsigned int* coords = (unsigned int*)malloc(4 * sizeof(unsigned int));
return coords;
}
-void AsClusterDragonfly::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster)
+void DragonflyZone::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster)
{
std::vector<std::string> parameters;
std::vector<std::string> tmp;
/*
* Generate the cluster once every node is created
*/
-void AsClusterDragonfly::seal()
+void DragonflyZone::seal()
{
if (this->numNodesPerBlade_ == 0) {
return;
xbt_free(blueLinks_);
}
-void AsClusterDragonfly::generateRouters()
+void DragonflyZone::generateRouters()
{
this->routers_ = static_cast<DragonflyRouter**>(xbt_malloc0(this->numGroups_ * this->numChassisPerGroup_ *
this->numBladesPerChassis_ * sizeof(DragonflyRouter*)));
}
}
-void AsClusterDragonfly::createLink(char* id, int numlinks, Link** linkup, Link** linkdown)
+void DragonflyZone::createLink(char* id, int numlinks, surf::LinkImpl** linkup, surf::LinkImpl** linkdown)
{
*linkup = nullptr;
*linkdown = nullptr;
- s_sg_platf_link_cbarg_t linkTemplate;
- memset(&linkTemplate, 0, sizeof(linkTemplate));
+ 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.id = std::string(id);
sg_platf_new_link(&linkTemplate);
XBT_DEBUG("Generating link %s", id);
- Link* link;
+ surf::LinkImpl* link;
std::string tmpID;
if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX) {
tmpID = std::string(linkTemplate.id) + "_UP";
- link = Link::byName(tmpID.c_str());
+ link = surf::LinkImpl::byName(tmpID.c_str());
*linkup = link; // check link?
tmpID = std::string(linkTemplate.id) + "_DOWN";
- link = Link::byName(tmpID.c_str());
+ link = surf::LinkImpl::byName(tmpID.c_str());
*linkdown = link; // check link ?
} else {
- link = Link::byName(linkTemplate.id);
+ link = surf::LinkImpl::byName(linkTemplate.id.c_str());
*linkup = link;
*linkdown = link;
}
-
- free((void*)linkTemplate.id);
}
-void AsClusterDragonfly::generateLinks()
+void DragonflyZone::generateLinks()
{
-
static int uniqueId = 0;
- char* id = nullptr;
- Link* linkup;
- Link* linkdown;
+ surf::LinkImpl* linkup;
+ surf::LinkImpl* linkdown;
unsigned int numRouters = this->numGroups_ * this->numChassisPerGroup_ * this->numBladesPerChassis_;
// Links from routers to their local nodes.
for (unsigned int i = 0; i < numRouters; i++) {
// allocate structures
- this->routers_[i]->myNodes_ =
- static_cast<Link**>(xbt_malloc0(numLinksperLink_ * this->numNodesPerBlade_ * sizeof(Link*)));
- this->routers_[i]->greenLinks_ = static_cast<Link**>(xbt_malloc0(this->numBladesPerChassis_ * sizeof(Link*)));
- this->routers_[i]->blackLinks_ = static_cast<Link**>(xbt_malloc0(this->numChassisPerGroup_ * sizeof(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*)));
for (unsigned int j = 0; j < numLinksperLink_ * this->numNodesPerBlade_; j += numLinksperLink_) {
- id = bprintf("local_link_from_router_%d_to_node_%d_%d", i, j / numLinksperLink_, uniqueId);
+ char* id = bprintf("local_link_from_router_%d_to_node_%d_%d", i, j / numLinksperLink_, 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++) {
- id = bprintf("green_link_in_chassis_%d_between_routers_%d_and_%d_%d", i % numChassisPerGroup_, j, k, uniqueId);
+ char* id = bprintf("green_link_in_chassis_%d_between_routers_%d_and_%d_%d", i % numChassisPerGroup_, j, k, 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++) {
- id = bprintf("black_link_in_group_%d_between_chassis_%d_and_%d_blade_%d_%d", i, j, k, l, uniqueId);
+ char* id = bprintf("black_link_in_group_%d_between_chassis_%d_and_%d_blade_%d_%d", i, j, k, l, 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]
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<Link**>(xbt_malloc0(sizeof(Link*)));
- this->routers_[routernumj]->blueLinks_ = static_cast<Link**>(xbt_malloc0(sizeof(Link*)));
- id = bprintf("blue_link_between_group_%d_and_%d_routers_%d_and_%d_%d", i, j, routernumi, routernumj, uniqueId);
+ 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);
this->createLink(id, this->numLinksBlue_, &linkup, &linkdown);
+ xbt_free(id);
this->routers_[routernumi]->blueLinks_[0] = linkup;
this->routers_[routernumj]->blueLinks_[0] = linkdown;
uniqueId++;
}
}
-void AsClusterDragonfly::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* latency)
+void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* latency)
{
// Minimal routing version.
// TODO : non-minimal random one, and adaptive ?
dst->id());
if ((src->id() == dst->id()) && hasLoopback_) {
- std::pair<Link*, Link*> info = privateLinks_.at(src->id() * linkCountPerNode_);
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(src->id() * linkCountPerNode_);
route->link_list->push_back(info.first);
if (latency)
*latency += myRouter->myNodes_[myCoords[3] * numLinksperLink_]->latency();
if (hasLimiter_) { // limiter for sender
- std::pair<Link*, Link*> info = privateLinks_.at(src->id() * linkCountPerNode_ + hasLoopback_);
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(src->id() * linkCountPerNode_ + hasLoopback_);
route->link_list->push_back(info.first);
}
}
if (hasLimiter_) { // limiter for receiver
- std::pair<Link*, Link*> info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_);
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_);
route->link_list->push_back(info.first);
}
