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->scheduled_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
+ sd_global->runnable_task_set =
+ xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->in_fifo_task_set =
xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->running_task_set =
if (SD_INITIALISED()) {
DEBUG0("Recreating the swags...");
xbt_swag_free(sd_global->not_scheduled_task_set);
- xbt_swag_free(sd_global->scheduled_task_set);
xbt_swag_free(sd_global->ready_task_set);
+ xbt_swag_free(sd_global->scheduled_task_set);
+ xbt_swag_free(sd_global->runnable_task_set);
xbt_swag_free(sd_global->in_fifo_task_set);
xbt_swag_free(sd_global->running_task_set);
xbt_swag_free(sd_global->done_task_set);
sd_global->not_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->scheduled_task_set =
xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->ready_task_set =
+ sd_global->runnable_task_set =
xbt_swag_new(xbt_swag_offset(task, state_hookup));
sd_global->in_fifo_task_set =
xbt_swag_new(xbt_swag_offset(task, state_hookup));
/**
* \brief Launches the simulation.
*
- * The function will execute the \ref SD_READY ready tasks.
+ * The function will execute the \ref SD_RUNNABLE runnable tasks.
* The simulation will be stopped when its time reaches \a how_long,
* when a watch point is reached, or when no more task can be executed.
* Then you can call SD_simulate() again.
}
sd_global->watch_point_reached = 0;
- /* explore the ready tasks */
- xbt_swag_foreach_safe(task, task_safe, sd_global->ready_task_set) {
+ /* explore the runnable tasks */
+ xbt_swag_foreach_safe(task, task_safe, sd_global->runnable_task_set) {
VERB1("Executing task '%s'", SD_task_get_name(task));
if (__SD_task_try_to_run(task) && !xbt_dynar_member(changed_tasks, &task))
xbt_dynar_push(changed_tasks, &task);
if (dst->unsatisfied_dependencies>0)
dst->unsatisfied_dependencies--;
- if (!(dst->unsatisfied_dependencies) && __SD_task_is_scheduled(dst))
- __SD_task_set_state(dst, SD_READY);
+ if (!(dst->unsatisfied_dependencies)){
+ if (__SD_task_is_scheduled(dst))
+ __SD_task_set_state(dst, SD_RUNNABLE);
+ else
+ __SD_task_set_state(dst, SD_READY);
+ }
- /* is dst ready now? */
- if (__SD_task_is_ready(dst) && !sd_global->watch_point_reached) {
+ /* is dst runnable now? */
+ if (__SD_task_is_runnable(dst) && !sd_global->watch_point_reached) {
VERB1("Executing task '%s'", SD_task_get_name(dst));
if (__SD_task_try_to_run(dst) &&
!xbt_dynar_member(changed_tasks, &task))
DEBUG0("Destroying the swags...");
xbt_swag_free(sd_global->not_scheduled_task_set);
- xbt_swag_free(sd_global->scheduled_task_set);
xbt_swag_free(sd_global->ready_task_set);
+ xbt_swag_free(sd_global->scheduled_task_set);
+ xbt_swag_free(sd_global->runnable_task_set);
xbt_swag_free(sd_global->in_fifo_task_set);
xbt_swag_free(sd_global->running_task_set);
xbt_swag_free(sd_global->done_task_set);