-/* Copyright (c) 2006-2018. The SimGrid Team.
+/* Copyright (c) 2006-2019. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
SD_task_t task = xbt_new0(s_SD_task_t, 1);
task->kind = SD_TASK_NOT_TYPED;
task->state= SD_NOT_SCHEDULED;
- sd_global->initial_tasks->insert(task);
+ sd_global->initial_tasks.insert(task);
task->marked = 0;
task->start_time = -1.0;
std::set<SD_task_t>::iterator idx;
XBT_DEBUG("Set state of '%s' to %d", task->name, new_state);
if ((new_state == SD_NOT_SCHEDULED || new_state == SD_SCHEDULABLE) && task->state == SD_FAILED){
- sd_global->completed_tasks->erase(task);
- sd_global->initial_tasks->insert(task);
+ sd_global->completed_tasks.erase(task);
+ sd_global->initial_tasks.insert(task);
}
if (new_state == SD_SCHEDULED && task->state == SD_RUNNABLE){
- sd_global->initial_tasks->insert(task);
- sd_global->runnable_tasks->erase(task);
+ sd_global->initial_tasks.insert(task);
+ sd_global->runnable_tasks.erase(task);
}
if (new_state == SD_RUNNABLE){
- idx = sd_global->initial_tasks->find(task);
- if (idx != sd_global->initial_tasks->end()) {
- sd_global->runnable_tasks->insert(*idx);
- sd_global->initial_tasks->erase(idx);
+ idx = sd_global->initial_tasks.find(task);
+ if (idx != sd_global->initial_tasks.end()) {
+ sd_global->runnable_tasks.insert(*idx);
+ sd_global->initial_tasks.erase(idx);
}
}
if (new_state == SD_RUNNING)
- sd_global->runnable_tasks->erase(task);
+ sd_global->runnable_tasks.erase(task);
if (new_state == SD_DONE || new_state == SD_FAILED){
- sd_global->completed_tasks->insert(task);
+ sd_global->completed_tasks.insert(task);
task->start_time = task->surf_action->get_start_time();
if (new_state == SD_DONE){
task->finish_time = task->surf_action->get_finish_time();
} else {
return dst->predecessors->size() + dst->inputs->size();
}
- return 0;
}
/**
XBT_VERB("Executing task '%s'", task->name);
/* Beware! The scheduling data are now used by the surf action directly! no copy was done */
- task->surf_action = surf_host_model->execute_parallel(task->allocation->size(), task->allocation->data(),
- task->flops_amount, task->bytes_amount, task->rate);
+ task->surf_action =
+ surf_host_model->execute_parallel(*task->allocation, task->flops_amount, task->bytes_amount, task->rate);
task->surf_action->set_data(task);
XBT_DEBUG("surf_action = %p", task->surf_action);
SD_task_set_state(task, SD_RUNNING);
- sd_global->return_set->insert(task);
+ sd_global->return_set.insert(task);
}
/**