#include "surf/surf.h"
#include "xbt/ex.h"
#include "xbt/log.h"
+#include "xbt/str.h"
#include "xbt/config.h"
XBT_LOG_NEW_CATEGORY(sd,"Logging specific to SimDag");
/* 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;
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_workstation_create(surf_workstation, NULL);
}
- xbt_dict_foreach(network_link_set, cursor, name, surf_link) {
+ xbt_dict_foreach(link_set, cursor, name, surf_link) {
__SD_link_create(surf_link, NULL);
}
{
double total_time = 0.0; /* we stop the simulation when total_time >= how_long */
double elapsed_time = 0.0;
- SD_task_t task, dst;
+ SD_task_t task, task_safe, dst;
SD_dependency_t dependency;
surf_action_t action;
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();
sd_global->watch_point_reached = 0;
/* explore the ready tasks */
- xbt_swag_foreach(task, sd_global->ready_task_set) {
+ xbt_swag_foreach_safe(task, task_safe, sd_global->ready_task_set) {
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 */
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;
}
/* 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");