X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ab413d78bd7f3f84d3b12e42a558d362daee3466..e9af650f7b0e1eb307aecd28d81f16c007421237:/src/surf/workstation.c diff --git a/src/surf/workstation.c b/src/surf/workstation.c index b07098096a..f8b2760971 100644 --- a/src/surf/workstation.c +++ b/src/surf/workstation.c @@ -305,12 +305,18 @@ static surf_action_t execute_parallel_task (int workstation_nb, { surf_action_parallel_task_CSL05_t action = NULL; int i, j, k; - xbt_dict_t network_link_set = xbt_dict_new(); - xbt_dict_cursor_t cursor = NULL; - char *name = NULL; + static xbt_dict_t network_link_set; + static int first_run = 1; int nb_link = 0; int nb_host = 0; - network_link_CM02_t link; + + if (first_run) { + network_link_set = xbt_dict_new_ext(workstation_nb * workstation_nb * 10); + first_run = 0; + } + else { + xbt_dict_reset(network_link_set); + } /* Compute the number of affected resources... */ for(i=0; i< workstation_nb; i++) { @@ -327,11 +333,7 @@ static surf_action_t execute_parallel_task (int workstation_nb, } } - xbt_dict_foreach(network_link_set, cursor, name, link) { - nb_link++; - } - - xbt_dict_free(&network_link_set); + nb_link = xbt_dict_length(network_link_set); for (i = 0; i0) nb_host++; @@ -344,7 +346,7 @@ static surf_action_t execute_parallel_task (int workstation_nb, action->generic_action.cost = amount; action->generic_action.remains = amount; action->generic_action.max_duration = NO_MAX_DURATION; - action->generic_action.start = -1.0; + action->generic_action.start = surf_get_clock(); action->generic_action.finish = -1.0; action->generic_action.resource_type = (surf_resource_t) surf_workstation_resource;