X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/014fb38c9ecb8a27235f32c4cd47de6abe3cb3ef..10beade7f2e5b5b7f318c3847602cc1ddbf09c99:/src/surf/network_im.c diff --git a/src/surf/network_im.c b/src/surf/network_im.c index 90097dfd9d..668c2f2b93 100644 --- a/src/surf/network_im.c +++ b/src/surf/network_im.c @@ -263,7 +263,7 @@ 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); @@ -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;