A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly integrate the link creation into sg_platf
[simgrid.git]
/
src
/
surf
/
network_ns3.c
diff --git
a/src/surf/network_ns3.c
b/src/surf/network_ns3.c
index
898f9c2
..
8c7e6e2
100644
(file)
--- a/
src/surf/network_ns3.c
+++ b/
src/surf/network_ns3.c
@@
-216,7
+216,9
@@
void parse_ns3_add_cluster(void)
if(host_src && host_dst){}
else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
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);
free(router_id);
free(host_id);
@@
-302,7
+304,7
@@
void create_ns3_topology()
if(host_src && host_dst){}
else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
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);
xbt_free(link_bdw);
xbt_free(link_lat);
@@
-310,7
+312,7
@@
void create_ns3_topology()
}
}
}
}
-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(STag_surfxml_host_cb_list, &parse_ns3_add_host); //HOST
surfxml_add_callback(STag_surfxml_router_cb_list, &parse_ns3_add_router); //ROUTER
@@
-355,7
+357,7
@@
static void ns3_action_set_category(surf_action_t action, const char *category)
}
#endif
}
#endif
-void surf_network_model_init_NS3(
const char *filename
)
+void surf_network_model_init_NS3()
{
if (surf_network_model)
return;
{
if (surf_network_model)
return;
@@
-387,7
+389,7
@@
void surf_network_model_init_NS3(const char *filename)
}
routing_model_create(sizeof(s_surf_ns3_link_t), NULL, NULL);
}
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_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);
@@
-406,6
+408,7
@@
static void finalize(void)
{
ns3_finalize();
xbt_dynar_free_container(&IPV4addr);
{
ns3_finalize();
xbt_dynar_free_container(&IPV4addr);
+ xbt_dict_free(&dict_socket);
}
static double ns3_share_resources(double min)
}
static double ns3_share_resources(double min)
@@
-481,6
+484,7
@@
static void ns3_update_actions_state(double now, double delta)
if(ns3_get_socket_is_finished(data) == 1){
xbt_dynar_push(socket_to_destroy,&key);
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);
}
action->generic_action.finish = now;
surf_action_state_set(&(action->generic_action), SURF_ACTION_DONE);
}