X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3dba6de3215d84cbfc2913a75c807e85c8c20667..00aaf3ca0db96212996091ab6d690bd3ee462e3f:/src/simdag/sd_task.cpp diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp index 1631fa6a8e..8de22762d4 100644 --- a/src/simdag/sd_task.cpp +++ b/src/simdag/sd_task.cpp @@ -4,11 +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" -#include "simgrid/simdag.h" -#include "src/instr/instr_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd, "Logging specific to SimDag (task)"); @@ -24,74 +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->amount = amount; - task->remains = amount; task->allocation = new std::vector(); + task->rate = -1; return task; } @@ -216,11 +178,6 @@ 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) @@ -229,8 +186,11 @@ void SD_task_destroy(SD_task_t task) 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."); } @@ -329,7 +289,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 @@ -477,7 +436,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) @@ -489,16 +448,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) { @@ -763,7 +718,7 @@ static inline void SD_task_do_schedule(SD_task_t task) * * \param task the task you want to schedule * \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 host_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 @@ -830,7 +785,6 @@ 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; } @@ -844,11 +798,12 @@ void SD_task_run(SD_task_t task) /* 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); @@ -866,7 +821,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); } /** @@ -915,159 +870,105 @@ 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); + 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()); + 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; - } - XBT_VERB("Schedule computation task %s on %s. It costs %.f flops", task->name, - sg_host_get_name(task->allocation->at(0)), task->flops_amount[0]); - SD_task_do_schedule(task); - - /* Iterate over all inputs and outputs to say where I am located (and start them if runnable) */ - for (auto input : *task->inputs){ - input->allocation->push_back(task->allocation->front()); - if (input->allocation->size () == 2) { - 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->allocation->at(0)), sg_host_get_name(input->allocation->at(1)), - input->bytes_amount[2]); - } - } - - for (auto output : *task->outputs){ - output->allocation->insert(output->allocation->begin(),task->allocation->front()); - if (output->allocation->size() == 2) { - 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->allocation->at(0)), sg_host_get_name(output->allocation->at(1)), - output->bytes_amount[2]); - } + task->flops_amount[0] = task->amount; } + XBT_VERB("It costs %.f flops", task->flops_amount[0]); } if (task->kind == SD_TASK_COMP_PAR_AMDAHL) { SD_task_distribute_comp_amdahl(task, count); - XBT_VERB("Schedule computation task %s on %zu workstations. %.f flops will be distributed following Amdahl's Law", - task->name, task->allocation->size(), task->flops_amount[0]); - SD_task_do_schedule(task); - - /* Iterate over all inputs and outputs to say where I am located (and start them if runnable) */ - for (auto input : *task->inputs){ - if (input->allocation->empty()){ - XBT_VERB("Sender side of Task %s is not scheduled yet", input->name); - XBT_VERB("Fill the workstation list with list of Task '%s'", task->name); - for (int i=0; iallocation->push_back(task->allocation->at(i)); - } else { - XBT_VERB("Build communication matrix for task '%s'", input->name); - int src_nb = input->allocation->size(); - int dst_nb = count; - for (int i=0; iallocation->push_back(task->allocation->at(i)); - 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 (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.", - input->name,input->amount, src_nb, dst_nb); - } - } + XBT_VERB("%.f flops will be distributed following Amdahl's Law", task->flops_amount[0]); + } + + SD_task_do_schedule(task); + + /* Iterate over all inputs and outputs to say where I am located (and start them if runnable) */ + for (auto input : *task->inputs){ + 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); + + 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) + 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); } + } - for (auto output : *task->outputs) { - if (output->allocation->empty()){ - XBT_VERB("Receiver side of Task '%s' is not scheduled yet", SD_task_get_name(output)); - XBT_VERB("Fill the workstation list with list of Task '%s'", SD_task_get_name(task)); - for (int i=0; iallocation->push_back(task->allocation->at(i)); - } else { - double src_start, src_end, dst_start, dst_end; - int src_nb = count; - int dst_nb = output->allocation->size(); - for (int i=0; iallocation->insert(output->allocation->begin()+i, task->allocation->at(i)); - 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; - 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(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); - } - } + for (auto output : *task->outputs){ + 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); + + 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) + 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); } } } -/** @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, ...) { @@ -1079,5 +980,5 @@ void SD_task_schedulel(SD_task_t task, int count, ...) va_end(ap); SD_task_schedulev(task, count, list); - free(list); + xbt_free(list); }