#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 {
unsigned int table_size = getTableSize();
/* Create table if needed */
- if (not routingTable_)
- routingTable_ = new RouteCreationArgs*[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) {
FullZone::~FullZone()
{
- if (routingTable_) {
+ if (routing_table_) {
unsigned int table_size = getTableSize();
/* 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, 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->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();
RouteCreationArgs* e_route = TO_ROUTE_FULL(src->id(), dst->id());
}
}
-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(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)
{
addRouteCheckParams(src, dst, gw_src, gw_dst, link_list, symmetrical);
unsigned int table_size = getTableSize();
- if (not routingTable_)
- routingTable_ = new RouteCreationArgs*[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 (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(), gw_src->getCname(), dst->getCname(), 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()) =
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(), gw_dst->getCname(), src->getCname(), 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_, src, dst, gw_src, gw_dst, link_list, symmetrical, false);