#include "simgrid/s4u/host.hpp"
#include "src/kernel/routing/AsImpl.hpp"
+#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(AsImpl,surf, "Implementation of S4U autonomous systems");
}
AsImpl::~AsImpl() = default;
- void AsImpl::attachHost(s4u::Host* host)
+ simgrid::s4u::Host* AsImpl::createHost(const char* name, std::vector<double>* speedPerPstate, int coreAmount)
{
+ simgrid::s4u::Host* res = new simgrid::s4u::Host(name);
+
if (hierarchy_ == RoutingMode::unset)
hierarchy_ = RoutingMode::base;
- host->pimpl_netcard = new NetCardImpl(host->name().c_str(), NetCard::Type::Host, this);
+ res->pimpl_netcard = new NetCardImpl(name, NetCard::Type::Host, this);
+
+ surf_cpu_model_pm->createCpu(res, speedPerPstate, coreAmount);
+
+ return res;
}
xbt_dynar_t AsImpl::getOneLinkRoutes()
/* Base case, no recursion is needed */
if (dst->containingAS() == this && src->containingAS() == this) {
if (bypassRoutes_.find({src, dst}) != bypassRoutes_.end()) {
- std::vector<surf::Link*>* bypassedRoute = bypassRoutes_.at({src, dst});
- for (surf::Link* link : *bypassedRoute) {
+ AsRoute* bypassedRoute = bypassRoutes_.at({src, dst});
+ for (surf::Link* link : bypassedRoute->links) {
links->push_back(link);
if (latency)
*latency += link->latency();
}
- XBT_DEBUG("Found a bypass route with %zu links", bypassedRoute->size());
+ XBT_DEBUG("Found a bypass route with %zu links", bypassedRoute->links.size());
return true;
}
return false;
/* Engage recursive search */
- std::vector<surf::Link*>* bypassedRoute = nullptr;
/* (1) find the path to the root routing component */
std::vector<AsImpl*> path_src;
int max_index = std::max(max_index_src, max_index_dst);
+ /* (3) Search for a bypass making the path up to the ancestor useless */
+ AsRoute* bypassedRoute = nullptr;
std::pair<kernel::routing::NetCard*, kernel::routing::NetCard*> key;
for (int max = 0; max <= max_index; max++) {
for (int i = 0; i < max; i++) {
}
}
+ /* (4) If we have the bypass, use it. If not, caller will do the Right Thing. */
if (bypassedRoute) {
- for (surf::Link* link : *bypassedRoute) {
+ if (src != key.first)
+ getRouteRecursive(src, const_cast<NetCard*>(bypassedRoute->gw_src), links, latency);
+ for (surf::Link* link : bypassedRoute->links) {
links->push_back(link);
if (latency)
*latency += link->latency();
}
+ if (dst != key.second)
+ getRouteRecursive(const_cast<NetCard*>(bypassedRoute->gw_dst), dst, links, latency);
return true;
}
return false;