-/* Copyright (c) 2009-2014. The SimGrid Team.
+/* Copyright (c) 2009-2015. 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 "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");
-/* Global vars */
-extern routing_platf_t routing_platf;
-extern int surf_parse_lineno;
-
#define TO_ROUTE_FULL(i,j) p_routingTable[(i)+(j)*table_size]
AS_t model_full_create(void)
{
- return new AsFull();
+ return new simgrid::surf::AsFull();
}
-void model_full_end(AS_t _routing)
-{
+namespace simgrid {
+namespace surf {
+void AsFull::Seal() {
int i;
sg_platf_route_cbarg_t e_route;
/* set utils vars */
- AsFullPtr routing = ((AsFullPtr) _routing);
- int table_size = (int)xbt_dynar_length(routing->p_indexNetworkElm);
+ int table_size = (int)xbt_dynar_length(p_indexNetworkElm);
/* Create table if necessary */
- if (!routing->p_routingTable)
- routing->p_routingTable = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size);
+ if (!p_routingTable)
+ p_routingTable = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size);
/* Add the loopback if needed */
- if (routing_platf->p_loopback && routing->p_hierarchy == SURF_ROUTING_BASE) {
+ if (routing_platf->p_loopback && p_hierarchy == SURF_ROUTING_BASE) {
for (i = 0; i < table_size; i++) {
- e_route = routing->TO_ROUTE_FULL(i, i);
+ e_route = TO_ROUTE_FULL(i, i);
if (!e_route) {
e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
e_route->gw_src = NULL;
e_route->gw_dst = NULL;
e_route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
xbt_dynar_push(e_route->link_list, &routing_platf->p_loopback);
- routing->TO_ROUTE_FULL(i, i) = e_route;
+ TO_ROUTE_FULL(i, i) = e_route;
}
}
}
}
-AsFull::AsFull(){
- p_routingTable = 0;
-}
-
AsFull::~AsFull(){
if (p_routingTable) {
int table_size = (int)xbt_dynar_length(p_indexNetworkElm);
xbt_dynar_t AsFull::getOneLinkRoutes()
{
- xbt_dynar_t ret = xbt_dynar_new(sizeof(OnelinkPtr), xbt_free);
+ xbt_dynar_t ret = xbt_dynar_new(sizeof(Onelink*), xbt_free_f);
int src, dst;
int table_size = xbt_dynar_length(p_indexNetworkElm);
if (route) {
if (xbt_dynar_length(route->link_list) == 1) {
void *link = *(void **) xbt_dynar_get_ptr(route->link_list, 0);
- OnelinkPtr onelink;
+ Onelink *onelink;
if (p_hierarchy == SURF_ROUTING_BASE) {
- RoutingEdgePtr 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);
- RoutingEdgePtr 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(RoutingEdgePtr src, RoutingEdgePtr 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(),
xbt_dynar_foreach(e_route->link_list, cpt, link) {
xbt_dynar_push(res->link_list, &link);
if (lat)
- *lat += static_cast<NetworkLinkPtr>(link)->getLatency();
+ *lat += static_cast<Link*>(link)->getLatency();
}
}
}
int as_route = 0;
char *src = (char*)(route->src);
char *dst = (char*)(route->dst);
- RoutingEdgePtr 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_dynar_t link_route_to_test =
xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
xbt_dynar_foreach(route->link_list, i, link_name) {
- void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
+ void *link = Link::byName(link_name);
xbt_assert(link, "Link : '%s' doesn't exists.", link_name);
xbt_dynar_push(link_route_to_test, &link);
}
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_new(sizeof(sg_routing_link_t), NULL);
for (i = xbt_dynar_length(route->link_list); i > 0; i--) {
link_name = xbt_dynar_get_as(route->link_list, i - 1, char *);
- void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
+ void *link = Link::byName(link_name);
xbt_assert(link, "Link : '%s' doesn't exists.", link_name);
xbt_dynar_push(link_route_to_test, &link);
}
xbt_dynar_free(&route->link_list);
}
-
-
-
+}
+}
