static s_route_KCCFLN05_t *routing_table = NULL;
#define ROUTE(i,j) routing_table[(i)+(j)*nb_workstation]
static network_link_KCCFLN05_t loopback = NULL;
+static xbt_dict_t parallel_task_network_link_set = NULL;
/*xbt_dict_t network_link_set = NULL;*/
deltap = delta;
if (action->latency > 0) {
if (action->latency > deltap) {
- surf_double_update(&(action->latency), deltap);
+ double_update(&(action->latency), deltap);
deltap = 0.0;
} else {
- surf_double_update(&(deltap), action->latency);
+ double_update(&(deltap), action->latency);
action->latency = 0.0;
}
if ((action->latency == 0.0) && !(action->suspended)) {
action->lat_current);
}
}
- surf_double_update(&(action->generic_action.remains),
+ double_update(&(action->generic_action.remains),
lmm_variable_getvalue(action->variable) * deltap);
if (action->generic_action.max_duration != NO_MAX_DURATION)
- surf_double_update(&(action->generic_action.max_duration), delta);
+ double_update(&(action->generic_action.max_duration), delta);
/* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
xbt_dict_free(&network_link_set);
xbt_dict_free(&workstation_set);
+ if (parallel_task_network_link_set != NULL) {
+ xbt_dict_free(¶llel_task_network_link_set);
+ }
xbt_swag_free(surf_workstation_resource->common_public->states.
ready_action_set);
xbt_swag_free(surf_workstation_resource->common_public->states.
{
surf_action_workstation_KCCFLN05_t action = NULL;
int i, j, k;
- static xbt_dict_t network_link_set;
- static int first_run = 1;
int nb_link = 0;
int nb_host = 0;
- 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);
+ if (parallel_task_network_link_set == NULL) {
+ parallel_task_network_link_set = xbt_dict_new_ext(workstation_nb * workstation_nb * 10);
}
/* Compute the number of affected resources... */
if(communication_amount[i*workstation_nb+j]>0)
for(k=0; k< route_size; k++) {
- xbt_dict_set(network_link_set, route[k]->name, route[k], NULL);
+ xbt_dict_set(parallel_task_network_link_set, route[k]->name, route[k], NULL);
}
}
}
- nb_link = xbt_dict_length(network_link_set);
+ nb_link = xbt_dict_length(parallel_task_network_link_set);
+ xbt_dict_reset(parallel_task_network_link_set);
for (i = 0; i<workstation_nb; i++)
if(computation_amount[i]>0) nb_host++;
if(!ROUTE(i,i).size) {
if(!loopback)
loopback = network_link_new(xbt_strdup("__MSG_loopback__"),
- 498.00, NULL, 0.000015, NULL,
+ 498000000, NULL, 0.000015, NULL,
SURF_NETWORK_LINK_ON, NULL,
SURF_NETWORK_LINK_FATPIPE);
ROUTE(i,i).size=1;