X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/881abd8885ef97b5157eb965c87cd71d0294aea8..8a148ae3a296d7cf7532fa636e659a860ad3f943:/src/surf/network.c diff --git a/src/surf/network.c b/src/surf/network.c index 50de0dd5cc..3535d2bb6f 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -385,6 +385,8 @@ static double share_resources(double now) network_maxmin_system, network_solve); +#define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + xbt_swag_offset(s_action, variable) ))) + xbt_swag_foreach(action, running_actions) { if (action->latency > 0) { if (min < 0) @@ -823,6 +825,25 @@ void surf_network_model_init_Reno(const char *filename) (surf_model_t) surf_network_model); } + +void surf_network_model_init_Reno2(const char *filename) +{ + if (surf_network_model) + return; + surf_network_model_init_internal(); + parse_file(filename); + + xbt_dynar_push(model_list, &surf_network_model); + lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp, + func_reno2_fpi); + network_solve = lagrange_solve; + + update_model_description(surf_network_model_description, + surf_network_model_description_size, + "Reno2", + (surf_model_t) surf_network_model); +} + void surf_network_model_init_Vegas(const char *filename) { if (surf_network_model)