git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2691
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
xbt_swag_t done_task_set;
xbt_swag_t failed_task_set;
xbt_swag_t done_task_set;
xbt_swag_t failed_task_set;
} s_SD_global_t, *SD_global_t;
extern SD_global_t sd_global;
} s_SD_global_t, *SD_global_t;
extern SD_global_t sd_global;
sd_global->running_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->done_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->failed_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->running_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->done_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->failed_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->task_number = 0;
xbt_dict_foreach(network_link_set, cursor, name, surf_link) {
__SD_link_create(surf_link, NULL);
}
xbt_dict_foreach(network_link_set, cursor, name, surf_link) {
__SD_link_create(surf_link, NULL);
}
+
+ DEBUG2("Workstation number: %d, link number: %d", SD_workstation_get_number(), SD_link_get_number());
surf_action_t action;
SD_task_t *changed_tasks = NULL;
int changed_task_number = 0;
surf_action_t action;
SD_task_t *changed_tasks = NULL;
int changed_task_number = 0;
- int changed_task_capacity = 16; /* will be increased if necessary */
+ int changed_task_capacity = sd_global->task_number + 1;
int i;
static int first_time = 1;
int i;
static int first_time = 1;
INFO1("Executing task '%s'", SD_task_get_name(task));
if ((task->state_changed = __SD_task_try_to_run(task))) {
changed_tasks[changed_task_number++] = task; /* replace NULL by the task */
INFO1("Executing task '%s'", SD_task_get_name(task));
if ((task->state_changed = __SD_task_try_to_run(task))) {
changed_tasks[changed_task_number++] = task; /* replace NULL by the task */
if (changed_task_number == changed_task_capacity) {
changed_task_capacity *= 2;
changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
}
if (changed_task_number == changed_task_capacity) {
changed_task_capacity *= 2;
changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
}
changed_tasks[changed_task_number] = NULL;
}
}
changed_tasks[changed_task_number] = NULL;
}
}
if (!task->state_changed) {
task->state_changed = 1;
changed_tasks[changed_task_number++] = task;
if (!task->state_changed) {
task->state_changed = 1;
changed_tasks[changed_task_number++] = task;
if (changed_task_number == changed_task_capacity) {
changed_task_capacity *= 2;
changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
}
if (changed_task_number == changed_task_capacity) {
changed_task_capacity *= 2;
changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
}
changed_tasks[changed_task_number] = NULL;
}
changed_tasks[changed_task_number] = NULL;
}
INFO1("Executing task '%s'", SD_task_get_name(dst));
if (__SD_task_try_to_run(dst)) {
changed_tasks[changed_task_number++] = dst;
INFO1("Executing task '%s'", SD_task_get_name(dst));
if (__SD_task_try_to_run(dst)) {
changed_tasks[changed_task_number++] = dst;
if (changed_task_number == changed_task_capacity) {
changed_task_capacity *= 2;
changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
}
if (changed_task_number == changed_task_capacity) {
changed_task_capacity *= 2;
changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
}
changed_tasks[changed_task_number] = NULL;
}
}
changed_tasks[changed_task_number] = NULL;
}
}
if (!task->state_changed) {
task->state_changed = 1;
changed_tasks[changed_task_number++] = task;
if (!task->state_changed) {
task->state_changed = 1;
changed_tasks[changed_task_number++] = task;
if (changed_task_number == changed_task_capacity) {
changed_task_capacity *= 2;
changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
}
if (changed_task_number == changed_task_capacity) {
changed_task_capacity *= 2;
changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
}
changed_tasks[changed_task_number] = NULL;
}
}
changed_tasks[changed_task_number] = NULL;
}
}
task->communication_amount = NULL;
task->rate = 0;
task->communication_amount = NULL;
task->rate = 0;
+ sd_global->task_number++;
+
xbt_dynar_free(&task->tasks_after);
xbt_free(task);
xbt_dynar_free(&task->tasks_after);
xbt_free(task);
+ sd_global->task_number--;
+
DEBUG0("Task destroyed.");
}
DEBUG0("Task destroyed.");
}