X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/44ea423d2d27e986f35e6b8d60772b7acec89916..fc8be6494932e66a359ae5d47103a566cc8234f4:/src/kernel/routing/FloydZone.cpp diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp index 3095394650..1b403b1704 100644 --- a/src/kernel/routing/FloydZone.cpp +++ b/src/kernel/routing/FloydZone.cpp @@ -1,53 +1,55 @@ -/* 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/FloydZone.hpp" -#include "src/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/FloydZone.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" -#include "xbt/log.h" +#include "src/surf/xml/platf_private.hpp" +#include "surf/surf.hpp" #include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf"); -#define TO_FLOYD_COST(i, j) (costTable_)[(i) + (j)*table_size] -#define TO_FLOYD_PRED(i, j) (predecessorTable_)[(i) + (j)*table_size] -#define TO_FLOYD_LINK(i, j) (linkTable_)[(i) + (j)*table_size] +#define TO_FLOYD_COST(i, j) (cost_table_)[(i) + (j)*table_size] +#define TO_FLOYD_PRED(i, j) (predecessor_table_)[(i) + (j)*table_size] +#define TO_FLOYD_LINK(i, j) (link_table_)[(i) + (j)*table_size] namespace simgrid { namespace kernel { namespace routing { -FloydZone::FloydZone(NetZone* father, std::string name) : RoutedZone(father, name) +FloydZone::FloydZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel) + : RoutedZone(father, name, netmodel) { - predecessorTable_ = nullptr; - costTable_ = nullptr; - linkTable_ = nullptr; + predecessor_table_ = nullptr; + cost_table_ = nullptr; + link_table_ = nullptr; } FloydZone::~FloydZone() { - if (linkTable_ == nullptr) // Dealing with a parse error in the file? + if (link_table_ == nullptr) // Dealing with a parse error in the file? return; - unsigned int table_size = getTableSize(); + unsigned int table_size = get_table_size(); /* Delete link_table */ for (unsigned int i = 0; i < table_size; i++) for (unsigned int j = 0; j < table_size; j++) delete TO_FLOYD_LINK(i, j); - delete[] linkTable_; + delete[] link_table_; - delete[] predecessorTable_; - delete[] costTable_; + delete[] predecessor_table_; + delete[] cost_table_; } -void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) +void FloydZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) { - unsigned int table_size = getTableSize(); + unsigned int table_size = get_table_size(); - getRouteCheckParams(src, dst); + get_route_check_params(src, dst); /* create a result route */ std::vector route_stack; @@ -55,7 +57,7 @@ void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* r do { int pred = TO_FLOYD_PRED(src->id(), cur); if (pred == -1) - THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getCname(), dst->getCname()); + THROWF(arg_error, 0, "No route from '%s' to '%s'", src->get_cname(), dst->get_cname()); route_stack.push_back(TO_FLOYD_LINK(pred, cur)); cur = pred; } while (cur != src->id()); @@ -65,39 +67,38 @@ void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* r route->gw_dst = route_stack.front()->gw_dst; } - sg_netpoint_t prev_dst_gw = nullptr; + NetPoint* prev_dst_gw = nullptr; while (not route_stack.empty()) { RouteCreationArgs* e_route = route_stack.back(); route_stack.pop_back(); if (hierarchy_ == RoutingMode::recursive && prev_dst_gw != nullptr && - prev_dst_gw->getCname() != e_route->gw_src->getCname()) { - getGlobalRoute(prev_dst_gw, e_route->gw_src, route->link_list, lat); + prev_dst_gw->get_cname() != e_route->gw_src->get_cname()) { + get_global_route(prev_dst_gw, e_route->gw_src, route->link_list, lat); } for (auto const& link : e_route->link_list) { route->link_list.push_back(link); if (lat) - *lat += link->latency(); + *lat += link->get_latency(); } prev_dst_gw = e_route->gw_dst; } } -void FloydZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, - kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, - std::vector& link_list, bool symmetrical) +void FloydZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, + std::vector& link_list, bool symmetrical) { /* set the size of table routing */ - unsigned int table_size = getTableSize(); + unsigned int table_size = get_table_size(); - addRouteCheckParams(src, dst, gw_src, gw_dst, link_list, symmetrical); + add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical); - if (not linkTable_) { + if (not link_table_) { /* Create Cost, Predecessor and Link tables */ - costTable_ = new double[table_size * table_size]; /* link cost from host to host */ - predecessorTable_ = new int[table_size * table_size]; /* predecessor host numbers */ - linkTable_ = new RouteCreationArgs*[table_size * table_size]; /* actual link between src and dst */ + cost_table_ = new double[table_size * table_size]; /* link cost from host to host */ + predecessor_table_ = new int[table_size * table_size]; /* predecessor host numbers */ + link_table_ = new RouteCreationArgs*[table_size * table_size]; /* actual link between src and dst */ /* Initialize costs and predecessors */ for (unsigned int i = 0; i < table_size; i++) @@ -112,14 +113,14 @@ void FloydZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoi if (gw_dst) // netzone route (to adapt the error message, if any) xbt_assert(nullptr == TO_FLOYD_LINK(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_FLOYD_LINK(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()); TO_FLOYD_LINK(src->id(), dst->id()) = - newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1); + new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1); TO_FLOYD_PRED(src->id(), dst->id()) = src->id(); TO_FLOYD_COST(src->id(), dst->id()) = (TO_FLOYD_LINK(src->id(), dst->id()))->link_list.size(); @@ -128,11 +129,11 @@ void FloydZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoi xbt_assert( nullptr == TO_FLOYD_LINK(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_FLOYD_LINK(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()); if (gw_dst && gw_src) { NetPoint* gw_tmp = gw_src; @@ -141,13 +142,13 @@ void FloydZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoi } if (not gw_src || not gw_dst) - XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst->getCname(), src->getCname()); + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst->get_cname(), src->get_cname()); else - XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", dst->getCname(), gw_src->getCname(), src->getCname(), - gw_dst->getCname()); + XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", dst->get_cname(), gw_src->get_cname(), + src->get_cname(), gw_dst->get_cname()); TO_FLOYD_LINK(dst->id(), src->id()) = - newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 0); + new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 0); TO_FLOYD_PRED(dst->id(), src->id()) = dst->id(); TO_FLOYD_COST(dst->id(), src->id()) = (TO_FLOYD_LINK(dst->id(), src->id()))->link_list.size(); /* count of links, old model assume 1 */ @@ -157,13 +158,13 @@ void FloydZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoi void FloydZone::seal() { /* set the size of table routing */ - unsigned int table_size = getTableSize(); + unsigned int table_size = get_table_size(); - if (not linkTable_) { + if (not link_table_) { /* Create Cost, Predecessor and Link tables */ - costTable_ = new double[table_size * table_size]; /* link cost from host to host */ - predecessorTable_ = new int[table_size * table_size]; /* predecessor host numbers */ - linkTable_ = new RouteCreationArgs*[table_size * table_size]; /* actual link between src and dst */ + cost_table_ = new double[table_size * table_size]; /* link cost from host to host */ + predecessor_table_ = new int[table_size * table_size]; /* predecessor host numbers */ + link_table_ = new RouteCreationArgs*[table_size * table_size]; /* actual link between src and dst */ /* Initialize costs and predecessors */ for (unsigned int i = 0; i < table_size; i++)