-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
+#include "surf/surf.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
namespace simgrid {
namespace kernel {
namespace routing {
-FullZone::FullZone(NetZone* father, std::string name) : RoutedZone(father, name)
+FullZone::FullZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel)
+ : RoutedZone(father, std::move(name), netmodel)
{
}
void FullZone::seal()
{
- unsigned int table_size = getTableSize();
+ unsigned int table_size = get_table_size();
/* Create table if needed */
if (not routing_table_)
routing_table_ = new RouteCreationArgs*[table_size * table_size]();
/* Add the loopback if needed */
- if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) {
+ if (network_model_->loopback_ && hierarchy_ == RoutingMode::base) {
for (unsigned int i = 0; i < table_size; i++) {
- RouteCreationArgs* e_route = TO_ROUTE_FULL(i, i);
- if (not e_route) {
- e_route = new RouteCreationArgs();
- e_route->link_list.push_back(surf_network_model->loopback_);
- TO_ROUTE_FULL(i, i) = e_route;
+ RouteCreationArgs* route = TO_ROUTE_FULL(i, i);
+ if (not route) {
+ route = new RouteCreationArgs();
+ route->link_list.push_back(network_model_->loopback_);
+ TO_ROUTE_FULL(i, i) = route;
}
}
}
FullZone::~FullZone()
{
if (routing_table_) {
- unsigned int table_size = getTableSize();
+ unsigned int table_size = get_table_size();
/* Delete routing table */
for (unsigned int i = 0; i < table_size; i++)
for (unsigned int j = 0; j < table_size; j++)
}
}
-void FullZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* res, double* lat)
+void FullZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* res, double* lat)
{
XBT_DEBUG("full getLocalRoute from %s[%u] to %s[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
- unsigned int table_size = getTableSize();
+ unsigned int table_size = get_table_size();
RouteCreationArgs* e_route = TO_ROUTE_FULL(src->id(), dst->id());
if (e_route != nullptr) {
for (auto const& link : e_route->link_list) {
res->link_list.push_back(link);
if (lat)
- *lat += link->latency();
+ *lat += link->get_latency();
}
}
}
-void FullZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
- kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
- std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical)
+void FullZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
+ std::vector<resource::LinkImpl*>& link_list, bool symmetrical)
{
- addRouteCheckParams(src, dst, gw_src, gw_dst, link_list, symmetrical);
+ add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical);
- unsigned int table_size = getTableSize();
+ unsigned int table_size = get_table_size();
if (not routing_table_)
routing_table_ = new RouteCreationArgs*[table_size * table_size]();
/* Add the route to the base */
TO_ROUTE_FULL(src->id(), dst->id()) =
- newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, true);
+ new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, true);
if (symmetrical == true && src != dst) {
if (gw_dst && gw_src) {
dst->get_cname(), src->get_cname());
TO_ROUTE_FULL(dst->id(), src->id()) =
- newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, false);
+ new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, false);
}
}
}