X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c8997e63383c66e43ffde29d356fdddb65d65d81..e7d939c32e832e22e45b44ec1bc21999d64c5554:/src/simdag/sd_task.cpp diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp index abd82f6465..a9cae7e157 100644 --- a/src/simdag/sd_task.cpp +++ b/src/simdag/sd_task.cpp @@ -4,7 +4,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/surf/HostImplem.hpp" +#include "src/surf/HostImpl.hpp" #include "src/surf/surf_interface.hpp" #include "src/simdag/simdag_private.h" #include "simgrid/simdag.h" @@ -12,72 +12,85 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd, "Logging specific to SimDag (task)"); -static void __SD_task_remove_dependencies(SD_task_t task); -static void __SD_task_destroy_scheduling_data(SD_task_t task); +/* 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) +{ + if (task->state != SD_SCHEDULED && task->state != SD_RUNNABLE) + THROWF(arg_error, 0, "Task '%s' must be SD_SCHEDULED or SD_RUNNABLE", SD_task_get_name(task)); + + xbt_free(task->flops_amount); + xbt_free(task->bytes_amount); + task->flops_amount = nullptr; + task->bytes_amount = nullptr; +} -void* SD_task_new_f(void) +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), NULL); - task->tasks_after = xbt_dynar_new(sizeof(SD_dependency_t), NULL); + task->inputs = new std::set(); + task->outputs = new std::set(); + task->predecessors = new std::set(); + task->successors = new std::set(); return task; } void SD_task_recycle_f(void *t) { - SD_task_t task = (SD_task_t) t; + SD_task_t task = static_cast(t); /* Reset the content */ task->kind = SD_TASK_NOT_TYPED; task->state= SD_NOT_SCHEDULED; - xbt_dynar_push(sd_global->initial_task_set,&task); + sd_global->initial_tasks->insert(task); task->marked = 0; task->start_time = -1.0; task->finish_time = -1.0; - task->surf_action = NULL; + task->surf_action = nullptr; 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; - task->host_list = NULL; - task->flops_amount = NULL; - task->bytes_amount = NULL; + task->host_list = nullptr; + task->flops_amount = nullptr; + task->bytes_amount = nullptr; task->rate = -1; } void SD_task_free_f(void *t) { - SD_task_t task = (SD_task_t)t; + SD_task_t task = static_cast(t); + + delete task->inputs; + delete task->outputs; + delete task->predecessors; + delete task->successors; - xbt_dynar_free(&task->tasks_before); - xbt_dynar_free(&task->tasks_after); xbt_free(task); } /** * \brief Creates a new task. * - * \param name the name of the task (can be \c NULL) - * \param data the user data you want to associate with the task (can be \c NULL) + * \param name the name of the task (can be \c nullptr) + * \param data the user data you want to associate with the task (can be \c nullptr) * \param amount amount of the task * \return the new task * \see SD_task_destroy() */ SD_task_t SD_task_create(const char *name, void *data, double amount) { - SD_task_t task = (SD_task_t)xbt_mallocator_get(sd_global->task_mallocator); + SD_task_t task = static_cast(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; @@ -85,7 +98,7 @@ SD_task_t SD_task_create(const char *name, void *data, double amount) return task; } -static XBT_INLINE SD_task_t SD_task_create_sized(const char *name, void *data, double amount, int ws_count) +static inline SD_task_t SD_task_create_sized(const char *name, void *data, double amount, int ws_count) { SD_task_t task = SD_task_create(name, data, amount); task->bytes_amount = xbt_new0(double, ws_count * ws_count); @@ -121,8 +134,8 @@ SD_task_t SD_task_create_comm_e2e(const char *name, void *data, double amount) * * A sequential computation must be scheduled on 1 host, and the amount specified at creation to be run on hosts[0]. * - * \param name the name of the task (can be \c NULL) - * \param data the user data you want to associate with the task (can be \c NULL) + * \param name the name of the task (can be \c nullptr) + * \param data the user data you want to associate with the task (can be \c nullptr) * \param flops_amount amount of compute work to be done by the task * \return the new SD_TASK_COMP_SEQ typed task */ @@ -144,8 +157,8 @@ SD_task_t SD_task_create_comp_seq(const char *name, void *data, double flops_amo * A parallel computation can be scheduled on any number of host. * The underlying speedup model is Amdahl's law. * To be auto-scheduled, \see SD_task_distribute_comp_amdahl has to be called first. - * \param name the name of the task (can be \c NULL) - * \param data the user data you want to associate with the task (can be \c NULL) + * \param name the name of the task (can be \c nullptr) + * \param data the user data you want to associate with the task (can be \c nullptr) * \param flops_amount amount of compute work to be done by the task * \param alpha purely serial fraction of the work to be done (in [0.;1.[) * \return the new task @@ -170,15 +183,15 @@ SD_task_t SD_task_create_comp_par_amdahl(const char *name, void *data, double fl * A data redistribution can be scheduled on any number of host. * The assumed distribution is a 1D block distribution. Each host owns the same share of the \see amount. * To be auto-scheduled, \see SD_task_distribute_comm_mxn_1d_block has to be called first. - * \param name the name of the task (can be \c NULL) - * \param data the user data you want to associate with the task (can be \c NULL) + * \param name the name of the task (can be \c nullptr) + * \param data the user data you want to associate with the task (can be \c nullptr) * \param amount amount of data to redistribute by the task * \return the new task */ SD_task_t SD_task_create_comm_par_mxn_1d_block(const char *name, void *data, double amount) { SD_task_t res = SD_task_create(name, data, amount); - res->host_list=NULL; + res->host_list=nullptr; res->kind = SD_TASK_COMM_PAR_MXN_1D_BLOCK; return res; @@ -196,19 +209,27 @@ void SD_task_destroy(SD_task_t task) { 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); int idx = xbt_dynar_search_or_negative(sd_global->return_set, &task); if (idx >=0) { - xbt_dynar_remove_at(sd_global->return_set, idx, NULL); + xbt_dynar_remove_at(sd_global->return_set, idx, nullptr); } xbt_free(task->name); - if (task->surf_action != NULL) + if (task->surf_action != nullptr) task->surf_action->unref(); xbt_free(task->host_list); @@ -224,7 +245,7 @@ void SD_task_destroy(SD_task_t task) * \brief Returns the user data of a task * * \param task a task - * \return the user data associated with this task (can be \c NULL) + * \return the user data associated with this task (can be \c nullptr) * \see SD_task_set_data() */ void *SD_task_get_data(SD_task_t task) @@ -235,8 +256,8 @@ void *SD_task_get_data(SD_task_t task) /** * \brief Sets the user data of a task * - * The new data can be \c NULL. The old data should have been freed first - * if it was not \c NULL. + * The new data can be \c nullptr. The old data should have been freed first + * if it was not \c nullptr. * * \param task a task * \param data the new data you want to associate with this task @@ -263,7 +284,7 @@ void SD_task_set_data(SD_task_t task, void *data) 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); @@ -287,54 +308,49 @@ e_SD_task_state_t SD_task_get_state(SD_task_t task) */ void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state) { - int idx; - switch (new_state) { - case SD_NOT_SCHEDULED: - case SD_SCHEDULABLE: - if (SD_task_get_state(task) == SD_FAILED){ - xbt_dynar_remove_at(sd_global->completed_task_set, - xbt_dynar_search(sd_global->completed_task_set, &task), NULL); - xbt_dynar_push(sd_global->initial_task_set,&task); - } - break; - case SD_SCHEDULED: - if (SD_task_get_state(task) == SD_RUNNABLE){ - xbt_dynar_remove_at(sd_global->executable_task_set, - xbt_dynar_search(sd_global->executable_task_set, &task), NULL); - xbt_dynar_push(sd_global->initial_task_set,&task); - } - break; - case SD_RUNNABLE: - idx = xbt_dynar_search_or_negative(sd_global->initial_task_set, &task); - if (idx >= 0) { - xbt_dynar_remove_at(sd_global->initial_task_set, idx, NULL); - xbt_dynar_push(sd_global->executable_task_set,&task); + std::set::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); + } + + if (new_state == SD_SCHEDULED && task->state == SD_RUNNABLE){ + 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); } - break; - case SD_RUNNING: - xbt_dynar_remove_at(sd_global->executable_task_set, - xbt_dynar_search(sd_global->executable_task_set, &task), NULL); - break; - case SD_DONE: - xbt_dynar_push(sd_global->completed_task_set,&task); - task->finish_time = task->surf_action->getFinishTime(); - task->remains = 0; -#ifdef HAVE_JEDULE - jedule_log_sd_event(task); + } + + if (new_state == SD_RUNNING) + sd_global->runnable_tasks->erase(task); + + if (new_state == SD_DONE || new_state == SD_FAILED){ + sd_global->completed_tasks->insert(task); + task->start_time = task->surf_action->getStartTime(); + if (new_state == SD_DONE){ + task->finish_time = task->surf_action->getFinishTime(); + task->remains = 0; +#if HAVE_JEDULE + jedule_log_sd_event(task); #endif - break; - case SD_FAILED: - xbt_dynar_push(sd_global->completed_task_set,&task); - break; - default: - xbt_die( "Invalid state"); + } else + task->finish_time = surf_get_clock(); + task->surf_action->unref(); + task->surf_action = nullptr; } task->state = new_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 */ } } @@ -343,7 +359,7 @@ void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state) * \brief Returns the name of a task * * \param task a task - * \return the name of this task (can be \c NULL) + * \return the name of this task (can be \c nullptr) */ const char *SD_task_get_name(SD_task_t task) { @@ -365,13 +381,13 @@ void SD_task_set_name(SD_task_t task, const char *name) 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); + + for (auto it : *task->predecessors) + xbt_dynar_push(parents, &it); + for (auto it : *task->inputs) + xbt_dynar_push(parents, &it); - xbt_dynar_t parents = xbt_dynar_new(sizeof(SD_task_t), NULL); - xbt_dynar_foreach(task->tasks_before, i, dep) { - xbt_dynar_push(parents, &(dep->src)); - } return parents; } @@ -382,18 +398,18 @@ xbt_dynar_t SD_task_get_parents(SD_task_t task) */ 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); + + for (auto it : *task->successors) + xbt_dynar_push(children, &it); + for (auto it : *task->outputs) + xbt_dynar_push(children, &it); - xbt_dynar_t children = xbt_dynar_new(sizeof(SD_task_t), NULL); - xbt_dynar_foreach(task->tasks_after, i, dep) { - xbt_dynar_push(children, &(dep->dst)); - } return children; } /** - * \brief Returns the amount of workstations involved in a task + * \brief Returns the number of workstations involved in a task * * Only call this on already scheduled tasks! * \param task a task @@ -455,7 +471,6 @@ double SD_task_get_alpha(SD_task_t task) return task->alpha; } - /** * \brief Returns the remaining amount work to do till the completion of a task * @@ -476,12 +491,9 @@ e_SD_task_kind_t SD_task_get_kind(SD_task_t task) return task->kind; } -/** @brief Displays debugging informations about a task */ +/** @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" : ""), @@ -513,33 +525,32 @@ void SD_task_dump(SD_task_t task) } } - 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)) { + 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 (auto it : *task->predecessors) + XBT_INFO(" %s", SD_task_get_name(it)); + + for (auto it: *task->inputs) + XBT_INFO(" %s", SD_task_get_name(it)); } - if (!xbt_dynar_is_empty(task->tasks_after)) { + 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 (auto it : *task->successors) + XBT_INFO(" %s", SD_task_get_name(it)); + for (auto it : *task->outputs) + 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 = (FILE*)out; + FILE *fout = static_cast(out); fprintf(fout, " T%p [label=\"%.20s\"", task, task->name); switch (task->kind) { case SD_TASK_COMM_E2E: @@ -554,17 +565,10 @@ void SD_task_dotty(SD_task_t task, void *out) 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); - } -} - -/* Destroys a dependency between two tasks. - */ -static void __SD_task_dependency_destroy(void *dependency) -{ - xbt_free(((SD_dependency_t)dependency)->name); - xbt_free(dependency); + for (auto it : *task->predecessors) + fprintf(fout, " T%p -> T%p;\n", it, task); + for (auto it : *task->inputs) + fprintf(fout, " T%p -> T%p;\n", it, task); } /** @@ -573,81 +577,50 @@ static void __SD_task_dependency_destroy(void *dependency) * \a dst will depend on \a src, ie \a dst will not start before \a src is finished. * Their \ref e_SD_task_state_t "state" must be #SD_NOT_SCHEDULED, #SD_SCHEDULED or #SD_RUNNABLE. * - * \param name the name of the new dependency (can be \c NULL) - * \param data the user data you want to associate with this dependency (can be \c NULL) + * \param name the name of the new dependency (can be \c nullptr) + * \param data the user data you want to associate with this dependency (can be \c nullptr) * \param src the task which must be executed first * \param dst the task you want to make depend on \a src * \see SD_task_dependency_remove() */ void SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task_t dst) { - int found = 0; - 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)); + dst->name); - 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)); - } + 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); - 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)); + XBT_DEBUG("SD_task_dependency_add: src = %s, dst = %s", src->name, dst->name); - dependency = xbt_new(s_SD_dependency_t, 1); - - dependency->name = xbt_strdup(name); /* xbt_strdup is cleaver enough to deal with NULL 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 NULL; } /** @@ -656,26 +629,21 @@ const char *SD_task_dependency_get_name(SD_task_t src, SD_task_t dst){ * \param src a task * \param dst a task depending on \a src * - * If src is NULL, checks whether dst has any pre-dependency. - * If dst is NULL, checks whether src has any post-dependency. + * If src is nullptr, checks whether dst has any pre-dependency. + * If dst is nullptr, checks whether src has any post-dependency. */ int SD_task_dependency_exists(SD_task_t src, SD_task_t dst) { - xbt_assert(src != NULL || dst != NULL, "Invalid parameter: both src and dst are NULL"); + xbt_assert(src != nullptr || dst != nullptr, "Invalid parameter: both src and dst are 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; } @@ -689,77 +657,29 @@ int SD_task_dependency_exists(SD_task_t src, SD_task_t dst) */ void SD_task_dependency_remove(SD_task_t src, SD_task_t dst) { - unsigned long length; - int found = 0; - 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, NULL); - found = 1; - } - } - 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 = 0; - - 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, NULL); - __SD_task_dependency_destroy(dependency); - dst->unsatisfied_dependencies--; - dst->is_not_ready--; - found = 1; - } - } - /* 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 + 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 - SD_task_set_state(dst, SD_SCHEDULABLE); + 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 NULL) - * \see SD_task_dependency_add() - */ -void *SD_task_dependency_get_data(SD_task_t src, SD_task_t dst) -{ - int found = 0; - 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); } /** @@ -800,46 +720,42 @@ void SD_task_unwatch(SD_task_t task, e_SD_task_state_t state) * now and if it was the only task. * * \param task the task to evaluate - * \param workstation_nb number of workstations on which the task would be executed - * \param workstation_list the workstations on which the task would be executed - * \param flops_amount computation amount for each workstation - * \param bytes_amount communication amount between each pair of workstations + * \param host_count number of hosts on which the task would be executed + * \param host_list the hosts on which the task would be executed + * \param flops_amount computation amount for each host(i.e., an array of host_count doubles) + * \param bytes_amount communication amount between each pair of hosts (i.e., a matrix of host_count*host_count doubles) * \see SD_schedule() */ -double SD_task_get_execution_time(SD_task_t task, int workstation_nb, const sg_host_t *workstation_list, +double SD_task_get_execution_time(SD_task_t task, int host_count, const sg_host_t *host_list, const double *flops_amount, const double *bytes_amount) { - xbt_assert(workstation_nb > 0, "Invalid parameter"); + xbt_assert(host_count > 0, "Invalid parameter"); double max_time = 0.0; /* the task execution time is the maximum execution time of the parallel tasks */ - for (int i = 0; i < workstation_nb; i++) { + for (int i = 0; i < host_count; i++) { double time = 0.0; - if (flops_amount != NULL) - time = flops_amount[i] / sg_host_speed(workstation_list[i]); - - if (bytes_amount != NULL) - for (int j = 0; j < workstation_nb; j++) { - if (bytes_amount[i * workstation_nb + j] !=0 ) { - time += (SD_route_get_latency(workstation_list[i], workstation_list[j]) + - bytes_amount[i * workstation_nb + j] / - SD_route_get_bandwidth(workstation_list[i], workstation_list[j])); - } - } + if (flops_amount != nullptr) + time = flops_amount[i] / host_list[i]->speed(); + + if (bytes_amount != nullptr) + for (int j = 0; j < host_count; j++) + if (bytes_amount[i * host_count + j] != 0) + time += (SD_route_get_latency(host_list[i], host_list[j]) + + bytes_amount[i * host_count + j] / SD_route_get_bandwidth(host_list[i], host_list[j])); - if (time > max_time) { + if (time > max_time) max_time = time; - } } return max_time; } -static XBT_INLINE void SD_task_do_schedule(SD_task_t task) +static inline void SD_task_do_schedule(SD_task_t task) { 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); @@ -852,14 +768,14 @@ static XBT_INLINE void SD_task_do_schedule(SD_task_t task) * Once scheduled, a task is executed as soon as possible in \see SD_simulate, i.e. when its dependencies are satisfied. * * \param task the task you want to schedule - * \param host_count number of workstations on which the task will be executed - * \param workstation_list the workstations on which the task will be executed - * \param flops_amount computation amount for each workstation - * \param bytes_amount communication amount between each pair of workstations + * \param host_count number of hosts on which the task will be executed + * \param workstation_list the hosts on which the task will be executed + * \param flops_amount computation amount for each hosts (i.e., an array of host_count doubles) + * \param bytes_amount communication amount between each pair of hosts (i.e., a matrix of host_count*host_count doubles) * \param rate task execution speed rate * \see SD_task_unschedule() */ -void SD_task_schedule(SD_task_t task, int host_count, const sg_host_t * workstation_list, +void SD_task_schedule(SD_task_t task, int host_count, const sg_host_t * host_list, const double *flops_amount, const double *bytes_amount, double rate) { xbt_assert(host_count > 0, "workstation_nb must be positive"); @@ -868,24 +784,24 @@ void SD_task_schedule(SD_task_t task, int host_count, const sg_host_t * workstat task->rate = rate; if (flops_amount) { - task->flops_amount = (double*)xbt_realloc(task->flops_amount, sizeof(double) * host_count); + task->flops_amount = static_cast(xbt_realloc(task->flops_amount, sizeof(double) * host_count)); memcpy(task->flops_amount, flops_amount, sizeof(double) * host_count); } else { xbt_free(task->flops_amount); - task->flops_amount = NULL; + task->flops_amount = nullptr; } int communication_nb = host_count * host_count; if (bytes_amount) { - task->bytes_amount = (double*)xbt_realloc(task->bytes_amount, sizeof(double) * communication_nb); + task->bytes_amount = static_cast(xbt_realloc(task->bytes_amount, sizeof(double) * communication_nb)); memcpy(task->bytes_amount, bytes_amount, sizeof(double) * communication_nb); } else { xbt_free(task->bytes_amount); - task->bytes_amount = NULL; + task->bytes_amount = nullptr; } - task->host_list = (sg_host_t*) xbt_realloc(task->host_list, sizeof(sg_host_t) * host_count); - memcpy(task->host_list, workstation_list, sizeof(sg_host_t) * host_count); + task->host_list = static_cast(xbt_realloc(task->host_list, sizeof(sg_host_t) * host_count)); + memcpy(task->host_list, host_list, sizeof(sg_host_t) * host_count); SD_task_do_schedule(task); } @@ -902,18 +818,15 @@ void SD_task_schedule(SD_task_t task, int host_count, const sg_host_t * workstat */ 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); xbt_free(task->host_list); - task->host_list=NULL; + task->host_list=nullptr; task->host_count = 0; } @@ -921,7 +834,7 @@ void SD_task_unschedule(SD_task_t 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); @@ -930,26 +843,13 @@ void SD_task_unschedule(SD_task_t task) task->start_time = -1.0; } -/* 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) -{ - if (task->state != SD_SCHEDULED && task->state != SD_RUNNABLE) - THROWF(arg_error, 0, "Task '%s' must be SD_SCHEDULED or SD_RUNNABLE", SD_task_get_name(task)); - - xbt_free(task->flops_amount); - xbt_free(task->bytes_amount); - task->flops_amount = task->bytes_amount = NULL; -} - /* 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 != NULL, "Task '%s': workstation_list is NULL!", 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; @@ -972,29 +872,9 @@ void SD_task_run(SD_task_t task) 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); -} - -/* - * 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 carefuly (with SD_dependency_remove) because each one is stored twice */ - SD_dependency_t dependency; - while (!xbt_dynar_is_empty(task->tasks_before)) { - 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)) { - xbt_dynar_get_cpy(task->tasks_after, 0, &dependency); - SD_task_dependency_remove(dependency->src, dependency->dst); - } + xbt_dynar_push(sd_global->return_set, &task); } /** @@ -1034,18 +914,17 @@ double SD_task_get_finish_time(SD_task_t 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;iflops_amount[i] = (task->alpha + (1 - task->alpha)/ws_count) * task->amount; } -} - +} /** @brief Auto-schedules a task. * @@ -1060,22 +939,20 @@ void SD_task_distribute_comp_amdahl(SD_task_t task, int ws_count) * - 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; 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: SD_task_distribute_comp_amdahl(task, count); + /* no break */ case SD_TASK_COMM_E2E: case SD_TASK_COMP_SEQ: xbt_assert(task->host_count == count, "Got %d locations, but were expecting %d locations", count,task->host_count); - for (i = 0; i < count; i++) + for (int i=0; ihost_list[i] = list[i]; if (SD_task_get_kind(task)== SD_TASK_COMP_SEQ && !task->flops_amount){ /*This task has failed and is rescheduled. Reset the flops_amount*/ @@ -1093,141 +970,130 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) 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 (auto input : *task->inputs){ + 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 (auto output : *task->outputs){ + 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;ihost_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 = (sg_host_t*) xbt_realloc(before->host_list, (before->host_count+count)*sizeof(sg_host_t)); - for(i=0; ihost_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;iamount/src_nb; - src_end = src_start + before->amount/src_nb; - for(j=0; jamount/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 (auto input : *task->inputs){ + 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 (int i=0; ihost_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(xbt_realloc(input->host_list, (input->host_count+count)*sizeof(sg_host_t))); + for (int i=0; ihost_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 (int i=0; iamount/src_nb; + src_end = src_start + input->amount/src_nb; + for (int j=0; jamount/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;ihost_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 = (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; ihost_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;iamount/src_nb; - src_end = src_start + after->amount/src_nb; - for(j=0; jamount/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 (auto output : *task->outputs) { + 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 (int i=0; ihost_list[i] = task->host_list[i]; + } else { + double src_start, src_end, dst_start, dst_end; + int src_nb = count; + int dst_nb = output->host_count; + output->host_list = static_cast(xbt_realloc(output->host_list, (output->host_count+count)*sizeof(sg_host_t))); + for (int i=output->host_count - 1; i>=0; i--) + output->host_list[count+i] = output->host_list[i]; + for (int i=0; ihost_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 (int i=0; iamount/src_nb; + src_end = src_start + output->amount/src_nb; + for (int j=0; jamount/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); } } } @@ -1245,7 +1111,7 @@ void SD_task_schedulel(SD_task_t task, int count, ...) va_list ap; sg_host_t *list = xbt_new(sg_host_t, count); va_start(ap, count); - for (int i = 0; i < count; i++) { + for (int i=0; i