X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5297efe36bb961c9be431ef4fbd01485f743ef7..23141ea49d9f51ecda69abe8cd02736b92254726:/src/simdag/sd_task.cpp diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp index a67692cb82..0669387388 100644 --- a/src/simdag/sd_task.cpp +++ b/src/simdag/sd_task.cpp @@ -4,9 +4,9 @@ /* 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 "simdag_private.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/surf_interface.hpp" -#include "src/simdag/simdag_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd, "Logging specific to SimDag (task)"); @@ -22,73 +22,38 @@ static void __SD_task_destroy_scheduling_data(SD_task_t task) task->flops_amount = nullptr; } -void* SD_task_new_f() +/** + * \brief Creates a new task. + * + * \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 = xbt_new0(s_SD_task_t, 1); - - 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 = static_cast(t); - - /* Reset the content */ task->kind = SD_TASK_NOT_TYPED; task->state= SD_NOT_SCHEDULED; sd_global->initial_tasks->insert(task); task->marked = 0; - task->start_time = -1.0; task->finish_time = -1.0; task->surf_action = nullptr; task->watch_points = 0; - /* dependencies */ - task->inputs->clear(); - task->outputs->clear(); - task->predecessors->clear(); - task->successors->clear(); - - /* scheduling parameters */ - task->flops_amount = nullptr; - task->bytes_amount = nullptr; - task->rate = -1; -} - -void SD_task_free_f(void *t) -{ - SD_task_t task = static_cast(t); - delete task->inputs; - delete task->outputs; - delete task->predecessors; - delete task->successors; - xbt_free(task); -} - -/** - * \brief Creates a new task. - * - * \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 = static_cast(xbt_mallocator_get(sd_global->task_mallocator)); + task->inputs = new std::set(); + task->outputs = new std::set(); + task->predecessors = new std::set(); + task->successors = new std::set(); task->data = data; - task->name = xbt_strdup(name); + task->name = std::string(name); task->amount = amount; - task->remains = amount; task->allocation = new std::vector(); + task->rate = -1; return task; } @@ -213,21 +178,17 @@ void SD_task_destroy(SD_task_t task) 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, nullptr); - } - - xbt_free(task->name); - if (task->surf_action != nullptr) task->surf_action->unref(); delete task->allocation; xbt_free(task->bytes_amount); xbt_free(task->flops_amount); - - xbt_mallocator_release(sd_global->task_mallocator,task); + delete task->inputs; + delete task->outputs; + delete task->predecessors; + delete task->successors; + xbt_free(task); XBT_DEBUG("Task destroyed."); } @@ -299,7 +260,7 @@ 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) { std::set::iterator idx; - XBT_DEBUG("Set state of '%s' to %d", task->name, new_state); + XBT_DEBUG("Set state of '%s' to %d", task->name.c_str(), 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); @@ -326,7 +287,6 @@ void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state) 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 @@ -340,7 +300,7 @@ void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state) task->state = new_state; if (task->watch_points & new_state) { - XBT_VERB("Watch point reached with task '%s'!", task->name); + XBT_VERB("Watch point reached with task '%s'!", task->name.c_str()); sd_global->watch_point_reached = true; SD_task_unwatch(task, new_state); /* remove the watch point */ } @@ -354,14 +314,13 @@ void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state) */ const char *SD_task_get_name(SD_task_t task) { - return task->name; + return task->name.c_str(); } /** @brief Allows to change the name of a task */ void SD_task_set_name(SD_task_t task, const char *name) { - xbt_free(task->name); - task->name = xbt_strdup(name); + task->name = std::string(name); } /** @brief Returns the dynar of the parents of a task @@ -474,7 +433,7 @@ double SD_task_get_remaining_amount(SD_task_t task) if (task->surf_action) return task->surf_action->getRemains(); else - return task->remains; + return (task->state == SD_DONE) ? 0 : task->amount; } e_SD_task_kind_t SD_task_get_kind(SD_task_t task) @@ -486,16 +445,12 @@ e_SD_task_kind_t SD_task_get_kind(SD_task_t task) void SD_task_dump(SD_task_t task) { 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" : ""), - (task->state == SD_SCHEDULABLE ? " schedulable" : ""), - (task->state == SD_SCHEDULED ? " scheduled" : ""), - (task->state == SD_RUNNABLE ? " runnable" : " not runnable"), - (task->state == SD_RUNNING ? " running" : ""), - (task->state == SD_DONE ? " done" : ""), - (task->state == SD_FAILED ? " failed" : "")); - XBT_INFO(" - state:%s", statename); - free(statename); + if (task->state == SD_RUNNABLE) + XBT_INFO(" - state: runnable"); + else if (task->state < SD_RUNNABLE) + XBT_INFO(" - state: %s not runnable", __get_state_name(task->state)); + else + XBT_INFO(" - state: not runnable %s", __get_state_name(task->state)); if (task->kind != 0) { switch (task->kind) { @@ -523,18 +478,18 @@ void SD_task_dump(SD_task_t task) if ((task->inputs->size()+ task->predecessors->size()) > 0) { XBT_INFO(" - pre-dependencies:"); for (auto it : *task->predecessors) - XBT_INFO(" %s", it->name); + XBT_INFO(" %s", it->name.c_str()); for (auto it: *task->inputs) - XBT_INFO(" %s", it->name); + XBT_INFO(" %s", it->name.c_str()); } if ((task->outputs->size() + task->successors->size()) > 0) { XBT_INFO(" - post-dependencies:"); for (auto it : *task->successors) - XBT_INFO(" %s", it->name); + XBT_INFO(" %s", it->name.c_str()); for (auto it : *task->outputs) - XBT_INFO(" %s", it->name); + XBT_INFO(" %s", it->name.c_str()); } } @@ -542,7 +497,7 @@ void SD_task_dump(SD_task_t task) void SD_task_dotty(SD_task_t task, void *out) { FILE *fout = static_cast(out); - fprintf(fout, " T%p [label=\"%.20s\"", task, task->name); + fprintf(fout, " T%p [label=\"%.20s\"", task, task->name.c_str()); switch (task->kind) { case SD_TASK_COMM_E2E: case SD_TASK_COMM_PAR_MXN_1D_BLOCK: @@ -581,17 +536,17 @@ void SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task 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", - src->name); + src->name.c_str()); 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", - dst->name); + dst->name.c_str()); 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); + THROWF(arg_error, 0, "A dependency already exists between task '%s' and task '%s'", src->name.c_str(), dst->name.c_str()); - XBT_DEBUG("SD_task_dependency_add: src = %s, dst = %s", src->name, dst->name); + XBT_DEBUG("SD_task_dependency_add: src = %s, dst = %s", src->name.c_str(), dst->name.c_str()); 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) @@ -609,7 +564,7 @@ void SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task /* 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); + XBT_DEBUG("SD_task_dependency_add: %s was runnable and becomes scheduled!", dst->name.c_str()); SD_task_set_state(dst, SD_SCHEDULED); } } @@ -652,7 +607,7 @@ void SD_task_dependency_remove(SD_task_t src, SD_task_t 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'", - src->name, dst->name, dst->name, src->name); + src->name.c_str(), dst->name.c_str(), dst->name.c_str(), src->name.c_str()); 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) @@ -809,7 +764,7 @@ void SD_task_schedule(SD_task_t task, int host_count, const sg_host_t * host_lis void SD_task_unschedule(SD_task_t 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); + THROWF(arg_error, 0, "Task %s: the state must be SD_SCHEDULED, SD_RUNNABLE, SD_RUNNING or SD_FAILED", task->name.c_str()); 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))) { @@ -827,25 +782,25 @@ void SD_task_unschedule(SD_task_t task) else SD_task_set_state(task, SD_NOT_SCHEDULED); } - task->remains = task->amount; task->start_time = -1.0; } /* Runs a task. */ void SD_task_run(SD_task_t task) { - xbt_assert(task->state == SD_RUNNABLE, "Task '%s' is not runnable! Task state: %d", task->name, (int) task->state); - xbt_assert(task->allocation != nullptr, "Task '%s': host_list is nullptr!", task->name); + xbt_assert(task->state == SD_RUNNABLE, "Task '%s' is not runnable! Task state: %d", task->name.c_str(), (int) task->state); + xbt_assert(task->allocation != nullptr, "Task '%s': host_list is nullptr!", task->name.c_str()); - XBT_VERB("Executing task '%s'", task->name); + XBT_VERB("Executing task '%s'", task->name.c_str()); /* Copy the elements of the task into the action */ int host_nb = task->allocation->size(); - XBT_DEBUG("%d", host_nb); sg_host_t *hosts = xbt_new(sg_host_t, host_nb); int i =0; - for (auto host: *task->allocation) - hosts[i++] = host; + for (auto host: *task->allocation){ + hosts[i] = host; + i++; + } double *flops_amount = xbt_new0(double, host_nb); double *bytes_amount = xbt_new0(double, host_nb * host_nb); @@ -863,7 +818,7 @@ void SD_task_run(SD_task_t task) __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); + sd_global->return_set->insert(task); } /** @@ -903,7 +858,7 @@ double SD_task_get_finish_time(SD_task_t task) void SD_task_distribute_comp_amdahl(SD_task_t task, int 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.", task->name); + "Cannot use this function.", task->name.c_str()); task->flops_amount = xbt_new0(double, count); task->bytes_amount = xbt_new0(double, count * count); @@ -912,36 +867,50 @@ void SD_task_distribute_comp_amdahl(SD_task_t task, int count) } } +void SD_task_build_MxN_1D_block_matrix(SD_task_t task, int src_nb, int dst_nb){ + xbt_assert(task->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK, "Task %s is not a SD_TASK_COMM_PAR_MXN_1D_BLOCK typed task." + "Cannot use this function.", task->name.c_str()); + xbt_free(task->bytes_amount); + task->bytes_amount = xbt_new0(double,task->allocation->size() * task->allocation->size()); + + for (int i=0; iamount/src_nb; + double src_end = src_start + task->amount/src_nb; + for (int j=0; jamount/dst_nb; + double dst_end = dst_start + task->amount/dst_nb; + XBT_VERB("(%d->%d): (%.2f, %.2f)-> (%.2f, %.2f)", i, j, src_start, src_end, dst_start, dst_end); + task->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]=0.0; + if ((src_end > dst_start) && (dst_end > src_start)) { /* There is something to send */ + task->bytes_amount[i*(src_nb+dst_nb)+src_nb+j] = MIN(src_end, dst_end)- MAX(src_start, dst_start); + XBT_VERB("==> %.2f", task->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]); + } + } + } +} + /** @brief Auto-schedules a task. * * Auto-scheduling mean that the task can be used with SD_task_schedulev(). This allows to specify the task costs at * creation, and decouple them from the scheduling process where you just specify which resource should deliver the * mandatory power. * - * To be auto-schedulable, a task must be type and created with one of the specialized creation functions. - * - * @todo - * We should create tasks kind for the following categories: - * - 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) - * - idem+ internal communication. Task type not enough since we cannot store comm cost alongside to comp one) + * To be auto-schedulable, a task must be a typed computation SD_TASK_COMP_SEQ or SD_TASK_COMP_PAR_AMDAHL. */ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) { - xbt_assert(task->kind != 0, "Task %s is not typed. Cannot automatically schedule it.", SD_task_get_name(task)); + xbt_assert(task->kind == SD_TASK_COMP_SEQ || task->kind == SD_TASK_COMP_PAR_AMDAHL, + "Task %s is not typed. Cannot automatically schedule it.", SD_task_get_name(task)); for(int i =0; iallocation->push_back(list[i]); - XBT_VERB("Schedule computation task %s on %zu host(s)", task->name, task->allocation->size()); + XBT_VERB("Schedule computation task %s on %zu host(s)", task->name.c_str(), task->allocation->size()); if (task->kind == SD_TASK_COMP_SEQ) { - if (!task->flops_amount){ - /*This task has failed and is rescheduled. Reset the flops_amount*/ + if (!task->flops_amount){ /*This task has failed and is rescheduled. Reset the flops_amount*/ task->flops_amount = xbt_new0(double, 1); - task->flops_amount[0] = task->remains; + task->flops_amount[0] = task->amount; } XBT_VERB("It costs %.f flops", task->flops_amount[0]); } @@ -958,40 +927,18 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) int src_nb = input->allocation->size(); int dst_nb = count; if (input->allocation->empty()) - XBT_VERB("Sender side of '%s' not scheduled. Set receiver side to '%s''s allocation", input->name, task->name); + XBT_VERB("Sender side of '%s' not scheduled. Set receiver side to '%s''s allocation", input->name.c_str(), task->name.c_str()); for (int i=0; iallocation->push_back(task->allocation->at(i)); if (input->allocation->size () > task->allocation->size()) { - if (task->kind == SD_TASK_COMP_PAR_AMDAHL) { - XBT_VERB("Build communication matrix for task '%s'", input->name); - xbt_free(input->flops_amount); - xbt_free(input->bytes_amount); - input->flops_amount = xbt_new0(double, input->allocation->size()); - input->bytes_amount = xbt_new0(double, input->allocation->size() * input->allocation->size()); - - for (int i=0; iamount/src_nb; - double src_end = src_start + input->amount/src_nb; - for (int j=0; jamount/dst_nb; - double dst_end = dst_start + input->amount/dst_nb; - XBT_VERB("(%s->%s): (%.2f, %.2f)-> (%.2f, %.2f)", sg_host_get_name(input->allocation->at(i)), - sg_host_get_name(input->allocation->at(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 (task->kind == SD_TASK_COMP_PAR_AMDAHL) + SD_task_build_MxN_1D_block_matrix(input, src_nb, dst_nb); SD_task_do_schedule(input); XBT_VERB ("Auto-Schedule Communication task '%s'. Send %.f bytes from %d hosts to %d hosts.", - input->name,input->amount, src_nb, dst_nb); + input->name.c_str(),input->amount, src_nb, dst_nb); } } @@ -999,49 +946,26 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) int src_nb = count; int dst_nb = output->allocation->size(); if (output->allocation->empty()) - XBT_VERB("Receiver side of '%s' not scheduled. Set sender side to '%s''s allocation", output->name, task->name); + XBT_VERB("Receiver side of '%s' not scheduled. Set sender side to '%s''s allocation", output->name.c_str(), task->name.c_str()); for (int i=0; iallocation->insert(output->allocation->begin()+i, task->allocation->at(i)); if (output->allocation->size () > task->allocation->size()) { - if (task->kind == SD_TASK_COMP_PAR_AMDAHL) { - XBT_VERB("Build communication matrix for task '%s'", output->name); - xbt_free(output->flops_amount); - xbt_free(output->bytes_amount); - - output->flops_amount = xbt_new0(double, output->allocation->size()); - output->bytes_amount = xbt_new0(double, output->allocation->size() * output->allocation->size()); - - for (int i=0; iamount/src_nb; - double src_end = src_start + output->amount/src_nb; - for (int j=0; jamount/dst_nb; - double 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 (task->kind == SD_TASK_COMP_PAR_AMDAHL) + SD_task_build_MxN_1D_block_matrix(output, src_nb, dst_nb); SD_task_do_schedule(output); XBT_VERB ("Auto-Schedule Communication task %s. Send %.f bytes from %d hosts to %d hosts.", - output->name, output->amount, src_nb, dst_nb); + output->name.c_str(), output->amount, src_nb, dst_nb); } } } -/** @brief autoschedule a task on a list of workstations +/** @brief autoschedule a task on a list of hosts * - * This function is very similar to SD_task_schedulev(), but takes the list of workstations to schedule onto as - * separate parameters. - * It builds a proper vector of workstations and then call SD_task_schedulev() + * This function is similar to SD_task_schedulev(), but takes the list of hosts to schedule onto as separate parameters. + * It builds a proper vector of hosts and then call SD_task_schedulev() */ void SD_task_schedulel(SD_task_t task, int count, ...) {