#include <vector>
#include <iostream>
-#include "surf_routing_cluster_fat_tree.hpp"
+#include "src/surf/surf_routing_private.hpp"
+#include "src/surf/surf_routing_cluster_fat_tree.hpp"
#include "xbt/lib.h"
#include <boost/algorithm/string/split.hpp>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_fat_tree, surf, "Routing for fat trees");
-AS_t model_fat_tree_cluster_create(void)
-{
- return new simgrid::surf::AsClusterFatTree();
-}
-
namespace simgrid {
namespace surf {
-AsClusterFatTree::AsClusterFatTree() : levels(0) {
+AsClusterFatTree::AsClusterFatTree(const char*name)
+ : AsCluster(name)
+{
XBT_DEBUG("Creating a new fat tree.");
}
return true;
}
-void AsClusterFatTree::getRouteAndLatency(RoutingEdge *src,
- RoutingEdge *dst,
+void AsClusterFatTree::getRouteAndLatency(NetCard *src,
+ NetCard *dst,
sg_platf_route_cbarg_t into,
double *latency) {
FatTreeNode *source, *destination, *currentNode;
}
// The first parts of topo_parameters should be the levels number
- this->levels = std::atoi(parameters[0].c_str()); // stoi() only in C++11...
+ this->levels = xbt_str_parse_int(parameters[0].c_str(), "First parameter is not the amount of levels: %s");
// Then, a l-sized vector standing for the childs number by level
boost::split(tmp, parameters[1], boost::is_any_of(","));
", see the documentation for more informations");
}
for(size_t i = 0 ; i < tmp.size() ; i++){
- this->lowerLevelNodesNumber.push_back(std::atoi(tmp[i].c_str()));
+ this->lowerLevelNodesNumber.push_back(xbt_str_parse_int(tmp[i].c_str(), "Invalid lower level node number: %s"));
}
// Then, a l-sized vector standing for the parents number by level
", see the documentation for more informations");
}
for(size_t i = 0 ; i < tmp.size() ; i++){
- this->upperLevelNodesNumber.push_back(std::atoi(tmp[i].c_str()));
+ this->upperLevelNodesNumber.push_back(xbt_str_parse_int(tmp[i].c_str(), "Invalid upper level node number: %s"));
}
// Finally, a l-sized vector standing for the ports number with the lower level
}
for(size_t i = 0 ; i < tmp.size() ; i++){
- this->lowerLevelPortsNumber.push_back(std::atoi(tmp[i].c_str()));
+ this->lowerLevelPortsNumber.push_back(xbt_str_parse_int(tmp[i].c_str(), "Invalid lower level node number: %s"));
}
this->cluster = cluster;
}
memset(&linkTemplate, 0, sizeof(linkTemplate));
linkTemplate.bandwidth = cluster->limiter_link;
linkTemplate.latency = 0;
- linkTemplate.state = SURF_RESOURCE_ON;
+ linkTemplate.initiallyOn = 1;
linkTemplate.policy = SURF_LINK_SHARED;
linkTemplate.id = bprintf("limiter_%d", id);
sg_platf_new_link(&linkTemplate);
memset(&linkTemplate, 0, sizeof(linkTemplate));
linkTemplate.bandwidth = cluster->loopback_bw;
linkTemplate.latency = cluster->loopback_lat;
- linkTemplate.state = SURF_RESOURCE_ON;
+ linkTemplate.initiallyOn = 1;
linkTemplate.policy = SURF_LINK_FATPIPE;
linkTemplate.id = bprintf("loopback_%d", id);
sg_platf_new_link(&linkTemplate);
memset(&linkTemplate, 0, sizeof(linkTemplate));
linkTemplate.bandwidth = cluster->bw;
linkTemplate.latency = cluster->lat;
- linkTemplate.state = SURF_RESOURCE_ON;
+ linkTemplate.initiallyOn = 1;
linkTemplate.policy = cluster->sharing_policy; // sthg to do with that ?
linkTemplate.id = bprintf("link_from_%d_to_%d_%d", downNode->id, upNode->id,
uniqueId);