XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_ns3, surf,
"Logging specific to the SURF network NS3 module");
-extern routing_global_t global_routing;
+extern routing_platf_t routing_platf;
extern xbt_dict_t dict_socket;
static double time_to_next_flow_completion = -1;
);
}
-static void parse_ns3_add_AS(const char*id, const char*routing)
+static void parse_ns3_add_AS(sg_platf_AS_cbarg_t AS)
{
- XBT_DEBUG("NS3_ADD_AS '%s'",id);
+ XBT_DEBUG("NS3_ADD_AS '%s'",AS->id);
xbt_lib_set(as_router_lib,
- id,
+ AS->id,
NS3_ASR_LEVEL,
- ns3_add_AS(id)
+ ns3_add_AS(AS->id)
);
}
replace_bdw_ns3(&bw);
ns3_add_cluster(bw,lat,cluster->id);
xbt_free(lat);
- xbt_free(bw);
+ xbt_free(bw);
}
static double ns3_get_link_latency (const void *link)
xbt_dynar_shrink(IPV4addr,0);
//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)
xbt_die("There is no routes!");
XBT_DEBUG("Have get_onelink_routes, found %ld routes",onelink_routes->used);
replace_bdw_ns3(&link_bdw);
((surf_ns3_link_t)link)->created = 0;
- // XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id);
+ // XBT_DEBUG("src (%s), dst (%s), src_id = %d, dst_id = %d",src,dst, src_id, dst_id);
XBT_DEBUG("\tLink (%s) bdw:%s lat:%s",((surf_ns3_link_t)link)->data->id,
link_bdw,
link_lat
static void free_ns3_host(void * elmts)
{
- ns3_nodes_t host = elmts;
- free(host);
+ ns3_nodes_t host = elmts;
+ free(host);
}
#ifdef HAVE_LATENCY_BOUND_TRACKING