sd_global->not_scheduled_task_set =
xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->scheduled_task_set =
+ sd_global->schedulable_task_set =
xbt_swag_new(xbt_swag_offset(task, state_hookup));
- sd_global->ready_task_set =
+ 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));
if (SD_INITIALISED()) {
DEBUG0("Recreating the swags...");
xbt_swag_free(sd_global->not_scheduled_task_set);
+ xbt_swag_free(sd_global->schedulable_task_set);
xbt_swag_free(sd_global->scheduled_task_set);
- xbt_swag_free(sd_global->ready_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->schedulable_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.
* \return a NULL-terminated array of \ref SD_task_t whose state has changed.
* \see SD_task_schedule(), SD_task_watch()
*/
-SD_task_t *SD_simulate(double how_long)
+xbt_dynar_t SD_simulate(double how_long)
{
double total_time = 0.0; /* we stop the simulation when total_time >= how_long */
double elapsed_time = 0.0;
SD_task_t task, task_safe, dst;
SD_dependency_t dependency;
surf_action_t action;
- SD_task_t *res = NULL;
xbt_dynar_t changed_tasks = xbt_dynar_new(sizeof(SD_task_t), NULL);
unsigned int iter, depcnt;
static int first_time = 1;
}
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);
dst = dependency->dst;
if (dst->unsatisfied_dependencies>0)
dst->unsatisfied_dependencies--;
+ if (dst->is_not_ready>0)
+ dst->is_not_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_SCHEDULABLE);
+ }
- if (!(dst->unsatisfied_dependencies) && __SD_task_is_scheduled(dst))
- __SD_task_set_state(dst, SD_READY);
+ if (SD_task_get_kind(dst) == SD_TASK_COMM_E2E){
+ SD_dependency_t comm_dep;
+ SD_task_t comm_dst;
+ xbt_dynar_get_cpy(dst->tasks_after, 0, &comm_dep);
+ comm_dst = comm_dep->dst;
+ if (__SD_task_is_not_scheduled(comm_dst) &&
+ comm_dst->is_not_ready>0){
+ comm_dst->is_not_ready--;
+
+ if (!(comm_dst->is_not_ready)){
+ __SD_task_set_state(comm_dst, SD_SCHEDULABLE);
+ }
+ }
+ }
- /* 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))
}
}
- res = xbt_new0(SD_task_t, (xbt_dynar_length(changed_tasks) + 1));
-
- xbt_dynar_foreach(changed_tasks, iter, task) {
- res[iter] = task;
- }
- xbt_dynar_free(&changed_tasks);
-
VERB0("Simulation finished");
DEBUG3("elapsed_time = %f, total_time = %f, watch_point_reached = %d",
elapsed_time, total_time, sd_global->watch_point_reached);
DEBUG1("current time = %f", surf_get_clock());
- return res;
+ return changed_tasks;
}
/**
DEBUG0("Destroying the swags...");
xbt_swag_free(sd_global->not_scheduled_task_set);
+ xbt_swag_free(sd_global->schedulable_task_set);
xbt_swag_free(sd_global->scheduled_task_set);
- xbt_swag_free(sd_global->ready_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);