X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e18a7b043d161b29d0bf3f5743cb7a570241576a..de57b34916659892d2dc26edabf552253afe2c18:/src/kernel/routing/FloydZone.cpp diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp index 7c5997237e..3095394650 100644 --- a/src/kernel/routing/FloydZone.cpp +++ b/src/kernel/routing/FloydZone.cpp @@ -36,26 +36,26 @@ FloydZone::~FloydZone() /* 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)); - xbt_free(linkTable_); + delete TO_FLOYD_LINK(i, j); + delete[] linkTable_; - xbt_free(predecessorTable_); - xbt_free(costTable_); + delete[] predecessorTable_; + delete[] costTable_; } -void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat) +void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) { unsigned int table_size = getTableSize(); getRouteCheckParams(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->name().c_str(), dst->name().c_str()); + THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getCname(), dst->getCname()); route_stack.push_back(TO_FLOYD_LINK(pred, cur)); cur = pred; } while (cur != src->id()); @@ -67,15 +67,15 @@ void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg sg_netpoint_t 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 && - strcmp(prev_dst_gw->name().c_str(), e_route->gw_src->name().c_str())) { + prev_dst_gw->getCname() != e_route->gw_src->getCname()) { getGlobalRoute(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(); } @@ -84,18 +84,20 @@ void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg } } -void FloydZone::addRoute(sg_platf_route_cbarg_t route) +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) { /* set the size of table routing */ unsigned int table_size = getTableSize(); - addRouteCheckParams(route); + addRouteCheckParams(src, dst, gw_src, gw_dst, link_list, symmetrical); if (not linkTable_) { /* Create Cost, Predecessor and Link tables */ - costTable_ = xbt_new0(double, table_size* table_size); /* link cost from host to host */ - predecessorTable_ = xbt_new0(int, table_size* table_size); /* predecessor host numbers */ - linkTable_ = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); /* actual link between src and dst */ + 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 */ /* Initialize costs and predecessors */ for (unsigned int i = 0; i < table_size; i++) @@ -107,49 +109,48 @@ 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->name().c_str(), route->gw_src->name().c_str(), route->dst->name().c_str(), - route->gw_dst->name().c_str()); + src->getCname(), gw_src->getCname(), dst->getCname(), gw_dst->getCname()); 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->name().c_str(), route->dst->name().c_str()); + 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()); - 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()) = + newExtendedRoute(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->name().c_str(), route->gw_dst->name().c_str(), route->src->name().c_str(), - route->gw_src->name().c_str()); + dst->getCname(), gw_dst->getCname(), src->getCname(), gw_src->getCname()); 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->name().c_str(), route->src->name().c_str()); + dst->getCname(), src->getCname()); - 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->name().c_str(), route->src->name().c_str()); + if (not gw_src || not gw_dst) + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst->getCname(), src->getCname()); else - XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", route->dst->name().c_str(), route->gw_src->name().c_str(), - route->src->name().c_str(), route->gw_dst->name().c_str()); - - 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->getCname(), gw_src->getCname(), src->getCname(), + gw_dst->getCname()); + + TO_FLOYD_LINK(dst->id(), src->id()) = + newExtendedRoute(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 */ } } @@ -160,9 +161,9 @@ void FloydZone::seal() if (not linkTable_) { /* Create Cost, Predecessor and Link tables */ - costTable_ = xbt_new0(double, table_size* table_size); /* link cost from host to host */ - predecessorTable_ = xbt_new0(int, table_size* table_size); /* predecessor host numbers */ - linkTable_ = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); /* actual link between src and dst */ + 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 */ /* Initialize costs and predecessors */ for (unsigned int i = 0; i < table_size; i++) @@ -176,13 +177,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 = xbt_new0(s_sg_platf_route_cbarg_t, 1); - 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; @@ -193,12 +191,11 @@ void FloydZone::seal() for (unsigned int c = 0; c < table_size; c++) { for (unsigned int a = 0; a < table_size; a++) { for (unsigned int b = 0; b < table_size; b++) { - if (TO_FLOYD_COST(a, c) < DBL_MAX && TO_FLOYD_COST(c, b) < DBL_MAX) { - if (fabs(TO_FLOYD_COST(a, b) - DBL_MAX) < std::numeric_limits::epsilon() || - (TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b) < TO_FLOYD_COST(a, b))) { - TO_FLOYD_COST(a, b) = TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b); - TO_FLOYD_PRED(a, b) = TO_FLOYD_PRED(c, b); - } + if (TO_FLOYD_COST(a, c) < DBL_MAX && TO_FLOYD_COST(c, b) < DBL_MAX && + (fabs(TO_FLOYD_COST(a, b) - DBL_MAX) < std::numeric_limits::epsilon() || + (TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b) < TO_FLOYD_COST(a, b)))) { + TO_FLOYD_COST(a, b) = TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b); + TO_FLOYD_PRED(a, b) = TO_FLOYD_PRED(c, b); } } }