/* 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 <limits>
-
#include "src/kernel/routing/FloydZone.hpp"
-#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include "xbt/log.h"
+#include <float.h>
+#include <limits>
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf");
#define TO_FLOYD_COST(i, j) (costTable_)[(i) + (j)*table_size]
xbt_free(costTable_);
}
-void FloydZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat)
+void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat)
{
size_t table_size = vertices_.size();
route->gw_dst = route_stack.front()->gw_dst;
}
- sg_netcard_t prev_dst_gw = nullptr;
+ sg_netpoint_t prev_dst_gw = nullptr;
while (!route_stack.empty()) {
sg_platf_route_cbarg_t e_route = route_stack.back();
route_stack.pop_back();
}
/* Check that the route does not already exist */
- if (route->gw_dst) // AS route (to adapt the error message, if any)
+ 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()),
"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(),
(TO_FLOYD_LINK(route->src->id(), route->dst->id()))->link_list->size();
if (route->symmetrical == true) {
- if (route->gw_dst) // AS route (to adapt the error message, if any)
+ if (route->gw_dst) // netzone route (to adapt the error message, if any)
xbt_assert(
nullptr == TO_FLOYD_LINK(route->dst->id(), route->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->src->name().c_str());
if (route->gw_dst && route->gw_src) {
- NetCard* gw_tmp = route->gw_src;
+ NetPoint* gw_tmp = route->gw_src;
route->gw_src = route->gw_dst;
route->gw_dst = gw_tmp;
}
if (!route->gw_src && !route->gw_dst)
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", route->dst->name().c_str(), route->src->name().c_str());
else
- XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", route->dst->name().c_str(), route->gw_src->name().c_str(),
+ 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);
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<Link*>();
+ e_route->link_list = new std::vector<surf::LinkImpl*>();
e_route->link_list->push_back(surf_network_model->loopback_);
TO_FLOYD_LINK(i, i) = e_route;
TO_FLOYD_PRED(i, i) = i;