X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a3141b2111e49b104c2c6b59fe9e61146a688d38..cf56a22da60094d8e7f14b1457526dc194d40226:/src/simdag/sd_global.c diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c index a080aa780a..df22d65a14 100644 --- a/src/simdag/sd_global.c +++ b/src/simdag/sd_global.c @@ -123,7 +123,7 @@ static void sd_cfg_control_set(const char *control_string) /* To split the string in commands, and the cursors */ xbt_dynar_t set_strings; char *str; - int cpt; + unsigned int cpt; if (!control_string) return; @@ -359,6 +359,8 @@ void SD_create_environment(const char *platform_file) { surf_workstation_model_description[workstation_id]. model_init(platform_file); + parse_platform_file(platform_file); + _sd_init_status = 2; /* now let's create the SD wrappers for workstations and links */ @@ -395,7 +397,7 @@ SD_task_t* SD_simulate(double how_long) SD_task_t *changed_tasks = NULL; int changed_task_number = 0; int changed_task_capacity = sd_global->task_number + 1; - int i; + unsigned int iter; static int first_time = 1; SD_CHECK_INIT_DONE(); @@ -451,7 +453,7 @@ SD_task_t* SD_simulate(double how_long) total_time += elapsed_time; /* let's see which tasks are done */ - xbt_dynar_foreach(model_list, i, model) { + xbt_dynar_foreach(model_list, iter, model) { while ((action = xbt_swag_extract(model->common_public-> states.done_action_set))) { task = action->data; @@ -523,10 +525,10 @@ SD_task_t* SD_simulate(double how_long) } /* we must reset every task->state_changed */ - i = 0; - while (changed_tasks[i] != NULL) { - changed_tasks[i]->state_changed = 0; - i++; + iter = 0; + while (changed_tasks[iter] != NULL) { + changed_tasks[iter]->state_changed = 0; + iter++; } INFO0("Simulation finished");