Also cleanup the fields of s_sg_platf_link_cbarg_t

[simgrid.git] / src / surf / network_im.c

diff --git a/src/surf/network_im.c b/src/surf/network_im.c
index 7a4887c..bc94690 100644 (file)
--- a/src/surf/network_im.c
+++ b/src/surf/network_im.c
@@ -188,22 +188,22 @@ static void* im_net_create_resource(const char *name,
   return nw_link;
 }
 
-static void im_net_parse_link_init(void)
+static void im_net_parse_link_init(sg_platf_link_cbarg_t link)
 {
-  if(struct_lnk->V_policy_initial_link == SURF_LINK_FULLDUPLEX)
+  if(link->policy == SURF_LINK_FULLDUPLEX)
   {
-         im_net_create_resource(bprintf("%s_UP",struct_lnk->V_link_id), struct_lnk->V_link_bandwidth, struct_lnk->V_link_bandwidth_file,
-                      struct_lnk->V_link_latency, struct_lnk->V_link_latency_file, struct_lnk->V_link_state, struct_lnk->V_link_state_file,
-                      struct_lnk->V_policy_initial_link, xbt_dict_new());
-         im_net_create_resource(bprintf("%s_DOWN",struct_lnk->V_link_id), struct_lnk->V_link_bandwidth, struct_lnk->V_link_bandwidth_file,
-            struct_lnk->V_link_latency, struct_lnk->V_link_latency_file, struct_lnk->V_link_state, struct_lnk->V_link_state_file,
-                      struct_lnk->V_policy_initial_link, xbt_dict_new());
+         im_net_create_resource(bprintf("%s_UP",link->id), link->bandwidth, link->bandwidth_trace,
+                      link->latency, link->latency_trace, link->state, link->state_trace,
+                      link->policy, link->properties);
+         im_net_create_resource(bprintf("%s_DOWN",link->id), link->bandwidth, link->bandwidth_trace,
+            link->latency, link->latency_trace, link->state, link->state_trace,
+            link->policy, NULL); // FIXME: We need to deep copy the properties or we won't be able to free it
   }
   else
   {
-         im_net_create_resource(xbt_strdup(struct_lnk->V_link_id), struct_lnk->V_link_bandwidth, struct_lnk->V_link_bandwidth_file,
-               struct_lnk->V_link_latency, struct_lnk->V_link_latency_file, struct_lnk->V_link_state, struct_lnk->V_link_state_file,
-                      struct_lnk->V_policy_initial_link, xbt_dict_new());
+         im_net_create_resource(xbt_strdup(link->id), link->bandwidth, link->bandwidth_trace,
+               link->latency, link->latency_trace, link->state, link->state_trace,
+                      link->policy, link->properties);
   }
 }
 
@@ -266,8 +266,8 @@ static void im_net_add_traces(void)
 static void im_net_define_callbacks(void)
 {
   /* Figuring out the network links */
-  surfxml_add_callback(STag_surfxml_link_cb_list, &im_net_parse_link_init);
-  surfxml_add_callback(ETag_surfxml_platform_cb_list, &im_net_add_traces);
+  sg_platf_link_add_cb(im_net_parse_link_init);
+  sg_platf_postparse_add_cb(im_net_add_traces);
 }
 
 static int im_net_resource_used(void *resource_id)