A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ansi C declaration of the variables (at the beginning of the blocks)
[simgrid.git]
/
src
/
simdag
/
sd_global.c
diff --git
a/src/simdag/sd_global.c
b/src/simdag/sd_global.c
index
a080aa7
..
df22d65
100644
(file)
--- 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;
/* 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;
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);
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 */
_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;
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();
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 */
total_time += elapsed_time;
/* let's see which tasks are done */
- xbt_dynar_foreach(model_list, i, model) {
+ xbt_dynar_foreach(model_list, i
ter
, model) {
while ((action = xbt_swag_extract(model->common_public->
states.done_action_set))) {
task = action->data;
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 */
}
/* we must reset every task->state_changed */
- i = 0;
- while (changed_tasks[i] != NULL) {
- changed_tasks[i]->state_changed = 0;
- i++;
+ i
ter
= 0;
+ while (changed_tasks[i
ter
] != NULL) {
+ changed_tasks[i
ter
]->state_changed = 0;
+ i
ter
++;
}
INFO0("Simulation finished");
}
INFO0("Simulation finished");