* \see SD_create_environment(), SD_exit()
*/
void SD_init(int *argc, char **argv) {
+
+ s_SD_task_t task;
+
if (SD_INITIALISED()) {
xbt_assert0(0, "SD_init() already called");
}
- sd_global = xbt_new0(s_SD_global_t, 1);
+ sd_global = xbt_new(s_SD_global_t, 1);
sd_global->workstations = xbt_dict_new();
sd_global->workstation_count = 0;
sd_global->workstation_list = NULL;
sd_global->recyclable_route = NULL;
sd_global->watch_point_reached = 0;
- s_SD_task_t task;
sd_global->not_scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->ready_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;
surf_init(argc, argv);
}
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;
- 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;
INFO0("Starting simulation...");
/* create the array that will be returned */
- changed_tasks = xbt_new0(SD_task_t, changed_task_capacity);
+ changed_tasks = xbt_new(SD_task_t, changed_task_capacity);
changed_tasks[0] = NULL;
if (first_time) {
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);
}
+ */
changed_tasks[changed_task_number] = NULL;
}
}
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);
}
+ */
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;
+ /*
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;
}
}
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);
}
+ */
changed_tasks[changed_task_number] = NULL;
}
}