X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0ffc37686edcc803601f76ab51fdfed5fc2f241..3af9dcb5714db015a7038a58701b2b453f52c6ca:/src/surf/network_gtnets.c diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c index 4392bb3330..8dec8b5984 100644 --- a/src/surf/network_gtnets.c +++ b/src/surf/network_gtnets.c @@ -196,7 +196,7 @@ static void action_state_set(surf_action_t action, surf_action_state_set(action, state); } -static double share_resources(double now) +static double share_resources(surf_model_t network_model, double now) { xbt_swag_t running_actions = surf_network_model->states.running_action_set; @@ -216,11 +216,11 @@ static double share_resources(double now) return time_to_next_flow_completion; } -static void update_actions_state(double now, double delta) +static void update_actions_state(surf_model_t network_model, double now, double delta) { surf_action_network_GTNETS_t action = NULL; xbt_swag_t running_actions = - surf_network_model->states.running_action_set; + network_model->states.running_action_set; /* If there are no running flows, just return */ if (time_to_next_flow_completion < 0.0) { @@ -400,7 +400,7 @@ static void gtnets_action_set_category(surf_action_t action, const char *categor } #endif -static void finalize(void) +static void finalize(surf_model_t network_model) { gtnets_finalize(); } @@ -410,6 +410,7 @@ static void surf_network_model_init_internal(void) surf_network_model = surf_model_init(); surf_network_model->name = "network GTNetS"; + surf_network_model->type = SURF_MODEL_TYPE_NETWORK; surf_network_model->action_unref = action_unref; surf_network_model->action_cancel = action_cancel; surf_network_model->action_recycle = action_recycle;