-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2018. 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 "src/kernel/routing/FullZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/FullZone.hpp"
+#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");
-#define TO_ROUTE_FULL(i, j) routingTable_[(i) + (j)*table_size]
+#define TO_ROUTE_FULL(i, j) routing_table_[(i) + (j)*table_size]
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, name, netmodel)
{
}
void FullZone::seal()
{
- unsigned int table_size = getTableSize();
+ unsigned int table_size = get_table_size();
/* Create table if needed */
- if (not routingTable_)
- routingTable_ = new sg_platf_route_cbarg_t[table_size * table_size]();
+ 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++) {
- sg_platf_route_cbarg_t e_route = TO_ROUTE_FULL(i, i);
- if (not e_route) {
- e_route = new s_sg_platf_route_cbarg_t;
- e_route->gw_src = nullptr;
- e_route->gw_dst = nullptr;
- 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 (routingTable_) {
- unsigned int table_size = getTableSize();
+ if (routing_table_) {
+ 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++)
delete TO_ROUTE_FULL(i, j);
- delete[] routingTable_;
+ delete[] routing_table_;
}
}
-void FullZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t 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->getCname(), src->id(), dst->getCname(), dst->id());
+ 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();
- sg_platf_route_cbarg_t e_route = TO_ROUTE_FULL(src->id(), dst->id());
+ unsigned int table_size = get_table_size();
+ RouteCreationArgs* e_route = TO_ROUTE_FULL(src->id(), dst->id());
if (e_route != nullptr) {
res->gw_src = e_route->gw_src;
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(sg_platf_route_cbarg_t route)
+void FullZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
+ std::vector<resource::LinkImpl*>& link_list, bool symmetrical)
{
- NetPoint* src = route->src;
- NetPoint* dst = route->dst;
- addRouteCheckParams(route);
+ 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 routingTable_)
- routingTable_ = new sg_platf_route_cbarg_t[table_size * table_size]();
+ if (not routing_table_)
+ routing_table_ = new RouteCreationArgs*[table_size * table_size]();
/* Check that the route does not already exist */
- if (route->gw_dst) // inter-zone route (to adapt the error message, if any)
+ if (gw_dst) // inter-zone route (to adapt the error message, if any)
xbt_assert(nullptr == TO_ROUTE_FULL(src->id(), dst->id()),
"The route between %s@%s and %s@%s already exists (Rq: routes are symmetrical by default).",
- src->getCname(), route->gw_src->getCname(), dst->getCname(), route->gw_dst->getCname());
+ src->get_cname(), gw_src->get_cname(), dst->get_cname(), gw_dst->get_cname());
else
xbt_assert(nullptr == TO_ROUTE_FULL(src->id(), dst->id()),
- "The route between %s and %s already exists (Rq: routes are symmetrical by default).", src->getCname(),
- dst->getCname());
+ "The route between %s and %s already exists (Rq: routes are symmetrical by default).", src->get_cname(),
+ dst->get_cname());
/* Add the route to the base */
- TO_ROUTE_FULL(src->id(), dst->id()) = newExtendedRoute(hierarchy_, route, true);
-
- if (route->symmetrical == true && src != dst) {
- if (route->gw_dst && route->gw_src) {
- NetPoint* gw_tmp = route->gw_src;
- route->gw_src = route->gw_dst;
- route->gw_dst = gw_tmp;
+ TO_ROUTE_FULL(src->id(), dst->id()) =
+ new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, true);
+
+ if (symmetrical == true && src != dst) {
+ if (gw_dst && gw_src) {
+ NetPoint* gw_tmp = gw_src;
+ gw_src = gw_dst;
+ gw_dst = gw_tmp;
}
- if (route->gw_dst && route->gw_src) // inter-zone route (to adapt the error message, if any)
+ if (gw_dst && gw_src) // inter-zone route (to adapt the error message, if any)
xbt_assert(
nullptr == TO_ROUTE_FULL(dst->id(), src->id()),
"The route between %s@%s and %s@%s already exists. You should not declare the reverse path as symmetrical.",
- dst->getCname(), route->gw_dst->getCname(), src->getCname(), route->gw_src->getCname());
+ dst->get_cname(), gw_dst->get_cname(), src->get_cname(), gw_src->get_cname());
else
xbt_assert(nullptr == TO_ROUTE_FULL(dst->id(), src->id()),
"The route between %s and %s already exists. You should not declare the reverse path as symmetrical.",
- dst->getCname(), src->getCname());
+ dst->get_cname(), src->get_cname());
- TO_ROUTE_FULL(dst->id(), src->id()) = newExtendedRoute(hierarchy_, route, false);
+ TO_ROUTE_FULL(dst->id(), src->id()) =
+ new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, false);
}
}
}