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.");
}
if (dst->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType() == SURF_NETWORK_ELEMENT_ROUTER) return;
/* Let's find the source and the destination in our internal structure */
- tempIter = this->computeNodes.find(src->getId());
+ tempIter = this->computeNodes.find(src->id());
// xbt_die -> assert
if (tempIter == this->computeNodes.end()) {
- xbt_die("Could not find the source %s [%d] in the fat tree", src->getName(),
- src->getId());
+ xbt_die("Could not find the source %s [%d] in the fat tree", src->name(),
+ src->id());
}
source = tempIter->second;
- tempIter = this->computeNodes.find(dst->getId());
+ tempIter = this->computeNodes.find(dst->id());
if (tempIter == this->computeNodes.end()) {
xbt_die("Could not find the destination %s [%d] in the fat tree",
- dst->getName(), dst->getId());
+ dst->name(), dst->id());
}
destination = tempIter->second;
XBT_VERB("Get route and latency from '%s' [%d] to '%s' [%d] in a fat tree",
- src->getName(), src->getId(), dst->getName(), dst->getId());
+ src->name(), src->id(), dst->name(), dst->id());
/* In case destination is the source, and there is a loopback, let's get
through it instead of going up to a switch*/
}
// 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;
}