/* 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 "surf_routing_full.hpp"
-#include "network_interface.hpp"
+#include "src/surf/surf_routing_private.hpp"
+#include "src/surf/surf_routing_full.hpp"
+#include "src/surf/network_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
AS_t model_full_create(void)
{
- return new AsFull();
+ return new simgrid::surf::AsFull();
}
void model_full_end(AS_t _routing)
sg_platf_route_cbarg_t e_route;
/* set utils vars */
- AsFull *routing = static_cast<AsFull*>(_routing);
+ simgrid::surf::AsFull *routing = static_cast<simgrid::surf::AsFull*>(_routing);
int table_size = (int)xbt_dynar_length(routing->p_indexNetworkElm);
/* Create table if necessary */
}
}
-AsFull::AsFull(){
- p_routingTable = 0;
-}
+namespace simgrid {
+namespace surf {
AsFull::~AsFull(){
if (p_routingTable) {
void *link = *(void **) xbt_dynar_get_ptr(route->link_list, 0);
Onelink *onelink;
if (p_hierarchy == SURF_ROUTING_BASE) {
- RoutingEdge *tmp_src = xbt_dynar_get_as(p_indexNetworkElm, src, sg_routing_edge_t);
+ NetCard *tmp_src = xbt_dynar_get_as(p_indexNetworkElm, src, sg_netcard_t);
tmp_src->setId(src);
- RoutingEdge *tmp_dst = xbt_dynar_get_as(p_indexNetworkElm, dst, sg_routing_edge_t);
- tmp_dst->setId(dst);
+ NetCard *tmp_dst = xbt_dynar_get_as(p_indexNetworkElm, dst, sg_netcard_t);
+ tmp_dst->setId(dst);
onelink = new Onelink(link, tmp_src, tmp_dst);
} else if (p_hierarchy == SURF_ROUTING_RECURSIVE)
onelink = new Onelink(link, route->gw_src, route->gw_dst);
return ret;
}
-void AsFull::getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t res, double *lat)
+void AsFull::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t res, double *lat)
{
XBT_DEBUG("full_get_route_and_latency from %s[%d] to %s[%d]",
src->getName(),
int as_route = 0;
char *src = (char*)(route->src);
char *dst = (char*)(route->dst);
- RoutingEdge *src_net_elm, *dst_net_elm;
- src_net_elm = sg_routing_edge_by_name_or_null(src);
- dst_net_elm = sg_routing_edge_by_name_or_null(dst);
+ NetCard *src_net_elm, *dst_net_elm;
+ src_net_elm = sg_netcard_by_name_or_null(src);
+ dst_net_elm = sg_netcard_by_name_or_null(dst);
xbt_assert(src_net_elm, "Network elements %s not found", src);
xbt_assert(dst_net_elm, "Network elements %s not found", dst);
XBT_DEBUG("Load ASroute from \"%s\" to \"%s\"", src, dst);
if (!route->gw_src ||
route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL)
- surf_parse_error("The src_gateway \"%s\" does not exist!",
+ surf_parse_error("The src_gateway \"%s\" does not exist!",
route->gw_src ? route->gw_src->getName() : "(null)");
if (!route->gw_dst ||
route->gw_dst->getRcType() == SURF_NETWORK_ELEMENT_NULL)
- surf_parse_error("The dst_gateway \"%s\" does not exist!",
+ surf_parse_error("The dst_gateway \"%s\" does not exist!",
route->gw_dst ? route->gw_dst->getName() : "(null)");
XBT_DEBUG("ASroute goes from \"%s\" to \"%s\"",
route->gw_src->getName(), route->gw_dst->getName());
|| (route->symmetrical == TRUE && as_route == 1)
) {
if (route->gw_dst && route->gw_src) {
- sg_routing_edge_t gw_tmp;
+ sg_netcard_t gw_tmp;
gw_tmp = route->gw_src;
route->gw_src = route->gw_dst;
route->gw_dst = gw_tmp;
xbt_dynar_free(&route->link_list);
}
-
-
-
+}
+}