XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd, "Logging specific to SimDag (task)");
-/* Destroys a dependency between two tasks. */
-static void __SD_task_dependency_destroy(void *dependency)
-{
- xbt_free(((SD_dependency_t)dependency)->name);
- xbt_free(dependency);
-}
-
-/* Remove all dependencies associated with a task. This function is called when the task is destroyed. */
-static void __SD_task_remove_dependencies(SD_task_t task)
-{
- /* we must destroy the dependencies carefully (with SD_dependency_remove) because each one is stored twice */
- SD_dependency_t dependency;
- while (xbt_dynar_is_empty(task->tasks_before) == 0) {
- xbt_dynar_get_cpy(task->tasks_before, 0, &dependency);
- SD_task_dependency_remove(dependency->src, dependency->dst);
- }
-
- while (xbt_dynar_is_empty(task->tasks_after) == 0) {
- xbt_dynar_get_cpy(task->tasks_after, 0, &dependency);
- SD_task_dependency_remove(dependency->src, dependency->dst);
- }
-}
-
/* Destroys the data memorized by SD_task_schedule. Task state must be SD_SCHEDULED or SD_RUNNABLE. */
static void __SD_task_destroy_scheduling_data(SD_task_t task)
{
void* SD_task_new_f()
{
SD_task_t task = xbt_new0(s_SD_task_t, 1);
- task->tasks_before = xbt_dynar_new(sizeof(SD_dependency_t), nullptr);
- task->tasks_after = xbt_dynar_new(sizeof(SD_dependency_t), nullptr);
+ task->inputs = new std::set<SD_task_t>();
+ task->outputs = new std::set<SD_task_t>();
+ task->predecessors = new std::set<SD_task_t>();
+ task->successors = new std::set<SD_task_t>();
return task;
}
task->watch_points = 0;
/* dependencies */
- xbt_dynar_reset(task->tasks_before);
- xbt_dynar_reset(task->tasks_after);
- task->unsatisfied_dependencies = 0;
- task->is_not_ready = 0;
+ task->inputs->clear();
+ task->outputs->clear();
+ task->predecessors->clear();
+ task->successors->clear();
/* scheduling parameters */
task->host_count = 0;
{
SD_task_t task = static_cast<SD_task_t>(t);
- xbt_dynar_free(&task->tasks_before);
- xbt_dynar_free(&task->tasks_after);
+ delete task->inputs;
+ delete task->outputs;
+ delete task->predecessors;
+ delete task->successors;
+
xbt_free(task);
}
{
SD_task_t task = static_cast<SD_task_t>(xbt_mallocator_get(sd_global->task_mallocator));
- /* general information */
- task->data = data; /* user data */
+ task->data = data;
task->name = xbt_strdup(name);
task->amount = amount;
task->remains = amount;
{
XBT_DEBUG("Destroying task %s...", SD_task_get_name(task));
- __SD_task_remove_dependencies(task);
+ /* First Remove all dependencies associated with the task. */
+ while (!task->predecessors->empty())
+ SD_task_dependency_remove(*(task->predecessors->begin()), task);
+ while (!task->inputs->empty())
+ SD_task_dependency_remove(*(task->inputs->begin()), task);
+ while (!task->successors->empty())
+ SD_task_dependency_remove(task, *(task->successors->begin()));
+ while (!task->outputs->empty())
+ SD_task_dependency_remove(task, *(task->outputs->begin()));
if (task->state == SD_SCHEDULED || task->state == SD_RUNNABLE)
__SD_task_destroy_scheduling_data(task);
void SD_task_set_rate(SD_task_t task, double rate)
{
xbt_assert(task->kind == SD_TASK_COMM_E2E, "The rate can be modified for end-to-end communications only.");
- if(task->start_time<0) {
+ if(task->state < SD_RUNNING) {
task->rate = rate;
} else {
XBT_WARN("Task %p has started. Changing rate is ineffective.", task);
void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state)
{
std::set<SD_task_t>::iterator idx;
+ XBT_DEBUG("Set state of '%s' to %d", task->name, new_state);
switch (new_state) {
case SD_NOT_SCHEDULED:
case SD_SCHEDULABLE:
break;
case SD_SCHEDULED:
if (SD_task_get_state(task) == SD_RUNNABLE){
- sd_global->executable_tasks->erase(task);
sd_global->initial_tasks->insert(task);
+ sd_global->runnable_tasks->erase(task);
}
break;
case SD_RUNNABLE:
- idx = std::find(sd_global->initial_tasks->begin(), sd_global->initial_tasks->end(), task);
+ 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);
- sd_global->executable_tasks->insert(*idx);
}
break;
case SD_RUNNING:
- sd_global->executable_tasks->erase(task);
+ sd_global->runnable_tasks->erase(task);
break;
case SD_DONE:
sd_global->completed_tasks->insert(task);
+ task->start_time = task->surf_action->getStartTime();
task->finish_time = task->surf_action->getFinishTime();
+ task->surf_action->unref();
+ task->surf_action = nullptr;
task->remains = 0;
#if HAVE_JEDULE
jedule_log_sd_event(task);
break;
case SD_FAILED:
sd_global->completed_tasks->insert(task);
+ task->start_time = task->surf_action->getStartTime();
+ task->finish_time = surf_get_clock();
+ task->surf_action->unref();
+ task->surf_action = nullptr;
break;
default:
xbt_die( "Invalid state");
if (task->watch_points & new_state) {
XBT_VERB("Watch point reached with task '%s'!", SD_task_get_name(task));
- sd_global->watch_point_reached = 1;
+ sd_global->watch_point_reached = true;
SD_task_unwatch(task, new_state); /* remove the watch point */
}
}
xbt_dynar_t SD_task_get_parents(SD_task_t task)
{
- unsigned int i;
- SD_dependency_t dep;
-
xbt_dynar_t parents = xbt_dynar_new(sizeof(SD_task_t), nullptr);
- xbt_dynar_foreach(task->tasks_before, i, dep) {
- xbt_dynar_push(parents, &(dep->src));
- }
+
+ for (std::set<SD_task_t>::iterator it=task->predecessors->begin(); it!=task->predecessors->end(); ++it)
+ xbt_dynar_push(parents, &(*it));
+ for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it)
+ xbt_dynar_push(parents, &(*it));
+
return parents;
}
*/
xbt_dynar_t SD_task_get_children(SD_task_t task)
{
- unsigned int i;
- SD_dependency_t dep;
-
xbt_dynar_t children = xbt_dynar_new(sizeof(SD_task_t), nullptr);
- xbt_dynar_foreach(task->tasks_after, i, dep) {
- xbt_dynar_push(children, &(dep->dst));
- }
+
+ for (std::set<SD_task_t>::iterator it=task->successors->begin(); it!=task->successors->end(); ++it)
+ xbt_dynar_push(children, &(*it));
+ for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it)
+ xbt_dynar_push(children, &(*it));
+
return children;
}
/** @brief Displays debugging information about a task */
void SD_task_dump(SD_task_t task)
{
- unsigned int counter;
- SD_dependency_t dependency;
-
XBT_INFO("Displaying task %s", SD_task_get_name(task));
char *statename = bprintf("%s%s%s%s%s%s%s",
(task->state == SD_NOT_SCHEDULED ? " not scheduled" : ""),
}
}
- if (task->category)
- XBT_INFO(" - tracing category: %s", task->category);
-
XBT_INFO(" - amount: %.0f", SD_task_get_amount(task));
if (task->kind == SD_TASK_COMP_PAR_AMDAHL)
XBT_INFO(" - alpha: %.2f", task->alpha);
- XBT_INFO(" - Dependencies to satisfy: %d", task->unsatisfied_dependencies);
- if (xbt_dynar_is_empty(task->tasks_before) == 0) {
+ XBT_INFO(" - Dependencies to satisfy: %zu", task->inputs->size()+ task->predecessors->size());
+ if ((task->inputs->size()+ task->predecessors->size()) > 0) {
XBT_INFO(" - pre-dependencies:");
- xbt_dynar_foreach(task->tasks_before, counter, dependency) {
- XBT_INFO(" %s", SD_task_get_name(dependency->src));
- }
+ for (std::set<SD_task_t>::iterator it=task->predecessors->begin(); it!=task->predecessors->end(); ++it)
+ XBT_INFO(" %s", SD_task_get_name(*it));
+
+ for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it)
+ XBT_INFO(" %s", SD_task_get_name(*it));
}
- if (xbt_dynar_is_empty(task->tasks_after)== 0) {
+ if ((task->outputs->size() + task->successors->size()) > 0) {
XBT_INFO(" - post-dependencies:");
- xbt_dynar_foreach(task->tasks_after, counter, dependency) {
- XBT_INFO(" %s", SD_task_get_name(dependency->dst));
- }
+
+ for (std::set<SD_task_t>::iterator it=task->successors->begin(); it!=task->successors->end(); ++it)
+ XBT_INFO(" %s", SD_task_get_name(*it));
+ for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it)
+ XBT_INFO(" %s", SD_task_get_name(*it));
}
}
/** @brief Dumps the task in dotty formalism into the FILE* passed as second argument */
void SD_task_dotty(SD_task_t task, void *out)
{
- unsigned int counter;
- SD_dependency_t dependency;
FILE *fout = static_cast<FILE*>(out);
fprintf(fout, " T%p [label=\"%.20s\"", task, task->name);
switch (task->kind) {
xbt_die("Unknown task type!");
}
fprintf(fout, "];\n");
- xbt_dynar_foreach(task->tasks_before, counter, dependency) {
- fprintf(fout, " T%p -> T%p;\n", dependency->src, dependency->dst);
- }
+ for (std::set<SD_task_t>::iterator it=task->predecessors->begin(); it!=task->predecessors->end(); ++it)
+ fprintf(fout, " T%p -> T%p;\n", (*it), task);
+ for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it)
+ fprintf(fout, " T%p -> T%p;\n", (*it), task);
}
/**
*/
void SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task_t dst)
{
- bool found = false;
- SD_dependency_t dependency;
-
- unsigned long length = xbt_dynar_length(src->tasks_after);
-
if (src == dst)
THROWF(arg_error, 0, "Cannot add a dependency between task '%s' and itself", SD_task_get_name(src));
- e_SD_task_state_t state = SD_task_get_state(src);
- if (state != SD_NOT_SCHEDULED && state != SD_SCHEDULABLE && state != SD_RUNNING && state != SD_SCHEDULED &&
- state != SD_RUNNABLE)
+ if (src->state == SD_DONE || src->state == SD_FAILED)
THROWF(arg_error, 0, "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED, SD_RUNNABLE, or SD_RUNNING",
- SD_task_get_name(src));
+ src->name);
- state = SD_task_get_state(dst);
- if (state != SD_NOT_SCHEDULED && state != SD_SCHEDULABLE && state != SD_SCHEDULED && state != SD_RUNNABLE)
+ if (dst->state == SD_DONE || dst->state == SD_FAILED || dst->state == SD_RUNNING)
THROWF(arg_error, 0, "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED, or SD_RUNNABLE",
- SD_task_get_name(dst));
-
- XBT_DEBUG("SD_task_dependency_add: src = %s, dst = %s", SD_task_get_name(src), SD_task_get_name(dst));
- for (unsigned long i = 0; i < length && !found; i++) {
- xbt_dynar_get_cpy(src->tasks_after, i, &dependency);
- found = (dependency->dst == dst);
- XBT_DEBUG("Dependency %lu: dependency->dst = %s", i, SD_task_get_name(dependency->dst));
- }
+ dst->name);
- if (found)
- THROWF(arg_error, 0, "A dependency already exists between task '%s' and task '%s'",
- SD_task_get_name(src), SD_task_get_name(dst));
+ if (dst->inputs->find(src) != dst->inputs->end() || src->outputs->find(dst) != src->outputs->end() ||
+ src->successors->find(dst) != src->successors->end() || dst->predecessors->find(src) != dst->predecessors->end())
+ THROWF(arg_error, 0, "A dependency already exists between task '%s' and task '%s'", src->name, dst->name);
- dependency = xbt_new(s_SD_dependency_t, 1);
+ XBT_DEBUG("SD_task_dependency_add: src = %s, dst = %s", src->name, dst->name);
- dependency->name = xbt_strdup(name); /* xbt_strdup is cleaver enough to deal with nullptr args itself */
- dependency->data = data;
- dependency->src = src;
- dependency->dst = dst;
-
- /* src must be executed before dst */
- xbt_dynar_push(src->tasks_after, &dependency);
- xbt_dynar_push(dst->tasks_before, &dependency);
-
- dst->unsatisfied_dependencies++;
- dst->is_not_ready++;
-
- /* if the task was runnable, then dst->tasks_before is not empty anymore, so we must go back to state SD_SCHEDULED */
- if (SD_task_get_state(dst) == SD_RUNNABLE) {
- XBT_DEBUG("SD_task_dependency_add: %s was runnable and becomes scheduled!", SD_task_get_name(dst));
- SD_task_set_state(dst, SD_SCHEDULED);
+ if (src->kind == SD_TASK_COMM_E2E || src->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){
+ if (dst->kind == SD_TASK_COMP_SEQ || dst->kind == SD_TASK_COMP_PAR_AMDAHL)
+ dst->inputs->insert(src);
+ else
+ dst->predecessors->insert(src);
+ src->successors->insert(dst);
+ } else {
+ if (dst->kind == SD_TASK_COMM_E2E|| dst->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK)
+ src->outputs->insert(dst);
+ else
+ src->successors->insert(dst);
+ dst->predecessors->insert(src);
}
-}
-/**
- * \brief Returns the name given as input when dependency has been created.
- *
- * \param src a task
- * \param dst a task depending on \a src
- */
-const char *SD_task_dependency_get_name(SD_task_t src, SD_task_t dst)
-{
- unsigned int i;
- SD_dependency_t dependency;
-
- xbt_dynar_foreach(src->tasks_after, i, dependency){
- if (dependency->dst == dst)
- return dependency->name;
+ /* if the task was runnable, the task goes back to SD_SCHEDULED because of the new dependency*/
+ if (dst->state == SD_RUNNABLE) {
+ XBT_DEBUG("SD_task_dependency_add: %s was runnable and becomes scheduled!", dst->name);
+ SD_task_set_state(dst, SD_SCHEDULED);
}
- return nullptr;
}
/**
if (src) {
if (dst) {
- unsigned int counter;
- SD_dependency_t dependency;
- xbt_dynar_foreach(src->tasks_after, counter, dependency) {
- if (dependency->dst == dst)
- return 1;
- }
+ return (src->successors->find(dst) != src->successors->end() || src->outputs->find(dst) != src->outputs->end());
} else {
- return xbt_dynar_length(src->tasks_after);
+ return src->successors->size() + src->outputs->size();
}
} else {
- return xbt_dynar_length(dst->tasks_before);
+ return dst->predecessors->size() + dst->inputs->size();
}
return 0;
}
*/
void SD_task_dependency_remove(SD_task_t src, SD_task_t dst)
{
- unsigned long length;
- bool found = false;
- SD_dependency_t dependency;
-
- /* remove the dependency from src->tasks_after */
- length = xbt_dynar_length(src->tasks_after);
-
- for (unsigned long i = 0; i < length && !found; i++) {
- xbt_dynar_get_cpy(src->tasks_after, i, &dependency);
- if (dependency->dst == dst) {
- xbt_dynar_remove_at(src->tasks_after, i, nullptr);
- found = true;
- }
- }
- if (!found)
+ XBT_DEBUG("SD_task_dependency_remove: src = %s, dst = %s", SD_task_get_name(src), SD_task_get_name(dst));
+
+ if (src->successors->find(dst) == src->successors->end() && src->outputs->find(dst) == src->outputs->end())
THROWF(arg_error, 0, "No dependency found between task '%s' and '%s': task '%s' is not a successor of task '%s'",
- SD_task_get_name(src), SD_task_get_name(dst), SD_task_get_name(dst), SD_task_get_name(src));
-
- /* remove the dependency from dst->tasks_before */
- length = xbt_dynar_length(dst->tasks_before);
- found = false;
-
- for (unsigned long i = 0; i < length && !found; i++) {
- xbt_dynar_get_cpy(dst->tasks_before, i, &dependency);
- if (dependency->src == src) {
- xbt_dynar_remove_at(dst->tasks_before, i, nullptr);
- __SD_task_dependency_destroy(dependency);
- dst->unsatisfied_dependencies--;
- dst->is_not_ready--;
- found = true;
- }
- }
- /* should never happen... */
- xbt_assert(found, "SimDag error: task '%s' is a successor of '%s' but task '%s' is not a predecessor of task '%s'",
- SD_task_get_name(dst), SD_task_get_name(src), SD_task_get_name(src), SD_task_get_name(dst));
-
- /* if the task was scheduled and dst->tasks_before is empty now, we can make it runnable */
- if (dst->unsatisfied_dependencies == 0) {
- if (SD_task_get_state(dst) == SD_SCHEDULED)
- SD_task_set_state(dst, SD_RUNNABLE);
+ src->name, dst->name, dst->name, src->name);
+
+ if (src->kind == SD_TASK_COMM_E2E || src->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){
+ if (dst->kind == SD_TASK_COMP_SEQ || dst->kind == SD_TASK_COMP_PAR_AMDAHL)
+ dst->inputs->erase(src);
else
- SD_task_set_state(dst, SD_SCHEDULABLE);
+ dst->predecessors->erase(src);
+ src->successors->erase(dst);
+ } else {
+ if (dst->kind == SD_TASK_COMM_E2E|| dst->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK)
+ src->outputs->erase(dst);
+ else
+ src->successors->erase(dst);
+ dst->predecessors->erase(src);
}
- if (dst->is_not_ready == 0)
- SD_task_set_state(dst, SD_SCHEDULABLE);
-}
-
-/**
- * \brief Returns the user data associated with a dependency between two tasks
- *
- * \param src a task
- * \param dst a task depending on \a src
- * \return the user data associated with this dependency (can be \c nullptr)
- * \see SD_task_dependency_add()
- */
-void *SD_task_dependency_get_data(SD_task_t src, SD_task_t dst)
-{
- bool found = false;
- SD_dependency_t dependency;
-
- unsigned long length = xbt_dynar_length(src->tasks_after);
-
- for (unsigned long i = 0; i < length && !found; i++) {
- xbt_dynar_get_cpy(src->tasks_after, i, &dependency);
- found = (dependency->dst == dst);
- }
- if (!found)
- THROWF(arg_error, 0, "No dependency found between task '%s' and '%s'",
- SD_task_get_name(src), SD_task_get_name(dst));
- return dependency->data;
+ /* if the task was scheduled and dependencies are satisfied, we can make it runnable */
+ if (dst->predecessors->empty() && dst->inputs->empty() && dst->state == SD_SCHEDULED)
+ SD_task_set_state(dst, SD_RUNNABLE);
}
/**
if (SD_task_get_state(task) > SD_SCHEDULABLE)
THROWF(arg_error, 0, "Task '%s' has already been scheduled", SD_task_get_name(task));
- if (task->unsatisfied_dependencies == 0)
+ if (task->predecessors->empty() && task->inputs->empty())
SD_task_set_state(task, SD_RUNNABLE);
else
SD_task_set_state(task, SD_SCHEDULED);
*/
void SD_task_unschedule(SD_task_t task)
{
- if (task->state != SD_SCHEDULED && task->state != SD_RUNNABLE && task->state != SD_RUNNING &&
- task->state != SD_FAILED)
- THROWF(arg_error, 0, "Task %s: the state must be SD_SCHEDULED, SD_RUNNABLE, SD_RUNNING or SD_FAILED",
- SD_task_get_name(task));
+ if (task->state == SD_NOT_SCHEDULED || task->state == SD_SCHEDULABLE)
+ THROWF(arg_error, 0, "Task %s: the state must be SD_SCHEDULED, SD_RUNNABLE, SD_RUNNING or SD_FAILED", task->name);
- if ((task->state == SD_SCHEDULED || task->state == SD_RUNNABLE)
- /* if the task is scheduled or runnable */
+ if ((task->state == SD_SCHEDULED || task->state == SD_RUNNABLE) /* if the task is scheduled or runnable */
&& ((task->kind == SD_TASK_COMP_PAR_AMDAHL) || (task->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK))) {
/* Don't free scheduling data for typed tasks */
__SD_task_destroy_scheduling_data(task);
/* the task should become SD_FAILED */
task->surf_action->cancel();
else {
- if (task->unsatisfied_dependencies == 0)
+ if (task->predecessors->empty() && task->inputs->empty())
SD_task_set_state(task, SD_SCHEDULABLE);
else
SD_task_set_state(task, SD_NOT_SCHEDULED);
/* Runs a task. */
void SD_task_run(SD_task_t task)
{
- xbt_assert(SD_task_get_state(task) == SD_RUNNABLE, "Task '%s' is not runnable! Task state: %d",
- SD_task_get_name(task), (int)SD_task_get_state(task));
- xbt_assert(task->host_list != nullptr, "Task '%s': workstation_list is nullptr!", SD_task_get_name(task));
+ xbt_assert(task->state == SD_RUNNABLE, "Task '%s' is not runnable! Task state: %d", task->name, (int) task->state);
+ xbt_assert(task->host_list != nullptr, "Task '%s': workstation_list is nullptr!", task->name);
- XBT_DEBUG("Running task '%s'", SD_task_get_name(task));
+ XBT_VERB("Executing task '%s'", task->name);
/* Copy the elements of the task into the action */
int host_nb = task->host_count;
XBT_DEBUG("surf_action = %p", task->surf_action);
- if (task->category)
- TRACE_surf_action(task->surf_action, task->category);
-
__SD_task_destroy_scheduling_data(task); /* now the scheduling data are not useful anymore */
SD_task_set_state(task, SD_RUNNING);
+ xbt_dynar_push(sd_global->return_set, &task);
}
/**
void SD_task_distribute_comp_amdahl(SD_task_t task, int ws_count)
{
xbt_assert(task->kind == SD_TASK_COMP_PAR_AMDAHL, "Task %s is not a SD_TASK_COMP_PAR_AMDAHL typed task."
- "Cannot use this function.", SD_task_get_name(task));
+ "Cannot use this function.", task->name);
task->flops_amount = xbt_new0(double, ws_count);
task->bytes_amount = xbt_new0(double, ws_count * ws_count);
xbt_free(task->host_list);
task->host_count = ws_count;
task->host_list = xbt_new0(sg_host_t, ws_count);
-
+
for(int i=0;i<ws_count;i++){
task->flops_amount[i] = (task->alpha + (1 - task->alpha)/ws_count) * task->amount;
}
-}
-
+}
/** @brief Auto-schedules a task.
*
* - Point to point communication (done)
* - Sequential computation (done)
* - group communication (redistribution, several kinds)
- * - parallel tasks with no internal communication (one kind per speedup model such as Amdahl)
+ * - parallel tasks with no internal communication (one kind per speedup model such as Amdahl)
* - idem+ internal communication. Task type not enough since we cannot store comm cost alongside to comp one)
*/
void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list)
{
- int i, j;
- SD_dependency_t dep;
- unsigned int cpt;
+ int i;
+ int j;
xbt_assert(task->kind != 0, "Task %s is not typed. Cannot automatically schedule it.", SD_task_get_name(task));
switch (task->kind) {
case SD_TASK_COMP_PAR_AMDAHL:
sg_host_get_name(task->host_list[0]), sg_host_get_name(task->host_list[1]), task->bytes_amount[2]);
}
- /* Iterate over all children and parents being COMM_E2E to say where I am located (and start them if runnable) */
+ /* Iterate over all inputs and outputs to say where I am located (and start them if runnable) */
if (task->kind == SD_TASK_COMP_SEQ) {
XBT_VERB("Schedule computation task %s on %s. It costs %.f flops", SD_task_get_name(task),
sg_host_get_name(task->host_list[0]), task->flops_amount[0]);
- xbt_dynar_foreach(task->tasks_before, cpt, dep) {
- SD_task_t before = dep->src;
- if (before->kind == SD_TASK_COMM_E2E) {
- before->host_list[1] = task->host_list[0];
-
- if (before->host_list[0] && (SD_task_get_state(before) < SD_SCHEDULED)) {
- SD_task_do_schedule(before);
- XBT_VERB ("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes", SD_task_get_name(before),
- sg_host_get_name(before->host_list[0]), sg_host_get_name(before->host_list[1]), before->bytes_amount[2]);
- }
+ for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it){
+ SD_task_t input = *it;
+ input->host_list[1] = task->host_list[0];
+ if (input->host_list[0] && (SD_task_get_state(input) < SD_SCHEDULED)) {
+ SD_task_do_schedule(input);
+ XBT_VERB ("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes", SD_task_get_name(input),
+ sg_host_get_name(input->host_list[0]), sg_host_get_name(input->host_list[1]), input->bytes_amount[2]);
}
}
- xbt_dynar_foreach(task->tasks_after, cpt, dep) {
- SD_task_t after = dep->dst;
- if (after->kind == SD_TASK_COMM_E2E) {
- after->host_list[0] = task->host_list[0];
- if (after->host_list[1] && (SD_task_get_state(after) < SD_SCHEDULED)) {
- SD_task_do_schedule(after);
- XBT_VERB ("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes", SD_task_get_name(after),
- sg_host_get_name(after->host_list[0]), sg_host_get_name(after->host_list[1]), after->bytes_amount[2]);
- }
+
+ for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it){
+ SD_task_t output = *it;
+ output->host_list[0] = task->host_list[0];
+ if (output->host_list[1] && (SD_task_get_state(output) < SD_SCHEDULED)) {
+ SD_task_do_schedule(output);
+ XBT_VERB ("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes", SD_task_get_name(output),
+ sg_host_get_name(output->host_list[0]), sg_host_get_name(output->host_list[1]),
+ output->bytes_amount[2]);
}
}
}
+
/* Iterate over all children and parents being MXN_1D_BLOCK to say where I am located (and start them if runnable) */
if (task->kind == SD_TASK_COMP_PAR_AMDAHL) {
XBT_VERB("Schedule computation task %s on %d workstations. %.f flops will be distributed following Amdahl's Law",
SD_task_get_name(task), task->host_count, task->flops_amount[0]);
- xbt_dynar_foreach(task->tasks_before, cpt, dep) {
- SD_task_t before = dep->src;
- if (before->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){
- if (!before->host_list){
- XBT_VERB("Sender side of Task %s is not scheduled yet", SD_task_get_name(before));
- before->host_list = xbt_new0(sg_host_t, count);
- before->host_count = count;
- XBT_VERB("Fill the workstation list with list of Task '%s'", SD_task_get_name(task));
- for (i=0;i<count;i++)
- before->host_list[i] = task->host_list[i];
- } else {
- XBT_VERB("Build communication matrix for task '%s'", SD_task_get_name(before));
- int src_nb, dst_nb;
- double src_start, src_end, dst_start, dst_end;
- src_nb = before->host_count;
- dst_nb = count;
- before->host_list = static_cast<sg_host_t*>(xbt_realloc(before->host_list, (before->host_count+count)*sizeof(sg_host_t)));
- for(i=0; i<count; i++)
- before->host_list[before->host_count+i] = task->host_list[i];
-
- before->host_count += count;
- xbt_free(before->flops_amount);
- xbt_free(before->bytes_amount);
- before->flops_amount = xbt_new0(double, before->host_count);
- before->bytes_amount = xbt_new0(double, before->host_count* before->host_count);
-
- for(i=0;i<src_nb;i++){
- src_start = i*before->amount/src_nb;
- src_end = src_start + before->amount/src_nb;
- for(j=0; j<dst_nb; j++){
- dst_start = j*before->amount/dst_nb;
- dst_end = dst_start + before->amount/dst_nb;
- XBT_VERB("(%s->%s): (%.2f, %.2f)-> (%.2f, %.2f)", sg_host_get_name(before->host_list[i]),
- sg_host_get_name(before->host_list[src_nb+j]), src_start, src_end, dst_start, dst_end);
- if ((src_end <= dst_start) || (dst_end <= src_start)) {
- before->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]=0.0;
- } else {
- before->bytes_amount[i*(src_nb+dst_nb)+src_nb+j] = MIN(src_end, dst_end) - MAX(src_start, dst_start);
- }
- XBT_VERB("==> %.2f", before->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]);
+ for (std::set<SD_task_t>::iterator it=task->inputs->begin(); it!=task->inputs->end(); ++it){
+ SD_task_t input = *it;
+ if (!input->host_list){
+ XBT_VERB("Sender side of Task %s is not scheduled yet", SD_task_get_name(input));
+ input->host_list = xbt_new0(sg_host_t, count);
+ input->host_count = count;
+ XBT_VERB("Fill the workstation list with list of Task '%s'", SD_task_get_name(task));
+ for (i=0;i<count;i++)
+ input->host_list[i] = task->host_list[i];
+ } else {
+ XBT_VERB("Build communication matrix for task '%s'", SD_task_get_name(input));
+ int src_nb, dst_nb;
+ double src_start, src_end, dst_start, dst_end;
+ src_nb = input->host_count;
+ dst_nb = count;
+ input->host_list = static_cast<sg_host_t*>(xbt_realloc(input->host_list, (input->host_count+count)*sizeof(sg_host_t)));
+ for(i=0; i<count; i++)
+ input->host_list[input->host_count+i] = task->host_list[i];
+
+ input->host_count += count;
+ xbt_free(input->flops_amount);
+ xbt_free(input->bytes_amount);
+ input->flops_amount = xbt_new0(double, input->host_count);
+ input->bytes_amount = xbt_new0(double, input->host_count* input->host_count);
+
+ for(i=0;i<src_nb;i++){
+ src_start = i*input->amount/src_nb;
+ src_end = src_start + input->amount/src_nb;
+ for(j=0; j<dst_nb; j++){
+ dst_start = j*input->amount/dst_nb;
+ dst_end = dst_start + input->amount/dst_nb;
+ XBT_VERB("(%s->%s): (%.2f, %.2f)-> (%.2f, %.2f)", sg_host_get_name(input->host_list[i]),
+ sg_host_get_name(input->host_list[src_nb+j]), src_start, src_end, dst_start, dst_end);
+ if ((src_end <= dst_start) || (dst_end <= src_start)) {
+ input->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]=0.0;
+ } else {
+ input->bytes_amount[i*(src_nb+dst_nb)+src_nb+j] = MIN(src_end, dst_end) - MAX(src_start, dst_start);
}
+ XBT_VERB("==> %.2f", input->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]);
}
+ }
- if (SD_task_get_state(before)< SD_SCHEDULED) {
- SD_task_do_schedule(before);
- XBT_VERB ("Auto-Schedule redistribution task %s. Send %.f bytes from %d hosts to %d hosts.",
- SD_task_get_name(before),before->amount, src_nb, dst_nb);
- }
+ if (SD_task_get_state(input)< SD_SCHEDULED) {
+ SD_task_do_schedule(input);
+ XBT_VERB ("Auto-Schedule redistribution task %s. Send %.f bytes from %d hosts to %d hosts.",
+ SD_task_get_name(input),input->amount, src_nb, dst_nb);
}
}
}
- xbt_dynar_foreach(task->tasks_after, cpt, dep) {
- SD_task_t after = dep->dst;
- if (after->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){
- if (!after->host_list){
- XBT_VERB("Receiver side of Task '%s' is not scheduled yet", SD_task_get_name(after));
- after->host_list = xbt_new0(sg_host_t, count);
- after->host_count = count;
- XBT_VERB("Fill the workstation list with list of Task '%s'", SD_task_get_name(task));
- for (i=0;i<count;i++)
- after->host_list[i] = task->host_list[i];
- } else {
- int src_nb, dst_nb;
- double src_start, src_end, dst_start, dst_end;
- src_nb = count;
- dst_nb = after->host_count;
- after->host_list = static_cast<sg_host_t*>(xbt_realloc(after->host_list, (after->host_count+count)*sizeof(sg_host_t)));
- for(i=after->host_count - 1; i>=0; i--)
- after->host_list[count+i] = after->host_list[i];
- for(i=0; i<count; i++)
- after->host_list[i] = task->host_list[i];
-
- after->host_count += count;
-
- xbt_free(after->flops_amount);
- xbt_free(after->bytes_amount);
-
- after->flops_amount = xbt_new0(double, after->host_count);
- after->bytes_amount = xbt_new0(double, after->host_count* after->host_count);
-
- for(i=0;i<src_nb;i++){
- src_start = i*after->amount/src_nb;
- src_end = src_start + after->amount/src_nb;
- for(j=0; j<dst_nb; j++){
- dst_start = j*after->amount/dst_nb;
- dst_end = dst_start + after->amount/dst_nb;
- XBT_VERB("(%d->%d): (%.2f, %.2f)-> (%.2f, %.2f)", i, j, src_start, src_end, dst_start, dst_end);
- if ((src_end <= dst_start) || (dst_end <= src_start)) {
- after->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]=0.0;
- } else {
- after->bytes_amount[i*(src_nb+dst_nb)+src_nb+j] = MIN(src_end, dst_end)- MAX(src_start, dst_start);
- }
- XBT_VERB("==> %.2f", after->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]);
+
+ for (std::set<SD_task_t>::iterator it=task->outputs->begin(); it!=task->outputs->end(); ++it){
+ SD_task_t output = *it;
+ if (!output->host_list){
+ XBT_VERB("Receiver side of Task '%s' is not scheduled yet", SD_task_get_name(output));
+ output->host_list = xbt_new0(sg_host_t, count);
+ output->host_count = count;
+ XBT_VERB("Fill the workstation list with list of Task '%s'", SD_task_get_name(task));
+ for (i=0;i<count;i++)
+ output->host_list[i] = task->host_list[i];
+ } else {
+ int src_nb, dst_nb;
+ double src_start, src_end, dst_start, dst_end;
+ src_nb = count;
+ dst_nb = output->host_count;
+ output->host_list = static_cast<sg_host_t*>(xbt_realloc(output->host_list, (output->host_count+count)*sizeof(sg_host_t)));
+ for(i=output->host_count - 1; i>=0; i--)
+ output->host_list[count+i] = output->host_list[i];
+ for(i=0; i<count; i++)
+ output->host_list[i] = task->host_list[i];
+
+ output->host_count += count;
+
+ xbt_free(output->flops_amount);
+ xbt_free(output->bytes_amount);
+
+ output->flops_amount = xbt_new0(double, output->host_count);
+ output->bytes_amount = xbt_new0(double, output->host_count* output->host_count);
+
+ for(i=0;i<src_nb;i++){
+ src_start = i*output->amount/src_nb;
+ src_end = src_start + output->amount/src_nb;
+ for(j=0; j<dst_nb; j++){
+ dst_start = j*output->amount/dst_nb;
+ dst_end = dst_start + output->amount/dst_nb;
+ XBT_VERB("(%d->%d): (%.2f, %.2f)-> (%.2f, %.2f)", i, j, src_start, src_end, dst_start, dst_end);
+ if ((src_end <= dst_start) || (dst_end <= src_start)) {
+ output->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]=0.0;
+ } else {
+ output->bytes_amount[i*(src_nb+dst_nb)+src_nb+j] = MIN(src_end, dst_end)- MAX(src_start, dst_start);
}
+ XBT_VERB("==> %.2f", output->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]);
}
+ }
- if (SD_task_get_state(after)< SD_SCHEDULED) {
- SD_task_do_schedule(after);
- XBT_VERB ("Auto-Schedule redistribution task %s. Send %.f bytes from %d hosts to %d hosts.",
- SD_task_get_name(after),after->amount, src_nb, dst_nb);
- }
+ if (SD_task_get_state(output)< SD_SCHEDULED) {
+ SD_task_do_schedule(output);
+ XBT_VERB ("Auto-Schedule redistribution task %s. Send %.f bytes from %d hosts to %d hosts.",
+ output->name, output->amount, src_nb, dst_nb);
}
}
}
