X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/244d7851457bfd373983edfb00c80760239dc8ab..fc8be6494932e66a359ae5d47103a566cc8234f4:/src/kernel/routing/FloydZone.cpp diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp index 4162fa4cb7..1b403b1704 100644 --- a/src/kernel/routing/FloydZone.cpp +++ b/src/kernel/routing/FloydZone.cpp @@ -1,61 +1,63 @@ -/* 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++) - routing_route_free(TO_FLOYD_LINK(i, j)); - delete[] linkTable_; + delete TO_FLOYD_LINK(i, j); + delete[] link_table_; - delete[] predecessorTable_; - delete[] costTable_; + delete[] predecessor_table_; + delete[] cost_table_; } -void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t 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; + std::vector route_stack; unsigned int cur = dst->id(); 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,37 +67,38 @@ void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg 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()) { - sg_platf_route_cbarg_t e_route = route_stack.back(); + 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); + 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(sg_platf_route_cbarg_t route) +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(route); + 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 sg_platf_route_cbarg_t[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++) @@ -107,60 +110,61 @@ void FloydZone::addRoute(sg_platf_route_cbarg_t route) } /* Check that the route does not already exist */ - if (route->gw_dst) // netzone route (to adapt the error message, if any) - xbt_assert(nullptr == TO_FLOYD_LINK(route->src->id(), route->dst->id()), + 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).", - route->src->getCname(), route->gw_src->getCname(), route->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_FLOYD_LINK(route->src->id(), route->dst->id()), - "The route between %s and %s already exists (Rq: routes are symmetrical by default).", - route->src->getCname(), route->dst->getCname()); + 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->get_cname(), + dst->get_cname()); - TO_FLOYD_LINK(route->src->id(), route->dst->id()) = newExtendedRoute(hierarchy_, route, 1); - TO_FLOYD_PRED(route->src->id(), route->dst->id()) = route->src->id(); - TO_FLOYD_COST(route->src->id(), route->dst->id()) = - (TO_FLOYD_LINK(route->src->id(), route->dst->id()))->link_list->size(); + TO_FLOYD_LINK(src->id(), dst->id()) = + 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(); - if (route->symmetrical == true) { - if (route->gw_dst) // netzone route (to adapt the error message, if any) + if (symmetrical == true) { + if (gw_dst) // netzone route (to adapt the error message, if any) xbt_assert( - nullptr == TO_FLOYD_LINK(route->dst->id(), route->src->id()), + 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.", - route->dst->getCname(), route->gw_dst->getCname(), route->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_FLOYD_LINK(route->dst->id(), route->src->id()), + 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.", - route->dst->getCname(), route->src->getCname()); + dst->get_cname(), src->get_cname()); - if (route->gw_dst && route->gw_src) { - NetPoint* gw_tmp = route->gw_src; - route->gw_src = route->gw_dst; - route->gw_dst = gw_tmp; + if (gw_dst && gw_src) { + NetPoint* gw_tmp = gw_src; + gw_src = gw_dst; + gw_dst = gw_tmp; } - if (not route->gw_src || not route->gw_dst) - XBT_DEBUG("Load Route from \"%s\" to \"%s\"", route->dst->getCname(), route->src->getCname()); + if (not gw_src || not gw_dst) + 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)\"", route->dst->getCname(), route->gw_src->getCname(), - route->src->getCname(), route->gw_dst->getCname()); - - TO_FLOYD_LINK(route->dst->id(), route->src->id()) = newExtendedRoute(hierarchy_, route, 0); - TO_FLOYD_PRED(route->dst->id(), route->src->id()) = route->dst->id(); - TO_FLOYD_COST(route->dst->id(), route->src->id()) = - (TO_FLOYD_LINK(route->dst->id(), route->src->id()))->link_list->size(); /* count of links, old model assume 1 */ + 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()) = + 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 */ } } 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 sg_platf_route_cbarg_t[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++) @@ -174,13 +178,10 @@ void FloydZone::seal() /* Add the loopback if needed */ if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) { for (unsigned int i = 0; i < table_size; i++) { - sg_platf_route_cbarg_t e_route = TO_FLOYD_LINK(i, i); + RouteCreationArgs* e_route = TO_FLOYD_LINK(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 = new std::vector(); - e_route->link_list->push_back(surf_network_model->loopback_); + e_route = new RouteCreationArgs(); + e_route->link_list.push_back(surf_network_model->loopback_); TO_FLOYD_LINK(i, i) = e_route; TO_FLOYD_PRED(i, i) = i; TO_FLOYD_COST(i, i) = 1;