#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
-#include "xbt/log.h"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_route);
explicit BypassRoute(NetPoint* gwSrc, NetPoint* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {}
NetPoint* gw_src;
NetPoint* gw_dst;
- std::vector<surf::LinkImpl*> links;
+ std::vector<resource::LinkImpl*> links;
};
NetZoneImpl::NetZoneImpl(NetZone* father, std::string name) : NetZone(father, name)
{
- xbt_assert(nullptr == simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name.c_str()),
+ xbt_assert(nullptr == simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name.c_str()),
"Refusing to create a second NetZone called '%s'.", name.c_str());
netpoint_ = new NetPoint(name, NetPoint::Type::NetZone, static_cast<NetZoneImpl*>(father));
for (auto const& kv : bypass_routes_)
delete kv.second;
- simgrid::s4u::Engine::getInstance()->netpointUnregister(netpoint_);
+ simgrid::s4u::Engine::get_instance()->netpoint_unregister(netpoint_);
}
-simgrid::s4u::Host* NetZoneImpl::createHost(const char* name, std::vector<double>* speedPerPstate, int coreAmount,
- std::map<std::string, std::string>* props)
+simgrid::s4u::Host* NetZoneImpl::create_host(const char* name, std::vector<double>* speedPerPstate, int coreAmount,
+ std::map<std::string, std::string>* props)
{
simgrid::s4u::Host* res = new simgrid::s4u::Host(name);
res->pimpl_netpoint = new NetPoint(name, NetPoint::Type::Host, this);
- surf_cpu_model_pm->createCpu(res, speedPerPstate, coreAmount);
+ surf_cpu_model_pm->create_cpu(res, speedPerPstate, coreAmount);
if (props != nullptr)
for (auto const& kv : *props)
- res->setProperty(kv.first, kv.second);
+ res->set_property(kv.first, kv.second);
- simgrid::s4u::Host::onCreation(*res); // notify the signal
+ simgrid::s4u::Host::on_creation(*res); // notify the signal
return res;
}
-void NetZoneImpl::addBypassRoute(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
- std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical)
+void NetZoneImpl::add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
+ std::vector<resource::LinkImpl*>& link_list, bool symmetrical)
{
/* Argument validity checks */
if (gw_dst) {
NetZoneImpl** dst_ancestor)
{
/* Deal with the easy base case */
- if (src->netzone() == dst->netzone()) {
- *common_ancestor = src->netzone();
+ if (src->get_englobing_zone() == dst->get_englobing_zone()) {
+ *common_ancestor = src->get_englobing_zone();
*src_ancestor = *common_ancestor;
*dst_ancestor = *common_ancestor;
return;
/* engage the full recursive search */
/* (1) find the path to root of src and dst*/
- NetZoneImpl* src_as = src->netzone();
- NetZoneImpl* dst_as = dst->netzone();
+ NetZoneImpl* src_as = src->get_englobing_zone();
+ NetZoneImpl* dst_as = dst->get_englobing_zone();
xbt_assert(src_as, "Host %s must be in a netzone", src->get_cname());
xbt_assert(dst_as, "Host %s must be in a netzone", dst->get_cname());
/* (2) find the path to the root routing component */
std::vector<NetZoneImpl*> path_src;
- NetZoneImpl* current = src->netzone();
+ NetZoneImpl* current = src->get_englobing_zone();
while (current != nullptr) {
path_src.push_back(current);
- current = static_cast<NetZoneImpl*>(current->getFather());
+ current = static_cast<NetZoneImpl*>(current->get_father());
}
std::vector<NetZoneImpl*> path_dst;
- current = dst->netzone();
+ current = dst->get_englobing_zone();
while (current != nullptr) {
path_dst.push_back(current);
- current = static_cast<NetZoneImpl*>(current->getFather());
+ current = static_cast<NetZoneImpl*>(current->get_father());
}
/* (3) find the common father.
}
/* PRECONDITION: this is the common ancestor of src and dst */
-bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst,
- /* OUT */ std::vector<surf::LinkImpl*>& links, double* latency)
+bool NetZoneImpl::get_bypass_route(routing::NetPoint* src, routing::NetPoint* dst,
+ /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency)
{
// If never set a bypass route return nullptr without any further computations
if (bypass_routes_.empty())
return false;
/* Base case, no recursion is needed */
- if (dst->netzone() == this && src->netzone() == this) {
+ if (dst->get_englobing_zone() == this && src->get_englobing_zone() == this) {
if (bypass_routes_.find({src, dst}) != bypass_routes_.end()) {
BypassRoute* bypassedRoute = bypass_routes_.at({src, dst});
- for (surf::LinkImpl* const& link : bypassedRoute->links) {
+ for (resource::LinkImpl* const& link : bypassedRoute->links) {
links.push_back(link);
if (latency)
*latency += link->latency();
/* (1) find the path to the root routing component */
std::vector<NetZoneImpl*> path_src;
- NetZone* current = src->netzone();
+ NetZone* current = src->get_englobing_zone();
while (current != nullptr) {
path_src.push_back(static_cast<NetZoneImpl*>(current));
current = current->father_;
}
std::vector<NetZoneImpl*> path_dst;
- current = dst->netzone();
+ current = dst->get_englobing_zone();
while (current != nullptr) {
path_dst.push_back(static_cast<NetZoneImpl*>(current));
current = current->father_;
"calls to getRoute",
src->get_cname(), dst->get_cname(), bypassedRoute->links.size());
if (src != key.first)
- getGlobalRoute(src, bypassedRoute->gw_src, links, latency);
- for (surf::LinkImpl* const& link : bypassedRoute->links) {
+ get_global_route(src, bypassedRoute->gw_src, links, latency);
+ for (resource::LinkImpl* const& link : bypassedRoute->links) {
links.push_back(link);
if (latency)
*latency += link->latency();
}
if (dst != key.second)
- getGlobalRoute(bypassedRoute->gw_dst, dst, links, latency);
+ get_global_route(bypassedRoute->gw_dst, dst, links, latency);
return true;
}
XBT_DEBUG("No bypass route from '%s' to '%s'.", src->get_cname(), dst->get_cname());
return false;
}
-void NetZoneImpl::getGlobalRoute(routing::NetPoint* src, routing::NetPoint* dst,
- /* OUT */ std::vector<surf::LinkImpl*>& links, double* latency)
+void NetZoneImpl::get_global_route(NetPoint* src, NetPoint* dst,
+ /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency)
{
RouteCreationArgs route;
src_ancestor->get_cname(), dst_ancestor->get_cname());
/* Check whether a direct bypass is defined. If so, use it and bail out */
- if (common_ancestor->getBypassRoute(src, dst, links, latency))
+ if (common_ancestor->get_bypass_route(src, dst, links, latency))
return;
/* If src and dst are in the same netzone, life is good */
if (src_ancestor == dst_ancestor) { /* SURF_ROUTING_BASE */
route.link_list = std::move(links);
- common_ancestor->getLocalRoute(src, dst, &route, latency);
+ common_ancestor->get_local_route(src, dst, &route, latency);
links = std::move(route.link_list);
return;
}
/* Not in the same netzone, no bypass. We'll have to find our path between the netzones recursively */
- common_ancestor->getLocalRoute(src_ancestor->netpoint_, dst_ancestor->netpoint_, &route, latency);
+ common_ancestor->get_local_route(src_ancestor->netpoint_, dst_ancestor->netpoint_, &route, latency);
xbt_assert((route.gw_src != nullptr) && (route.gw_dst != nullptr), "bad gateways for route from \"%s\" to \"%s\"",
src->get_cname(), dst->get_cname());
/* If source gateway is not our source, we have to recursively find our way up to this point */
if (src != route.gw_src)
- getGlobalRoute(src, route.gw_src, links, latency);
+ get_global_route(src, route.gw_src, links, latency);
for (auto const& link : route.link_list)
links.push_back(link);
/* If dest gateway is not our destination, we have to recursively find our way from this point */
if (route.gw_dst != dst)
- getGlobalRoute(route.gw_dst, dst, links, latency);
+ get_global_route(route.gw_dst, dst, links, latency);
}
}
}
