X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/014fb38c9ecb8a27235f32c4cd47de6abe3cb3ef..f5b15e157009dbaef93d579aaf5f093864fc7cc7:/src/surf/network_im.c

diff --git a/src/surf/network_im.c b/src/surf/network_im.c
index 90097dfd9d..bc94690fac 100644
--- a/src/surf/network_im.c
+++ b/src/surf/network_im.c
@@ -150,7 +150,7 @@ static double (*im_bandwidth_constraint_callback) (double, double, double) =
     &im_constant_bandwidth_constraint;
 
 
-static void* im_net_create_resource(char *name,
+static void* im_net_create_resource(const char *name,
                                 double bw_initial,
                                 tmgr_trace_t bw_trace,
                                 double lat_initial,
@@ -188,22 +188,22 @@ static void* im_net_create_resource(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);
   }
 }
 
@@ -263,11 +263,11 @@ static void im_net_add_traces(void)
   }
 }
 
-static void im_net_define_callbacks(const char *file)
+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)
@@ -377,7 +377,9 @@ static double im_net_share_resources(double now)
   XBT_DEBUG("Before share resources, the size of modified actions set is %d", xbt_swag_size(im_net_modified_set));
   update_action_remaining(now);
 
+  keep_track = im_net_modified_set;
   lmm_solve(network_im_maxmin_system);
+  keep_track = NULL;
 
   XBT_DEBUG("After share resources, The size of modified actions set is %d", xbt_swag_size(im_net_modified_set));
 
@@ -874,7 +876,6 @@ static void im_surf_network_model_init_internal(void)
           im_net_get_link_latency);
   im_net_modified_set =
       xbt_swag_new(xbt_swag_offset(comm, action_list_hookup));
-  keep_track = im_net_modified_set;
 }
 
 
@@ -882,13 +883,13 @@ static void im_surf_network_model_init_internal(void)
 /************************************************************************/
 /* New model based on optimizations discussed during this thesis        */
 /************************************************************************/
-void im_surf_network_model_init_LegrandVelho(const char *filename)
+void im_surf_network_model_init_LegrandVelho(void)
 {
 
   if (surf_network_model)
     return;
   im_surf_network_model_init_internal();
-  im_net_define_callbacks(filename);
+  im_net_define_callbacks();
   xbt_dynar_push(model_list, &surf_network_model);
   network_im_solve = lmm_solve;