}
static void ns3_free_dynar(void * elmts){
- if(elmts)
- free(elmts);
+ free(elmts);
return;
}
if(host_src && host_dst){}
else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
- ns3_add_link(host_src->node_num,host_dst->node_num,bw,lat);
+ ns3_add_link(host_src->node_num,host_src->type,
+ host_dst->node_num,host_dst->type,
+ bw,lat);
free(router_id);
free(host_id);
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);
- char * link_bdw = bprintf("%s",((surf_ns3_link_t)link)->data->bdw);
- char * link_lat = bprintf("%s",(((surf_ns3_link_t)link)->data->lat));
+ char * link_bdw = xbt_strdup(((surf_ns3_link_t)link)->data->bdw);
+ char * link_lat = xbt_strdup(((surf_ns3_link_t)link)->data->lat);
replace_lat_ns3(&link_lat);
replace_bdw_ns3(&link_bdw);
((surf_ns3_link_t)link)->created = 0;
if(host_src && host_dst){}
else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
- ns3_add_link(host_src->node_num,host_dst->node_num,link_bdw,link_lat);
+ ns3_add_link(host_src->node_num,host_src->type,host_dst->node_num,host_dst->type,link_bdw,link_lat);
xbt_free(link_bdw);
xbt_free(link_lat);
}
}
-static void define_callbacks_ns3(const char *filename)
+static void define_callbacks_ns3(void)
{
surfxml_add_callback(STag_surfxml_host_cb_list, &parse_ns3_add_host); //HOST
surfxml_add_callback(STag_surfxml_router_cb_list, &parse_ns3_add_router); //ROUTER
surfxml_add_callback(ETag_surfxml_platform_cb_list, &parse_ns3_end_platform); //InitializeRoutes
}
-static void free_ns3_elmts(void * elmts)
-{
-}
-
static void free_ns3_link(void * elmts)
{
ns3_link_t link = elmts;
}
#endif
-void surf_network_model_init_NS3(const char *filename)
+void surf_network_model_init_NS3()
{
if (surf_network_model)
return;
}
routing_model_create(sizeof(s_surf_ns3_link_t), NULL, NULL);
- define_callbacks_ns3(filename);
+ define_callbacks_ns3();
NS3_HOST_LEVEL = xbt_lib_add_level(host_lib,(void_f_pvoid_t)free_ns3_host);
NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib,(void_f_pvoid_t)free_ns3_host);
{
ns3_finalize();
xbt_dynar_free_container(&IPV4addr);
+ xbt_dict_free(&dict_socket);
}
static double ns3_share_resources(double min)
char *key;
void *data;
+ static xbt_dynar_t socket_to_destroy = NULL;
+ if(!socket_to_destroy) socket_to_destroy = xbt_dynar_new(sizeof(char*),NULL);
+
surf_action_network_ns3_t action = NULL;
xbt_swag_t running_actions =
surf_network_model->states.running_action_set;
xbt_dict_foreach(dict_socket,cursor,key,data){
action = (surf_action_network_ns3_t)ns3_get_socket_action(data);
+ XBT_DEBUG("Processing socket %p (action %p)",data,action);
action->generic_action.remains = action->generic_action.cost - ns3_get_socket_sent(data);
#ifdef HAVE_TRACING
#endif
if(ns3_get_socket_is_finished(data) == 1){
+ xbt_dynar_push(socket_to_destroy,&key);
+ XBT_DEBUG("Destroy socket %p of action %p", key, action);
action->generic_action.finish = now;
surf_action_state_set(&(action->generic_action), SURF_ACTION_DONE);
}
}
+
+ while (!xbt_dynar_is_empty(socket_to_destroy)){
+ xbt_dynar_pop(socket_to_destroy,&key);
+
+ void *data = xbt_dict_get (dict_socket, key);
+ surf_action_network_ns3_t action = (surf_action_network_ns3_t)ns3_get_socket_action(data);
+ XBT_DEBUG ("Removing socket %p of action %p", key, action);
+ xbt_dict_remove(dict_socket,key);
+ }
return;
}
#ifdef HAVE_TRACING
xbt_free(((surf_action_network_ns3_t)action)->src_name);
xbt_free(((surf_action_network_ns3_t)action)->dst_name);
- if (action->category)
- xbt_free(action->category);
+ xbt_free(action->category);
#endif
-
+ XBT_DEBUG ("Removing action %p", action);
surf_action_free(&action);
return 1;
}