XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets, surf,
"Logging specific to the SURF network GTNetS module");
-extern routing_global_t global_routing;
+extern routing_platf_t routing_platf;
double sg_gtnets_jitter = 0.0;
int sg_gtnets_jitter_seed = 10;
link_count, name, lat, bw);
if (gtnets_add_link(link_count, bw, lat)) {
- xbt_die("Cannot create GTNetS link");
+ xbt_die("Cannot create GTNetS link");
}
gtnets_link->id = link_count;
if (link->policy == SURF_LINK_FULLDUPLEX)
{
- link_new(bprintf("%s_UP",link->id), link->bandwidth, link->latency, current_property_set);
- link_new(bprintf("%s_DOWN",link->id), link->bandwidth, link->latency, current_property_set);
+ link_new(bprintf("%s_UP",link->id), link->bandwidth, link->latency, current_property_set);
+ link_new(bprintf("%s_DOWN",link->id), link->bandwidth, link->latency, current_property_set);
}
else link_new(link->id, link->bandwidth, link->latency, current_property_set);
// and then you can use the id to reimplement properly the following GTNets calls
//get the onelinks from the parsed platform
- xbt_dynar_t onelink_routes = global_routing->get_onelink_routes();
+ xbt_dynar_t onelink_routes = routing_platf->get_onelink_routes();
if (!onelink_routes)
return;
onelink->dst->id);
XBT_DEBUG("Calling one link route");
if(onelink->src->rc_type == SURF_NETWORK_ELEMENT_ROUTER){
- gtnets_add_router(onelink->src->id);
+ gtnets_add_router(onelink->src->id);
}
if(onelink->dst->rc_type == SURF_NETWORK_ELEMENT_ROUTER){
gtnets_add_router(onelink->dst->id);
}
/* Max durations are not supported */
-static surf_action_t communicate(void *src_card,
- void *dst_card, double size,
- double rate)
+static surf_action_t communicate(sg_routing_edge_t src_card,
+ sg_routing_edge_t dst_card,
+ double size, double rate)
{
surf_action_network_GTNETS_t action = NULL;
- int src = ((network_element_t)src_card)->id;
- int dst = ((network_element_t)dst_card)->id;
- char *src_name = ((network_element_t)src_card)->name;
- char *dst_name = ((network_element_t)dst_card)->name;
+ int src = src_card->id;
+ int dst = dst_card->id;
+ char *src_name = src_card->name;
+ char *dst_name = dst_card->name;
xbt_assert((src >= 0
&& dst >= 0), "Either src or dst have invalid id (id<0)");
xbt_die("Impossible to initialize GTNetS interface");
}
- routing_model_create(sizeof(network_link_GTNETS_t), NULL);
+ routing_model_create(NULL);
}
#ifdef HAVE_LATENCY_BOUND_TRACKING