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 double ns3_share_resources(double min);
static void ns3_update_actions_state(double now, double delta);
static void finalize(void);
-static surf_action_t ns3_communicate(void *src_elm, void *dst_elm,
- double size, double rate);
+static surf_action_t ns3_communicate(sg_routing_edge_t src_elm,
+ sg_routing_edge_t dst_elm,
+ double size, double rate);
static void action_suspend(surf_action_t action);
static void action_resume(surf_action_t action);
static int action_is_suspended(surf_action_t action);
);
}
-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);
onelink_t onelink;
unsigned int iter;
xbt_dynar_foreach(onelink_routes, iter, onelink) {
- char *src = ((network_element_t)onelink->src)->name;
- char *dst = ((network_element_t)onelink->dst)->name;
+ char *src = onelink->src->name;
+ char *dst = onelink->dst->name;
void *link = onelink->link_ptr;
if( strcmp(src,dst) && ((surf_ns3_link_t)link)->created){
XBT_DEBUG("Route from '%s' to '%s' with link '%s'",src,dst,((surf_ns3_link_t)link)->data->id);
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
/* Added the initialization for NS3 interface */
- if (ns3_initialize(xbt_cfg_get_string(_surf_cfg_set,"ns3/TcpModel"))) {
+ if (ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel"))) {
xbt_die("Impossible to initialize NS3 interface");
}
- routing_model_create(sizeof(s_surf_ns3_link_t), NULL);
+ routing_model_create(NULL);
define_callbacks_ns3();
NS3_HOST_LEVEL = xbt_lib_add_level(host_lib,(void_f_pvoid_t)free_ns3_host);
double data_delta_sent = data_sent - action->last_sent;
xbt_dynar_t route = NULL;
- routing_get_route_and_latency (action->src_name, action->dst_name, &route, NULL);
+
+ routing_get_route_and_latency (action->src_elm, action->dst_elm, &route, NULL);
unsigned int i;
for (i = 0; i < xbt_dynar_length (route); i++){
surf_ns3_link_t *link = ((surf_ns3_link_t*)xbt_dynar_get_ptr (route, i));
}
/* Max durations are not supported */
-static surf_action_t ns3_communicate(void *src_elm,
- void *dst_elm, double size, double rate)
+static surf_action_t ns3_communicate(sg_routing_edge_t src_elm,
+ sg_routing_edge_t dst_elm,
+ double size, double rate)
{
surf_action_network_ns3_t action = NULL;
- XBT_DEBUG("Communicate from %s to %s",((network_element_t)src_elm)->name,((network_element_t)dst_elm)->name);
+ XBT_DEBUG("Communicate from %s to %s", src_elm->name, dst_elm->name);
action = surf_action_new(sizeof(s_surf_action_network_ns3_t), size, surf_network_model, 0);
- ns3_create_flow(((network_element_t)src_elm)->name, ((network_element_t)dst_elm)->name, surf_get_clock(), size, action);
+ ns3_create_flow(src_elm->name, dst_elm->name, surf_get_clock(), size, action);
#ifdef HAVE_TRACING
action->last_sent = 0;
- action->src_name = xbt_strdup (src_name);
- action->dst_name = xbt_strdup (dst_name);
+ action->src_elm = src_elm;
+ action->dst_elm = dst_elm;
#endif
return (surf_action_t) action;
xbt_swag_remove(action, action->state_set);
#ifdef HAVE_TRACING
- xbt_free(((surf_action_network_ns3_t)action)->src_name);
- xbt_free(((surf_action_network_ns3_t)action)->dst_name);
xbt_free(action->category);
#endif
XBT_DEBUG ("Removing action %p", action);